fix: update code to solve clippy issues

henrybarreto · henrybarreto · commit 17f9deeee5b6 · 2025-04-03T12:57:55.000-03:00
diff --git a/updatehub-cloud-sdk/src/api.rs b/updatehub-cloud-sdk/src/api.rs
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use serde::Serialize;
-use std::{collections::BTreeMap, fs, path::Path};
+use std::{collections::BTreeMap, fmt::Write, fs, path::Path};
 
 #[derive(Debug)]
 pub enum ProbeResponse {
@@ -33,7 +33,7 @@ pub struct FirmwareMetadata<'a> {
 
 pub struct MetadataValue<'a>(pub &'a BTreeMap<String, Vec<String>>);
 
-impl<'a> serde::ser::Serialize for MetadataValue<'a> {
+impl serde::ser::Serialize for MetadataValue<'_> {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
         S: serde::ser::Serializer,
@@ -59,7 +59,11 @@ impl UpdatePackage {
     }
 
     pub fn package_uid(&self) -> String {
-        openssl::sha::sha256(&self.raw).iter().map(|c| format!("{:02x}", c)).collect()
+        openssl::sha::sha256(&self.raw).iter().fold(String::new(), |mut output, c| {
+            let _ = write!(output, "{c:02x}");
+
+            output
+        })
     }
 
     pub fn version(&self) -> &str {
diff --git a/updatehub-cloud-sdk/src/client.rs b/updatehub-cloud-sdk/src/client.rs
@@ -85,7 +85,7 @@ impl<'a> Client<'a> {
 
         let response = self
             .client
-            .post(&format!("{}/upgrades", &self.server))
+            .post(format!("{}/upgrades", &self.server))
             .header("api-retries", num_retries.to_string())
             .json(&firmware)
             .send()
@@ -181,7 +181,7 @@ impl<'a> Client<'a> {
         let payload =
             Payload { state, firmware, package_uid, previous_state, error_message, current_log };
 
-        self.client.post(&format!("{}/report", &self.server)).json(&payload).send().await?;
+        self.client.post(format!("{}/report", &self.server)).json(&payload).send().await?;
         Ok(())
     }
 }
diff --git a/updatehub-sdk/src/api/info/firmware.rs b/updatehub-sdk/src/api/info/firmware.rs
@@ -125,7 +125,7 @@ impl<'de> Deserialize<'de> for MetadataValue {
     }
 }
 
-impl<'a> Index<&'a str> for MetadataValue {
+impl Index<&str> for MetadataValue {
     type Output = Vec<String>;
 
     #[inline]
diff --git a/updatehub-sdk/src/client.rs b/updatehub-sdk/src/client.rs
@@ -43,7 +43,7 @@ impl Client {
     /// This method fails when cannot complete the request at the address or
     /// cannot parse the body json as a `info::Response`.
     pub async fn info(&self) -> Result<api::info::Response> {
-        let response = self.client.get(&format!("{}/info", self.server_address)).send().await?;
+        let response = self.client.get(format!("{}/info", self.server_address)).send().await?;
 
         match response.status() {
             StatusCode::OK => Ok(response.json().await?),
@@ -110,7 +110,7 @@ impl Client {
     pub async fn local_install(&self, file: &Path) -> Result<api::state::Response> {
         let response = self
             .client
-            .post(&format!("{}/local_install", self.server_address))
+            .post(format!("{}/local_install", self.server_address))
             .json(&api::local_install::Request { file: file.to_owned() })
             .send()
             .await?;
@@ -139,7 +139,7 @@ impl Client {
     pub async fn remote_install(&self, url: &str) -> Result<api::state::Response> {
         let response = self
             .client
-            .post(&format!("{}/remote_install", self.server_address))
+            .post(format!("{}/remote_install", self.server_address))
             .json(&api::remote_install::Request { url: url.to_owned() })
             .send()
             .await?;
@@ -167,7 +167,7 @@ impl Client {
     pub async fn abort_download(&self) -> Result<api::state::Response> {
         let response = self
             .client
-            .post(&format!("{}/update/download/abort", self.server_address))
+            .post(format!("{}/update/download/abort", self.server_address))
             .send()
             .await?;
 
@@ -193,7 +193,7 @@ impl Client {
     /// This method fails when cannot complete the request at the address or
     /// cannot parse the body json as a `log::Log`.
     pub async fn log(&self) -> Result<api::log::Log> {
-        let response = self.client.get(&format!("{}/log", self.server_address)).send().await?;
+        let response = self.client.get(format!("{}/log", self.server_address)).send().await?;
 
         match response.status() {
             StatusCode::OK => Ok(response.json().await?),
diff --git a/updatehub-sdk/src/listener.rs b/updatehub-sdk/src/listener.rs
@@ -103,7 +103,7 @@ impl StateChange {
         F: Fn(Handler) -> Fut + 'static,
         Fut: Future<Output = Result<()>> + 'static,
     {
-        self.callbacks.entry(state).or_insert_with(Vec::new).push(Box::new(move |d| Box::pin(f(d))))
+        self.callbacks.entry(state).or_default().push(Box::new(move |d| Box::pin(f(d))))
     }
 
     /// Start the agent to listen for messages on the socket.
diff --git a/updatehub/src/cloud_mock.rs b/updatehub/src/cloud_mock.rs
@@ -6,11 +6,11 @@ use cloud::{Error, Result, api};
 use std::{cell::RefCell, marker::PhantomData, path::Path};
 
 std::thread_local! {
-    static RESPONSE_CONFIG: RefCell<FakeResponse> = RefCell::new(FakeResponse::NoUpdate);
+    static RESPONSE_CONFIG: RefCell<FakeResponse> = const { RefCell::new(FakeResponse::NoUpdate) };
 }
 
 std::thread_local! {
-    static OBJECT_DATA: RefCell<Option<Vec<u8>>> = RefCell::new(Option::None);
+    static OBJECT_DATA: RefCell<Option<Vec<u8>>> = const { RefCell::new(Option::None) };
 }
 
 pub(crate) enum FakeResponse {
diff --git a/updatehub/src/firmware/tests.rs b/updatehub/src/firmware/tests.rs
@@ -124,7 +124,8 @@ pub(crate) fn create_fake_starup_callbacks(metadata_dir: &Path, output_file: &Pa
         let mut file = fs::OpenOptions::new()
             .write(true)
             .create(true)
-            .open(&metadata_dir.join(script))
+            .truncate(false)
+            .open(metadata_dir.join(script))
             .unwrap();
         writeln!(file, "#!/bin/sh\necho $0 >> {}", output_file.to_string_lossy()).unwrap();
         let mut permissions = fs::metadata(metadata_dir).unwrap().permissions();
diff --git a/updatehub/src/mem_drain.rs b/updatehub/src/mem_drain.rs
@@ -49,6 +49,7 @@ impl Serialize for MemDrain {
     }
 }
 
+#[allow(clippy::to_string_trait_impl)]
 impl ToString for MemDrain {
     fn to_string(&self) -> String {
         let records = self.records.read().unwrap();
diff --git a/updatehub/src/object/installer/copy.rs b/updatehub/src/object/installer/copy.rs
@@ -78,7 +78,7 @@ impl Installer for objects::Copy {
                 .read(true)
                 .write(true)
                 .create(true)
-                .truncate(true)
+                .truncate(false)
                 .open(&dest)
                 .await
                 .log_error_msg("failed to open target file")?,
@@ -165,7 +165,7 @@ mod tests {
         // Generate the source file
         let download_dir = tempfile::tempdir()?;
         let mut source = tempfile::NamedTempFile::new_in(download_dir.path())?;
-        let original_data = iter::repeat(DEFAULT_BYTE).take(FILE_SIZE).collect::<Vec<_>>();
+        let original_data = std::iter::repeat_n(DEFAULT_BYTE, FILE_SIZE).collect::<Vec<_>>();
         let data = if compressed {
             let mut e = GzEncoder::new(Vec::new(), Compression::default());
             e.write_all(&original_data).unwrap();
@@ -182,7 +182,7 @@ mod tests {
 
             fs::File::create(&file)
                 .await?
-                .write_all(&iter::repeat(ORIGINAL_BYTE).take(FILE_SIZE).collect::<Vec<_>>())
+                .write_all(&std::iter::repeat_n(ORIGINAL_BYTE, FILE_SIZE).collect::<Vec<_>>())
                 .await?;
 
             if let Some(mode) = perm.target_mode {
diff --git a/updatehub/src/object/installer/imxkobs.rs b/updatehub/src/object/installer/imxkobs.rs
@@ -25,11 +25,8 @@ impl Installer for objects::Imxkobs {
 
         let should_skip_install =
             super::should_skip_install(&self.install_if_different, &self.sha256sum, async {
-                let path = self
-                    .chip_0_device_path
-                    .as_ref()
-                    .map(PathBuf::clone)
-                    .unwrap_or_else(|| PathBuf::from("/dev/mtd0"));
+                let path =
+                    self.chip_0_device_path.clone().unwrap_or_else(|| PathBuf::from("/dev/mtd0"));
                 let f = path.file_name().ok_or(Error::InvalidPath)?;
                 let mut file_name = f.to_os_string();
                 file_name.push("ro");
diff --git a/updatehub/src/object/installer/raw.rs b/updatehub/src/object/installer/raw.rs
@@ -138,7 +138,7 @@ mod tests {
         let download_dir = tempdir()?;
 
         let mut source = NamedTempFile::new_in(download_dir.path())?;
-        let original_data = iter::repeat(ORIGINAL_BYTE).take(size as usize).collect::<Vec<_>>();
+        let original_data = std::iter::repeat_n(ORIGINAL_BYTE, size as usize).collect::<Vec<_>>();
         let data = if compressed {
             let mut e = GzEncoder::new(Vec::new(), Compression::default());
             e.write_all(&original_data).unwrap();
@@ -150,7 +150,7 @@ mod tests {
         source.seek(SeekFrom::Start(0))?;
 
         let mut dest = NamedTempFile::new_in(download_dir.path())?;
-        dest.write_all(&iter::repeat(DEFAULT_BYTE).take(size as usize).collect::<Vec<_>>())?;
+        dest.write_all(&std::iter::repeat_n(DEFAULT_BYTE, size as usize).collect::<Vec<_>>())?;
         dest.seek(SeekFrom::Start(0))?;
 
         Ok((
diff --git a/updatehub/src/object/installer/uboot_env.rs b/updatehub/src/object/installer/uboot_env.rs
@@ -48,7 +48,7 @@ impl Installer for objects::UbootEnv {
                 .read(true)
                 .write(true)
                 .create(true)
-                .truncate(true)
+                .truncate(false)
                 .open(&dest)
                 .await
                 .log_error_msg("failed to open target file")?,
diff --git a/updatehub/src/runtime_settings.rs b/updatehub/src/runtime_settings.rs
@@ -103,7 +103,7 @@ impl RuntimeSettings {
                 .map(|s| RuntimeSettings { inner: s, v1_content: Some(content.to_string()) })
         });
 
-        runtime_settings.map_err(Error::from)
+        runtime_settings
     }
 
     fn save(&self) -> Result<()> {
diff --git a/updatehub/src/setup_mock_env.rs b/updatehub/src/setup_mock_env.rs
@@ -70,6 +70,6 @@ fn start_mock(mut server: mockito::ServerGuard, product_uid: &str) -> mockito::M
         .match_header("Content-Type", "application/json")
         .match_header("Api-Content-Type", "application/vnd.updatehub-v1+json")
         .with_status(200)
-        .with_body(std::iter::repeat(0xF).take(40960).collect::<Vec<_>>())
+        .with_body(std::iter::repeat_n(0xF, 40960).collect::<Vec<_>>())
             .create()
 }
diff --git a/updatehub/src/states/download.rs b/updatehub/src/states/download.rs
@@ -186,7 +186,7 @@ mod test {
     use walkdir::WalkDir;
 
     fn fake_download_object(size: usize) -> (Vec<u8>, String) {
-        let vec = std::iter::repeat(0xF).take(size).collect::<Vec<_>>();
+        let vec = std::iter::repeat_n(0xF, size).collect::<Vec<_>>();
         let shasum = utils::sha256sum(&vec);
         (vec, shasum)
     }
diff --git a/updatehub/src/tests.rs b/updatehub/src/tests.rs
@@ -164,7 +164,7 @@ impl TestEnvironmentBuilder {
             }
 
             for bin in self.extra_binaries.into_iter() {
-                let mut file = fs::File::create(&bin_dir_path.join(&bin)).unwrap();
+                let mut file = fs::File::create(bin_dir_path.join(&bin)).unwrap();
                 writeln!(file, "#!/bin/sh\necho {} $@ >> {}", bin, output_file.to_string_lossy())
                     .unwrap();
                 let mut permissions = file.metadata().unwrap().permissions();
diff --git a/updatehub/src/utils/delta.rs b/updatehub/src/utils/delta.rs
@@ -64,8 +64,13 @@ where
         + From<bitar::CompressionError>,
 {
     // Open output file
-    let mut output_file =
-        fs::OpenOptions::new().create(true).write(true).read(true).open(output).await?;
+    let mut output_file = fs::OpenOptions::new()
+        .create(true)
+        .truncate(false)
+        .write(true)
+        .read(true)
+        .open(output)
+        .await?;
     output_file.seek(std::io::SeekFrom::Start(output_seek)).await?;
 
     // Scan the output file for chunks and build a chunk index
diff --git a/updatehub/src/utils/mod.rs b/updatehub/src/utils/mod.rs
@@ -13,6 +13,7 @@ pub(crate) mod mtd;
 pub(crate) mod deserialize;
 
 use derive_more::{Display, Error, From};
+use std::fmt::Write;
 
 pub type Result<T> = std::result::Result<T, Error>;
 
@@ -70,7 +71,11 @@ pub enum Error {
 /// Encode a bytes stream in hex
 #[inline]
 pub(crate) fn hex_encode(data: &[u8]) -> String {
-    data.iter().map(|c| format!("{:02x}", c)).collect()
+    data.iter().fold(String::new(), |mut output, c| {
+        let _ = write!(output, "{c:02x}");
+
+        output
+    })
 }
 
 /// Get sha256sum hash from a byte stream
diff --git a/updatehub/src/utils/mtd.rs b/updatehub/src/utils/mtd.rs
@@ -47,7 +47,7 @@ pub(crate) fn target_device_from_mtd_name(name: &str) -> Result<PathBuf> {
 
     BufReader::new(proc)
         .lines()
-        .filter_map(std::result::Result::ok)
+        .map_while(std::result::Result::ok)
         .find_map(|line| {
             re.captures(&line).and_then(|re_match| {
                 let re_dev = re_match.name("dev").unwrap().as_str();
diff --git a/updatehub/tests/common.rs b/updatehub/tests/common.rs
@@ -336,7 +336,7 @@ pub fn create_mock_server(server: &mut mockito::ServerGuard, mode: FakeServer) -
             .match_header("Content-Type", "application/json")
             .match_header("Api-Content-Type", "application/vnd.updatehub-v1+json")
             .with_status(200)
-                .with_body(std::iter::repeat(0xF).take(40960).collect::<Vec<_>>())
+                .with_body(std::iter::repeat_n(0xF, 40960).collect::<Vec<_>>())
             .create()
         }
         FakeServer::CheckRequirementsTest(product_uid) => {
@@ -357,7 +357,7 @@ pub fn create_mock_server(server: &mut mockito::ServerGuard, mode: FakeServer) -
             .match_header("Content-Type", "application/json")
             .match_header("Api-Content-Type", "application/vnd.updatehub-v1+json")
             .with_status(200)
-                .with_body(std::iter::repeat(0xF).take(40960).collect::<Vec<_>>())
+                .with_body(std::iter::repeat_n(0xF, 40960).collect::<Vec<_>>())
             .create()
         }
         FakeServer::RemoteInstall => {

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ impl<'de> Deserialize<'de> for MetadataValue {`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`
`128`		`-impl<'a> Index<&'a str> for MetadataValue {`
	`128`	`+impl Index<&str> for MetadataValue {`
`129`	`129`	`type Output = Vec<String>;`
`130`	`130`
`131`	`131`	`#[inline]`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ impl StateChange {`
`103`	`103`	`F: Fn(Handler) -> Fut + 'static,`
`104`	`104`	`Fut: Future<Output = Result<()>> + 'static,`
`105`	`105`	`{`
`106`		`- self.callbacks.entry(state).or_insert_with(Vec::new).push(Box::new(move \|d\| Box::pin(f(d))))`
	`106`	`+ self.callbacks.entry(state).or_default().push(Box::new(move \|d\| Box::pin(f(d))))`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`/// Start the agent to listen for messages on the socket.`
Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,11 @@ use cloud::{Error, Result, api};`
`6`	`6`	`use std::{cell::RefCell, marker::PhantomData, path::Path};`
`7`	`7`
`8`	`8`	`std::thread_local! {`
`9`		`- static RESPONSE_CONFIG: RefCell<FakeResponse> = RefCell::new(FakeResponse::NoUpdate);`
	`9`	`+ static RESPONSE_CONFIG: RefCell<FakeResponse> = const { RefCell::new(FakeResponse::NoUpdate) };`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`std::thread_local! {`
`13`		`- static OBJECT_DATA: RefCell<Option<Vec<u8>>> = RefCell::new(Option::None);`
	`13`	`+ static OBJECT_DATA: RefCell<Option<Vec<u8>>> = const { RefCell::new(Option::None) };`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`pub(crate) enum FakeResponse {`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ impl Serialize for MemDrain {`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
	`52`	`+#[allow(clippy::to_string_trait_impl)]`
`52`	`53`	`impl ToString for MemDrain {`
`53`	`54`	`fn to_string(&self) -> String {`
`54`	`55`	`let records = self.records.read().unwrap();`