From 03adb72aab218ad480bc521256f92ffd3fc5572e Mon Sep 17 00:00:00 2001 From: Ryan Summers Date: Thu, 6 May 2021 16:23:41 +0200 Subject: [PATCH] Fixing clippy --- src/bin/dual-iir.rs | 6 +++--- src/bin/lockin.rs | 6 +++--- src/net/shared.rs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/bin/dual-iir.rs b/src/bin/dual-iir.rs index 8c617cc..0a881d2 100644 --- a/src/bin/dual-iir.rs +++ b/src/bin/dual-iir.rs @@ -188,10 +188,10 @@ const APP: () = { #[task(priority = 1, resources=[network, settings, telemetry], schedule=[telemetry])] fn telemetry(mut c: telemetry::Context) { - let telemetry = - c.resources.telemetry.lock(|telemetry| telemetry.clone()); + let telemetry: TelemetryBuffer = + c.resources.telemetry.lock(|telemetry| *telemetry); - let gains = c.resources.settings.lock(|settings| settings.afe.clone()); + let gains: [AfeGain; 2] = c.resources.settings.lock(|settings| settings.afe); c.resources .network diff --git a/src/bin/lockin.rs b/src/bin/lockin.rs index 05002a5..fba92ed 100644 --- a/src/bin/lockin.rs +++ b/src/bin/lockin.rs @@ -276,15 +276,15 @@ const APP: () = { #[task(priority = 1, resources=[network, digital_inputs, settings, telemetry], schedule=[telemetry])] fn telemetry(mut c: telemetry::Context) { - let mut telemetry = - c.resources.telemetry.lock(|telemetry| telemetry.clone()); + let mut telemetry: TelemetryBuffer = + c.resources.telemetry.lock(|telemetry| *telemetry); telemetry.digital_inputs = [ c.resources.digital_inputs.0.is_high().unwrap(), c.resources.digital_inputs.1.is_high().unwrap(), ]; - let gains = c.resources.settings.lock(|settings| settings.afe.clone()); + let gains: [AfeGain; 2] = c.resources.settings.lock(|settings| settings.afe); c.resources .network diff --git a/src/net/shared.rs b/src/net/shared.rs index 488f4d6..e09489b 100644 --- a/src/net/shared.rs +++ b/src/net/shared.rs @@ -85,7 +85,7 @@ impl NetworkManager { /// # Returns /// A proxy that can be used in place of the network stack. Note the requirements of /// concurrency listed in the description of this file for usage. - pub fn acquire_stack<'a>(&'a self) -> NetworkStackProxy<'a, NetworkStack> { + pub fn acquire_stack(&'_ self) -> NetworkStackProxy<'_, NetworkStack> { NetworkStackProxy { mutex: &self.mutex } } }