update to edition 2024, fix clippy errors

Author: syphar

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "rustwide"
 version = "0.21.0"
-edition = "2018"
+edition = "2024"
 build = "build.rs"
 
 documentation = "https://docs.rs/rustwide"

src/crates/git.rs

@@ -23,11 +23,10 @@ impl GitRepo {
 
         match res {
             Ok(out) => {
-                if let Some(shaline) = out.stdout_lines().first() {
-                    if !shaline.is_empty() {
+                if let Some(shaline) = out.stdout_lines().first()
+                    && !shaline.is_empty() {
                         return Some(shaline.to_string());
                     }
-                }
                 warn!("bad output from `git rev-parse HEAD`");
             }
             Err(e) => {

src/inside_docker.rs

@@ -69,12 +69,11 @@ pub(crate) fn probe_container_id(workspace: &Workspace) -> anyhow::Result<Option
             .log_output(false)
             .log_command(false)
             .run_capture();
-        if let Ok([probed]) = res.as_ref().map(|out| out.stdout_lines()) {
-            if *probed == probe_content {
+        if let Ok([probed]) = res.as_ref().map(|out| out.stdout_lines())
+            && *probed == probe_content {
                 info!("probe successful, this is container ID {id}");
                 return Ok(Some(id.clone()));
             }
-        }
     }
 
     info!("probe unsuccessful, this is not running inside a container");

src/logging.rs

@@ -174,38 +174,35 @@ impl SealedLog for LogStorage {
         if inner.truncated {
             return;
         }
-        if let Some(max_lines) = self.max_lines {
-            if inner.records.len() >= max_lines {
+        if let Some(max_lines) = self.max_lines
+            && inner.records.len() >= max_lines {
                 inner.records.push(StoredRecord {
                     level: Level::Warn,
                     message: "too many lines in the log, truncating it".into(),
                 });
                 inner.truncated = true;
                 return;
             }
-        }
         let mut message = record.args().to_string();
 
-        if let Some(max_line_length) = self.max_line_length {
-            if message.len() > max_line_length {
+        if let Some(max_line_length) = self.max_line_length
+            && message.len() > max_line_length {
                 let mut length = max_line_length - 3;
                 while !message.is_char_boundary(length) {
                     length -= 1;
                 }
                 message = format!("{}...", &message[..length]);
             }
-        }
 
-        if let Some(max_size) = self.max_size {
-            if inner.size + message.len() >= max_size {
+        if let Some(max_size) = self.max_size
+            && inner.size + message.len() >= max_size {
                 inner.records.push(StoredRecord {
                     level: Level::Warn,
                     message: "too much data in the log, truncating it".into(),
                 });
                 inner.truncated = true;
                 return;
             }
-        }
         inner.size += message.len();
         inner.records.push(StoredRecord {
             level: record.level(),

src/prepare.rs

@@ -272,24 +272,22 @@ impl<'a> TomlTweaker<'a> {
 
     fn remove_missing_items(&mut self, category: &str) {
         let folder = &(String::from(category) + "s");
-        if let Some(dir) = self.dir {
-            if let Some(&mut Value::Array(ref mut array)) = self.table.get_mut(category) {
+        if let Some(dir) = self.dir
+            && let Some(&mut Value::Array(ref mut array)) = self.table.get_mut(category) {
                 let dim = array.len();
                 *(array) = Self::test_existance(dir, array, folder);
                 info!("removed {} missing {}", dim - array.len(), folder);
             }
-        }
     }
 
     fn remove_parent_workspaces(&mut self) {
         let krate = self.krate.to_string();
 
         // Eliminate parent workspaces
-        if let Some(&mut Value::Table(ref mut package)) = self.table.get_mut("package") {
-            if package.remove("workspace").is_some() {
+        if let Some(&mut Value::Table(ref mut package)) = self.table.get_mut("package")
+            && package.remove("workspace").is_some() {
                 info!("removed parent workspace from {krate}");
             }
-        }
     }
 
     fn remove_unwanted_cargo_features(&mut self) {

src/utils.rs

@@ -128,12 +128,11 @@ pub(crate) fn normalize_path(path: &Path) -> PathBuf {
         let mut components = p.components();
         let first_component = components.next().unwrap();
 
-        if let Component::Prefix(prefix) = first_component {
-            if let Some(mut modified_path) = strip_verbatim_from_prefix(&prefix) {
+        if let Component::Prefix(prefix) = first_component
+            && let Some(mut modified_path) = strip_verbatim_from_prefix(&prefix) {
                 modified_path.push(components.as_path());
                 p = modified_path;
             }
-        }
 
         if p.as_os_str().len() >= MAX_PATH_LEN {
             warn!(