Run cargo clippy and fmt

mbrossard · mbrossard · commit 3dd4d5317050 · 2025-02-23T21:47:44.000-06:00
diff --git a/rust/.clippy.toml b/rust/.clippy.toml
@@ -0,0 +1,2 @@
+avoid-breaking-exported-api = true
+msrv = "1.71.0"
diff --git a/rust/cmsis-cffi/src/config.rs b/rust/cmsis-cffi/src/config.rs
@@ -12,6 +12,7 @@ pub struct Config {
     pack_store: PathBuf,
 }
 
+#[derive(Default)]
 pub struct ConfigBuilder {
     pack_store: Option<PathBuf>,
 }
@@ -40,12 +41,6 @@ impl ConfigBuilder {
     }
 }
 
-impl Default for ConfigBuilder {
-    fn default() -> Self {
-        Self { pack_store: None }
-    }
-}
-
 impl Config {
     pub fn new() -> Result<Config, Error> {
         ConfigBuilder::default().build()
diff --git a/rust/cmsis-cli/src/config.rs b/rust/cmsis-cli/src/config.rs
@@ -68,6 +68,7 @@ impl Config {
                 }
                 match OpenOptions::new()
                     .create(true)
+                    .truncate(true)
                     .write(true)
                     .open(&self.vidx_list)
                 {
diff --git a/rust/cmsis-cli/src/lib.rs b/rust/cmsis-cli/src/lib.rs
@@ -62,7 +62,7 @@ pub fn install_args() -> App<'static, 'static> {
         )
 }
 
-pub fn install_command<'a>(conf: &Config, args: &ArgMatches<'a>) -> Result<(), Error> {
+pub fn install_command(conf: &Config, args: &ArgMatches<'_>) -> Result<(), Error> {
     let pdsc_list: Vec<_> = args
         .values_of("PDSC")
         .unwrap()
@@ -91,7 +91,7 @@ pub fn update_args<'a, 'b>() -> App<'a, 'b> {
         .version("0.1.0")
 }
 
-pub fn update_command<'a>(conf: &Config, _: &ArgMatches<'a>) -> Result<(), Error> {
+pub fn update_command(conf: &Config, _: &ArgMatches<'_>) -> Result<(), Error> {
     let vidx_list = conf.read_vidx_list();
     for url in vidx_list.iter() {
         log::info!("Updating registry from `{}`", url);
@@ -136,7 +136,7 @@ pub fn dump_devices_args<'a, 'b>() -> App<'a, 'b> {
         )
 }
 
-pub fn dump_devices_command<'a>(c: &Config, args: &ArgMatches<'a>) -> Result<(), Error> {
+pub fn dump_devices_command(c: &Config, args: &ArgMatches<'_>) -> Result<(), Error> {
     let files = args
         .value_of("INPUT")
         .map(|input| vec![Path::new(input).to_path_buf()]);
@@ -175,27 +175,27 @@ pub fn check_args<'a, 'b>() -> App<'a, 'b> {
         )
 }
 
-pub fn check_command<'a>(_: &Config, args: &ArgMatches<'a>) -> Result<(), Error> {
+pub fn check_command(_: &Config, args: &ArgMatches<'_>) -> Result<(), Error> {
     let filename = args.value_of("INPUT").unwrap();
     match Package::from_path(Path::new(filename)) {
         Ok(c) => {
             log::info!("Parsing succedded");
-            log::info!("{} Valid Conditions", c.conditions.0.iter().count());
+            log::info!("{} Valid Conditions", c.conditions.0.len());
             let cond_lookup = c.make_condition_lookup();
             let mut num_components = 0;
             let mut num_files = 0;
-            for &Component {
-                ref class,
-                ref group,
-                ref condition,
-                ref files,
+            for Component {
+                class,
+                group,
+                condition,
+                files,
                 ..
             } in c.make_components().iter()
             {
                 num_components += 1;
-                num_files += files.iter().count();
+                num_files += files.len();
                 if let Some(ref cond_name) = condition {
-                    if cond_lookup.get(cond_name.as_str()).is_none() {
+                    if !cond_lookup.contains_key(cond_name.as_str()) {
                         log::warn!(
                             "Component {}::{} references an unknown condition '{}'",
                             class,
@@ -204,14 +204,12 @@ pub fn check_command<'a>(_: &Config, args: &ArgMatches<'a>) -> Result<(), Error>
                         );
                     }
                 }
-                for &FileRef {
-                    ref path,
-                    ref condition,
-                    ..
+                for FileRef {
+                    path, condition, ..
                 } in files.iter()
                 {
                     if let Some(ref cond_name) = condition {
-                        if cond_lookup.get(cond_name.as_str()).is_none() {
+                        if !cond_lookup.contains_key(cond_name.as_str()) {
                             log::warn!(
                                 "File {:?} Component {}::{} references an unknown condition '{}'",
                                 path,
diff --git a/rust/cmsis-pack/src/lib.rs b/rust/cmsis-pack/src/lib.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::upper_case_acronyms)]
+
 pub mod pack_index;
 pub mod pdsc;
 pub mod update;
diff --git a/rust/cmsis-pack/src/pdsc/device.rs b/rust/cmsis-pack/src/pdsc/device.rs
@@ -162,11 +162,13 @@ impl ProcessorBuilder {
             mpu: self.mpu.or(other.mpu.clone()),
         }
     }
-    fn build(self, debugs: &Vec<Debug>) -> Result<Vec<Processor>, Error> {
+    fn build(self, debugs: &[Debug]) -> Result<Vec<Processor>, Error> {
         let units = self.units.unwrap_or(1);
         let name = self.name.clone();
 
-        let map = (0..units)
+        
+
+        (0..units)
             .map(|unit| {
                 // The attributes we're interested in may be spread across multiple debug
                 // attributes defined in the family, subfamily, or device; and which may or may not
@@ -176,7 +178,10 @@ impl ProcessorBuilder {
                 // family and subfamily debug elements are appended after device debug elements.
                 let debugs_iterator = debugs.iter().filter(|debug| {
                     // If Pname or Punit are present on the <debug> element, they must match.
-                    debug.name.as_ref().map_or(true, |n| Some(n) == name.as_ref())
+                    debug
+                        .name
+                        .as_ref()
+                        .map_or(true, |n| Some(n) == name.as_ref())
                         && debug.unit.map_or(true, |u| u == unit)
                 });
 
@@ -204,9 +209,7 @@ impl ProcessorBuilder {
                         .find_map(|d| d.default_reset_sequence.clone()),
                 })
             })
-            .collect::<Result<Vec<_>, _>>();
-
-        map
+            .collect::<Result<Vec<_>, _>>()
     }
 }
 
@@ -240,7 +243,7 @@ impl ProcessorsBuilder {
     }
 
     fn merge_into(&mut self, other: Self) {
-        self.0.extend(other.0.into_iter());
+        self.0.extend(other.0);
     }
 
     fn build(self, debugs: Vec<Debug>) -> Result<Vec<Processor>, Error> {
@@ -362,12 +365,12 @@ impl DebugsBuilder {
 
 impl DebugsBuilder {
     fn merge(mut self, parent: &Self) -> Self {
-        self.0.extend(parent.0.iter().map(|v| v.clone()));
+        self.0.extend(parent.0.iter().cloned());
         self
     }
 
     fn merge_into(&mut self, other: Self) {
-        self.0.extend(other.0.into_iter())
+        self.0.extend(other.0)
     }
 
     fn build(self) -> Vec<Debug> {
@@ -418,9 +421,9 @@ enum NumberBool {
     True,
 }
 
-impl Into<bool> for NumberBool {
-    fn into(self) -> bool {
-        match self {
+impl From<NumberBool> for bool {
+    fn from(val: NumberBool) -> Self {
+        match val {
             NumberBool::True => true,
             NumberBool::False => false,
         }
@@ -554,7 +557,7 @@ impl FromElem for Algorithm {
         let file_name: &str = attr_map(e, "name")?;
         let style = attr_parse(e, "style").ok().unwrap_or(AlgorithmStyle::Keil);
         Ok(Self {
-            file_name: file_name.replace("\\", "/").into(),
+            file_name: file_name.replace('\\', "/").into(),
             start: attr_parse_hex(e, "start")?,
             size: attr_parse_hex(e, "size")?,
             ram_start: attr_parse_hex(e, "RAMstart").ok(),
@@ -680,7 +683,7 @@ impl<'dom> DeviceBuilder<'dom> {
     }
 }
 
-fn parse_device<'dom>(e: &'dom Element) -> Vec<DeviceBuilder<'dom>> {
+fn parse_device(e: &Element) -> Vec<DeviceBuilder<'_>> {
     let mut device = DeviceBuilder::from_elem(e);
     let variants = e
         .children()
@@ -723,7 +726,7 @@ fn parse_device<'dom>(e: &'dom Element) -> Vec<DeviceBuilder<'dom>> {
     }
 }
 
-fn parse_sub_family<'dom>(e: &'dom Element) -> Vec<DeviceBuilder<'dom>> {
+fn parse_sub_family(e: &Element) -> Vec<DeviceBuilder<'_>> {
     let mut sub_family_device = DeviceBuilder::from_elem(e);
     let devices = e
         .children()
@@ -808,14 +811,10 @@ pub struct Devices(pub HashMap<String, Device>);
 impl FromElem for Devices {
     fn from_elem(e: &Element) -> Result<Self, Error> {
         e.children()
-            .fold(Ok(HashMap::new()), |res, c| match (res, parse_family(c)) {
-                (Ok(mut devs), Ok(add_this)) => {
-                    devs.extend(add_this.into_iter().map(|dev| (dev.name.clone(), dev)));
-                    Ok(devs)
-                }
-                (Ok(_), Err(e)) => Err(e),
-                (Err(e), Ok(_)) => Err(e),
-                (Err(e), Err(_)) => Err(e),
+            .try_fold(HashMap::new(), |mut res, c| {
+                let add_this = parse_family(c)?;
+                res.extend(add_this.into_iter().map(|dev| (dev.name.clone(), dev)));
+                Ok(res)
             })
             .map(Devices)
     }
diff --git a/rust/cmsis-pack/src/pdsc/mod.rs b/rust/cmsis-pack/src/pdsc/mod.rs
@@ -220,8 +220,8 @@ impl Package {
             .collect()
     }
 
-    pub fn make_condition_lookup<'a>(&'a self) -> HashMap<&'a str, &'a Condition> {
-        let mut map = HashMap::with_capacity(self.conditions.0.iter().count());
+    pub fn make_condition_lookup(&self) -> HashMap<&str, &Condition> {
+        let mut map = HashMap::with_capacity(self.conditions.0.len());
         for cond in self.conditions.0.iter() {
             if let Some(dup) = map.insert(cond.id.as_str(), cond) {
                 log::warn!("Duplicate Condition found {}", dup.id);
@@ -230,7 +230,7 @@ impl Package {
         map
     }
 
-    pub fn make_dump_devices<'a>(&'a self) -> Vec<(&'a str, DumpDevice<'a>)> {
+    pub fn make_dump_devices(&self) -> Vec<(&str, DumpDevice<'_>)> {
         let from_pack = FromPack::new(
             &self.vendor,
             &self.name,
diff --git a/rust/cmsis-pack/src/update/download.rs b/rust/cmsis-pack/src/update/download.rs
diff --git a/rust/cmsis-pack/src/update/mod.rs b/rust/cmsis-pack/src/update/mod.rs
diff --git a/rust/cmsis-pack/src/utils/parse.rs b/rust/cmsis-pack/src/utils/parse.rs

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+avoid-breaking-exported-api = true`
	`2`	`+msrv = "1.71.0"`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ pub struct Config {`
`12`	`12`	`pack_store: PathBuf,`
`13`	`13`	`}`
`14`	`14`
	`15`	`+#[derive(Default)]`
`15`	`16`	`pub struct ConfigBuilder {`
`16`	`17`	`pack_store: Option<PathBuf>,`
`17`	`18`	`}`
`@@ -40,12 +41,6 @@ impl ConfigBuilder {`
`40`	`41`	`}`
`41`	`42`	`}`
`42`	`43`
`43`		`-impl Default for ConfigBuilder {`
`44`		`- fn default() -> Self {`
`45`		`- Self { pack_store: None }`
`46`		`- }`
`47`		`-}`
`48`		`-`
`49`	`44`	`impl Config {`
`50`	`45`	`pub fn new() -> Result<Config, Error> {`
`51`	`46`	`ConfigBuilder::default().build()`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ impl Config {`
`68`	`68`	`}`
`69`	`69`	`match OpenOptions::new()`
`70`	`70`	`.create(true)`
	`71`	`+ .truncate(true)`
`71`	`72`	`.write(true)`
`72`	`73`	`.open(&self.vidx_list)`
`73`	`74`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+#![allow(clippy::upper_case_acronyms)]`
	`2`	`+`
`1`	`3`	`pub mod pack_index;`
`2`	`4`	`pub mod pdsc;`
`3`	`5`	`pub mod update;`