Merge #882

882: Fix clippy lints r=Yatekii a=Yatekii Co-authored-by: Noah Hüsser <yatekii@yatekii.ch>
probe-rs · Nov 10, 2021 · 841c27d · 841c27d
2 parents ccb77ca + 369c5aa
commit 841c27d
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 34 deletions.
diff --git a/probe-rs/examples/benchmark.rs b/probe-rs/examples/benchmark.rs
@@ -10,7 +10,7 @@ use rand::prelude::*;
 use structopt::StructOpt;
 
 #[derive(StructOpt)]
-struct CLI {
+struct Cli {
     #[structopt(long = "chip")]
     chip: Option<String>,
     #[structopt(long = "address", parse(try_from_str = parse_hex))]
@@ -32,7 +32,7 @@ const SIZE: usize = 0x1000;
 fn main() -> Result<(), &'static str> {
     pretty_env_logger::init();
 
-    let matches = CLI::from_args();
+    let matches = Cli::from_args();
 
     let mut probe = open_probe(None)?;
 

diff --git a/probe-rs/examples/ram_download.rs b/probe-rs/examples/ram_download.rs
@@ -9,7 +9,7 @@ use structopt::StructOpt;
 use anyhow::{anyhow, Context, Result};
 
 #[derive(StructOpt)]
-struct CLI {
+struct Cli {
     #[structopt(long = "chip")]
     chip: Option<String>,
     #[structopt(long = "address", parse(try_from_str = parse_hex))]
@@ -29,7 +29,7 @@ fn parse_hex(src: &str) -> Result<u32, ParseIntError> {
 fn main() -> Result<()> {
     pretty_env_logger::init();
 
-    let matches = CLI::from_args();
+    let matches = Cli::from_args();
 
     let mut probe = open_probe(None)?;
 
@@ -145,7 +145,7 @@ fn open_probe(index: Option<usize>) -> Result<Probe> {
     let device = match index {
         Some(index) => list
             .get(index)
-            .ok_or(anyhow!("Probe with specified index not found"))?,
+            .ok_or_else(|| anyhow!("Probe with specified index not found"))?,
         None => {
             // open the default probe, if only one probe was found
             if list.len() == 1 {

diff --git a/probe-rs/src/flashing/builder.rs b/probe-rs/src/flashing/builder.rs
@@ -376,14 +376,16 @@ mod tests {
             address: 0,
         };
 
-        let mut flash_algorithm = FlashAlgorithm::default();
-        flash_algorithm.flash_properties = FlashProperties {
-            address_range: 0..1 << 16,
-            page_size: 1024,
-            erased_byte_value: 255,
-            program_page_timeout: 200,
-            erase_sector_timeout: 200,
-            sectors: vec![sd],
+        let flash_algorithm = FlashAlgorithm {
+            flash_properties: FlashProperties {
+                address_range: 0..1 << 16,
+                page_size: 1024,
+                erased_byte_value: 255,
+                program_page_timeout: 200,
+                erase_sector_timeout: 200,
+                sectors: vec![sd],
+            },
+            ..Default::default()
         };
 
         let region = NvmRegion {
@@ -402,14 +404,16 @@ mod tests {
             address: 0,
         };
 
-        let mut flash_algorithm = FlashAlgorithm::default();
-        flash_algorithm.flash_properties = FlashProperties {
-            address_range: 0..1 << 16,
-            page_size: 1024,
-            erased_byte_value: 255,
-            program_page_timeout: 200,
-            erase_sector_timeout: 200,
-            sectors: vec![sd],
+        let flash_algorithm = FlashAlgorithm {
+            flash_properties: FlashProperties {
+                address_range: 0..1 << 16,
+                page_size: 1024,
+                erased_byte_value: 255,
+                program_page_timeout: 200,
+                erase_sector_timeout: 200,
+                sectors: vec![sd],
+            },
+            ..Default::default()
         };
 
         let region = NvmRegion {

diff --git a/probe-rs/src/probe/cmsisdap/commands/transfer/mod.rs b/probe-rs/src/probe/cmsisdap/commands/transfer/mod.rs
@@ -53,8 +53,8 @@ impl InnerTransferRequest {
 fn creating_inner_transfer_request() {
     let req = InnerTransferRequest::new(PortType::DebugPort, RW::W, 0x8, None);
 
-    assert_eq!(true, req.A3);
-    assert_eq!(false, req.A2);
+    assert!(req.A3);
+    assert!(!req.A2);
 }
 
 impl InnerTransferRequest {

diff --git a/probe-rs/src/probe/jlink/mod.rs b/probe-rs/src/probe/jlink/mod.rs
@@ -433,15 +433,14 @@ impl DebugProbe for JLink {
                 return Err(DebugProbeError::UnsupportedSpeed(speed_khz));
             }
         };
-        let actual_speed_khz = speed_khz;
 
         let actual_speed_khz = speed_khz;
 
         self.handle
-            .set_speed(SpeedConfig::khz(actual_speed_khz as u16).unwrap())?;
-        self.speed_khz = actual_speed_khz;
+            .set_speed(SpeedConfig::khz(speed_khz as u16).unwrap())?;
+        self.speed_khz = speed_khz;
 
-        Ok(actual_speed_khz)
+        Ok(speed_khz)
     }
 
     fn attach(&mut self) -> Result<(), super::DebugProbeError> {

diff --git a/probe-rs/src/probe/jlink/swd.rs b/probe-rs/src/probe/jlink/swd.rs
@@ -1288,11 +1288,7 @@ mod test {
     }
 
     impl RawSwdIo for MockJaylink {
-        fn swd_io<'a, D, S>(
-            &'a mut self,
-            dir: D,
-            swdio: S,
-        ) -> Result<Vec<bool>, crate::DebugProbeError>
+        fn swd_io<D, S>(&mut self, dir: D, swdio: S) -> Result<Vec<bool>, crate::DebugProbeError>
         where
             D: IntoIterator<Item = bool>,
             S: IntoIterator<Item = bool>,

diff --git a/target-gen/tests/extract_pack.rs b/target-gen/tests/extract_pack.rs
@@ -1,7 +1,6 @@
 use assert_cmd::Command;
-use predicates;
 
-const NORDIC_SAMPLE_PACK: &'static str =
+const NORDIC_SAMPLE_PACK: &str =
     "tests/test_data/NordicSemiconductor.nRF_DeviceFamilyPack.8.32.1.pack";
 
 #[test]