clippy

TyberiusPrime · TyberiusPrime · commit c9eb3e905aeb · 2024-09-16T16:13:31.000+02:00
diff --git a/src/config.rs b/src/config.rs
@@ -256,21 +256,12 @@ impl Anysnake2 {
     }
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Debug, Default)]
 pub struct DevShell {
     pub inputs: Option<Vec<String>>,
     pub shell: Option<String>,
 }
 
-impl Default for DevShell {
-    fn default() -> Self {
-        DevShell {
-            inputs: None,
-            shell: None,
-        }
-    }
-}
-
 #[derive(Deserialize, Debug)]
 pub struct TofuDevShell {
     pub inputs: Vec<String>,
@@ -426,9 +417,9 @@ impl TofuPythonPackageSource {
 
 #[cfg(test)]
 mod test {
-    use serde_json::json;
+    
 
-    use crate::{config::remove_username_from_url, vcs::{TofuVCS}};
+    
 
     
 
@@ -494,6 +485,7 @@ impl<'de> Deserialize<'de> for StrOrHashMap {
 }
 
 impl<'de> Deserialize<'de> for PythonPackageDefinition {
+    #[allow(clippy::too_many_lines)]
     fn deserialize<D>(deserializer: D) -> StdResult<Self, D::Error>
     where
         D: Deserializer<'de>,
diff --git a/src/flake_writer.rs b/src/flake_writer.rs
@@ -108,7 +108,7 @@ pub fn write_flake(
                                                //
                                                ////todo: does rust even need to be a special case?
     add_jupyter_kernels(
-        &parsed_config,
+        parsed_config,
         &mut definitions,
         &mut nixpkgs_pkgs,
         &mut rust_extensions,
@@ -207,7 +207,7 @@ pub fn write_flake(
         &flake_filename,
         flake_dir,
     )?;
-    res = res | python_locks_changed;
+    res |= python_locks_changed;
 
     run_git_add(&git_tracked_files, flake_dir)?;
     run_git_commit(flake_dir)?; //after nix 2.23 we will need to commit the flake, possibly. At
@@ -293,7 +293,7 @@ fn insert_allow_unfree(
         "\"%PERMITTED_INSECURE_PACKAGES%\"",
         &(permitted_insecure_packages
             .as_ref()
-            .map_or_else(|| String::new(), |x| x.join(" "))),
+            .map_or_else(String::new, |x| x.join(" "))),
     )
 }
 
@@ -304,18 +304,14 @@ fn add_jupyter_kernels(
     rust_extensions: &mut Vec<String>,
 ) {
     let mut jupyter_kernels = String::new();
-    let jupyter_included = parsed_config
-        .python
-        .as_ref()
-        .map(|p| {
-            p.packages
-                .iter()
-                .any(|(k, _)| k == "jupyter" || k == "notebook" || k == "jupyterlab")
-        })
-        .unwrap_or(false);
+    let jupyter_included = parsed_config.python.as_ref().is_some_and(|p| {
+        p.packages
+            .iter()
+            .any(|(k, _)| k == "jupyter" || k == "notebook" || k == "jupyterlab")
+    });
     if let Some(r) = &parsed_config.r {
         // install R kernel
-        if jupyter_included && r.packages.iter().any(|x| x == "IRkernel") && jupyter_included {
+        if jupyter_included && r.packages.iter().any(|x| x == "IRkernel") {
             jupyter_kernels.push_str(
                 "
                 mkdir $out/share/jupyter/kernels/R
@@ -347,12 +343,13 @@ fn add_jupyter_kernels(
         .to_string()
             + &jupyter_kernels;
     }
-    if jupyter_included  && !jupyter_kernels.is_empty(){
+    if jupyter_included && !jupyter_kernels.is_empty() {
         definitions.insert(
             "zzz_jupyter_kernel_drv".to_string(),
             "pkgs.runCommand \"anysnake2-jupyter-kernels\" {} ''
                 mkdir -p $out/share/jupyter/kernels
-            ".to_string()
+            "
+            .to_string()
                 + &jupyter_kernels
                 + "''",
         );
@@ -534,8 +531,7 @@ fn copy_for_poetry(
 ) -> Result<String> {
     let pre_poetry_patch_sha = pre_poetry_patch
         .as_ref()
-        .map(|x| sha256::digest(x))
-        .unwrap_or_else(|| "None".to_string());
+        .map_or_else(|| "None".to_string(), sha256::digest);
 
     let target_path = pyproject_toml_path
         .parent()
@@ -1131,6 +1127,7 @@ fn format_poetry_build_input_overrides(
 }
 
 #[allow(clippy::too_many_arguments)]
+#[allow(clippy::too_many_lines)]
 fn add_python(
     parsed_config: &mut config::TofuConfigToml,
     inputs: &mut Vec<InputFlake>,
@@ -1148,9 +1145,9 @@ fn add_python(
     match &mut parsed_config.python {
         Some(python) => {
             let original_pyproject_toml =
-                ex::fs::read_to_string(pyproject_toml_path).unwrap_or_else(|_| "".to_string());
+                ex::fs::read_to_string(pyproject_toml_path).unwrap_or_else(|_| String::new());
             let original_poetry_lock =
-                ex::fs::read_to_string(poetry_lock_path).unwrap_or_else(|_| "".to_string());
+                ex::fs::read_to_string(poetry_lock_path).unwrap_or_else(|_| String::new());
 
             if !Regex::new(r"^\d+\.\d+$").unwrap().is_match(&python.version) {
                 bail!(
@@ -1255,9 +1252,9 @@ fn add_python(
             git_tracked_files.push("poetry_rewritten/poetry.lock".to_string());
             git_tracked_files.push("poetry_rewritten/pyproject.toml".to_string());
             let new_pyproject_toml =
-                ex::fs::read_to_string(pyproject_toml_path).unwrap_or_else(|_| "".to_string());
+                ex::fs::read_to_string(pyproject_toml_path).unwrap_or_else(|_| String::new());
             let new_poetry_lock =
-                ex::fs::read_to_string(poetry_lock_path).unwrap_or_else(|_| "".to_string());
+                ex::fs::read_to_string(poetry_lock_path).unwrap_or_else(|_| String::new());
             if new_pyproject_toml != original_pyproject_toml
                 || new_poetry_lock != original_poetry_lock
             {
diff --git a/src/tofu.rs b/src/tofu.rs
@@ -22,6 +22,7 @@ trait Tofu<A> {
 }
 
 impl Tofu<config::TofuConfigToml> for config::ConfigToml {
+    #[allow(clippy::too_many_lines)]
     fn tofu(self, updates: &mut TomlUpdates) -> Result<config::TofuConfigToml> {
         let converted_clone_regexps = match self.clone_regexps {
             Some(cr) => Some(clone_regex_strings_to_regex(cr)?),
@@ -388,6 +389,7 @@ impl TofuToNewest<Option<config::TofuRust>> for Option<config::Rust> {
             None => None,
             Some(rust) => {
                 let url = tofu_repo_to_newest(&url_toml_name, updates, rust.url, default_url)?;
+                #[allow(clippy::single_match_else)]
                 let version = match rust.version {
                     Some(v) => v,
                     None => {
@@ -402,7 +404,7 @@ impl TofuToNewest<Option<config::TofuRust>> for Option<config::Rust> {
                         let rust = json["packages"]["x86_64-linux"]["default"]["name"]
                             .as_str()
                             .context("Could not find default version in flake show")?;
-                        let actual_version = rust.split("-").last().context("rust version naming scheme changed, expected something like 'rust-default-1.81.0?'")?;
+                        let actual_version = rust.split('-').last().context("rust version naming scheme changed, expected something like 'rust-default-1.81.0?'")?;
                         debug!("Found version: {actual_version}");
                         actual_version.to_string()
                     }
@@ -431,6 +433,7 @@ impl TofuToNewest<Option<config::TofuR>> for Option<config::R> {
             Some(inner_self) => {
                 let url =
                     tofu_repo_to_newest(&ref_url_toml_name, updates, inner_self.url, default_url)?;
+                #[allow(clippy::single_match_else)]
                 let date = match inner_self.date {
                     Some(date) => date,
                     None => {
@@ -477,11 +480,11 @@ fn find_newest_nixr_date(url: &TofuVCS) -> Result<String> {
                 .find_iter(&text)
                 .map(|x| x.as_str())
                 .collect::<Vec<_>>();
-            all_dates.sort();
+            all_dates.sort_unstable();
             let last_date = all_dates
                 .last()
                 .with_context(|| format!("Could not find dates on {url}"))?;
-            Ok(last_date.to_string())
+            Ok((*last_date).to_string())
         }
         _ => {
             bail!("Only know how to determite newest date for R from nixR github, not from other VCS. Add it manually, please");
diff --git a/src/vcs.rs b/src/vcs.rs
@@ -2,7 +2,7 @@ use std::{borrow::Cow, collections::HashMap};
 
 use anyhow::{bail, Context, Result};
 use log::{debug, error};
-use serde::{Serialize, Serializer};
+use serde::{Serialize};
 use version_compare::Version;
 
 use crate::{
@@ -143,7 +143,7 @@ impl TofuVCS {
                 run_without_ctrl_c(|| {
                     let inner = || {
                         let mut proc = std::process::Command::new("hg");
-                        proc.args(["clone", &url, target_dir]);
+                        proc.args(["clone", url, target_dir]);
                         debug!("Running {:?}", proc);
                         let status = proc
                             .status()
@@ -152,7 +152,7 @@ impl TofuVCS {
                             bail!("hg clone failed for {self}");
                         }
                         let mut proc = std::process::Command::new("hg");
-                        proc.args(["checkout", &rev]);
+                        proc.args(["checkout", rev]);
                         proc.current_dir(target_dir);
                         debug!("Running {:?}", proc);
                         let status = proc
@@ -900,7 +900,7 @@ mod test {
             branch: "main".to_string(),
             rev: "123".to_string(),
         };
-        let str_vcs = format!("{}", git_vcs);
+        let str_vcs = git_vcs.to_string();
         assert!(str_vcs.contains("https://example.com"));
         assert!(!str_vcs.contains("user:password"));
     }
@@ -911,7 +911,7 @@ mod test {
             url: "https://user:password@example.com".to_string(),
             rev: "123".to_string(),
         };
-        let str_vcs = format!("{}", git_vcs);
+        let str_vcs = git_vcs.to_string();
         dbg!(&str_vcs);
         assert!(str_vcs.contains("https://example.com"));
         assert!(!str_vcs.contains("user:password"));
diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
@@ -672,7 +672,7 @@ fn test_empty() {
         run_test_tempdir("examples/test_empty", &["run", "--", "bash", "--version"]);
     assert!(stdout.contains("GNU bash"));
     let generated_anysnake2_toml = td.path().join("anysnake2.toml");
-    let read = ex::fs::read_to_string(&generated_anysnake2_toml).unwrap();
+    let read = ex::fs::read_to_string(generated_anysnake2_toml).unwrap();
     let parsed_toml = read.parse::<toml_edit::DocumentMut>().unwrap();
     assert!(parsed_toml.contains_key("anysnake2"));
     assert!(parsed_toml["anysnake2"]["rev"].as_str().is_some());
