Merge #706

706: Fix some clippy lints r=Yatekii a=Tiwalun These lints probably got added with the new Rust version. Co-authored-by: Dominik Boehi <[email protected]>
probe-rs · Jun 21, 2021 · 14e9637 · 14e9637
2 parents 2a4f6bf + b03fe97
commit 14e9637
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/probe-rs/src/debug/mod.rs b/probe-rs/src/debug/mod.rs
@@ -331,11 +331,10 @@ impl<'debuginfo, 'probe, 'core> Iterator for StackFrameIterator<'debuginfo, 'pro
                             self.inlining_state
                         );
                         in_inlined_function = true;
-                        break;
                     } else {
                         // No inlined function
-                        break;
                     }
+                    break;
                 }
             }
         } else {
@@ -1018,9 +1017,9 @@ impl<'debuginfo> UnitInfo<'debuginfo> {
                     if (ranges.begin <= address) && (address < ranges.end) {
                         // Check if we are actually in an inlined function
 
-                        if find_inlined {
-                            let die = FunctionDie::new(current.clone());
+                        let die = FunctionDie::new(current.clone());
 
+                        if find_inlined {
                             log::debug!(
                                 "Found DIE, now checking for inlined functions: name={:?}",
                                 die.function_name(&self)
@@ -1033,8 +1032,6 @@ impl<'debuginfo> UnitInfo<'debuginfo> {
                                     Some(FunctionDie::new(current.clone()))
                                 });
                         } else {
-                            let die = FunctionDie::new(current.clone());
-
                             log::debug!("Found DIE: name={:?}", die.function_name(&self));
 
                             return Some(die);

diff --git a/probe-rs/src/probe/cmsisdap/commands/transfer/mod.rs b/probe-rs/src/probe/cmsisdap/commands/transfer/mod.rs
@@ -27,7 +27,7 @@ pub enum RW {
 
 /// Contains information about requested access from host debugger.
 #[allow(non_snake_case)]
-#[derive(Copy, Clone, Debug)]
+#[derive(Clone, Debug)]
 pub struct InnerTransferRequest {
     /// 0 = Debug PortType (DP), 1 = Access PortType (AP).
     pub APnDP: PortType,

diff --git a/probe-rs/src/probe/cmsisdap/mod.rs b/probe-rs/src/probe/cmsisdap/mod.rs
@@ -164,7 +164,7 @@ impl CmsisDap {
             return Ok(0);
         }
 
-        let mut batch = std::mem::replace(&mut self.batch, Vec::new());
+        let mut batch = std::mem::take(&mut self.batch);
 
         debug!("{} items in batch", batch.len());
 

diff --git a/probe-rs/src/probe/stlink/constants.rs b/probe-rs/src/probe/stlink/constants.rs
@@ -186,7 +186,7 @@ impl SwdFrequencyToDelayCount {
     }
 
     /// Get the SWD frequency in kHz
-    pub(crate) fn to_khz(&self) -> u32 {
+    pub(crate) fn to_khz(self) -> u32 {
         use SwdFrequencyToDelayCount::*;
 
         match self {
@@ -243,7 +243,7 @@ impl JTagFrequencyToDivider {
     }
 
     /// Return the frequency in kHz
-    pub(crate) fn to_khz(&self) -> u32 {
+    pub(crate) fn to_khz(self) -> u32 {
         use JTagFrequencyToDivider::*;
 
         match self {

diff --git a/smoke-tester/src/dut_definition.rs b/smoke-tester/src/dut_definition.rs
@@ -170,7 +170,8 @@ impl DutDefinition {
                 } else {
                     // For relative paths, join the path with the location of the source file to create an absolute path.
 
-                    let source_file_directory = source_file.parent().unwrap_or(Path::new("."));
+                    let source_file_directory =
+                        source_file.parent().unwrap_or_else(|| Path::new("."));
 
                     let flash_binary_location = source_file_directory.join(path);