From cd0fdb7ce0501cd101c7bb33352efcf609f72c80 Mon Sep 17 00:00:00 2001 From: David Knaack Date: Sat, 30 Dec 2023 17:29:37 +0100 Subject: [PATCH] chore: apply new rust 1.75 & nightly clippy fixes (#5646) chore: apply clippy fixes --- src/context.rs | 2 +- src/main.rs | 6 +++--- src/modules/direnv.rs | 26 ++++++++++++++++---------- src/modules/dotnet.rs | 4 ++-- src/modules/fossil_metrics.rs | 4 ++-- src/modules/kubernetes.rs | 21 +++++++++------------ src/modules/nix_shell.rs | 2 +- src/modules/openstack.rs | 2 +- src/modules/python.rs | 8 ++++---- src/modules/rust.rs | 12 ++++++------ src/modules/shlvl.rs | 2 +- src/print.rs | 4 ++-- src/utils.rs | 2 +- 13 files changed, 49 insertions(+), 46 deletions(-) diff --git a/src/context.rs b/src/context.rs index 56074469..1bd9c560 100644 --- a/src/context.rs +++ b/src/context.rs @@ -244,7 +244,7 @@ impl<'a> Context<'a> { .any(|env_var| self.get_env(env_var).is_some()) } - /// Returns true if 'detect_env_vars' is empty, + /// Returns true if `detect_env_vars` is empty, /// or if at least one environment variable is set and no negated environment variable is set pub fn detect_env_vars(&'a self, env_vars: &'a [&'a str]) -> bool { if env_vars.is_empty() { diff --git a/src/main.rs b/src/main.rs index cc30950a..1e22ce6c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -188,7 +188,7 @@ fn main() { (_, _, true) => Target::Continuation, (_, _, _) => Target::Main, }; - print::prompt(properties, target) + print::prompt(properties, target); } Commands::Module { name, @@ -211,7 +211,7 @@ fn main() { let context = Context::default(); if let Some(name) = name { if let Some(value) = value { - configure::update_configuration(&context, &name, &value) + configure::update_configuration(&context, &name, &value); } } else if let Err(reason) = configure::edit_configuration(&context, None) { eprintln!("Could not edit configuration: {reason}"); @@ -222,7 +222,7 @@ fn main() { configure::print_configuration(&Context::default(), default, &name); } Commands::Toggle { name, value } => { - configure::toggle_configuration(&Context::default(), &name, &value) + configure::toggle_configuration(&Context::default(), &name, &value); } Commands::BugReport => bug_report::create(), Commands::Time => { diff --git a/src/modules/direnv.rs b/src/modules/direnv.rs index 4f67800e..6378cb96 100644 --- a/src/modules/direnv.rs +++ b/src/modules/direnv.rs @@ -117,8 +117,8 @@ impl FromStr for AllowStatus { fn from_str(s: &str) -> Result { match s { - "true" => Ok(AllowStatus::Allowed), - "false" => Ok(AllowStatus::Denied), + "true" => Ok(Self::Allowed), + "false" => Ok(Self::Denied), _ => Err(Cow::from("invalid allow status")), } } @@ -152,7 +152,7 @@ mod tests { let dir = tempfile::tempdir()?; let rc_path = dir.path().join(".envrc"); - std::fs::File::create(&rc_path)?.sync_all()?; + std::fs::File::create(rc_path)?.sync_all()?; let renderer = ModuleRenderer::new("direnv") .config(toml::toml! { @@ -169,7 +169,7 @@ mod tests { ); assert_eq!( - Some(format!("direnv not loaded/allowed ")), + Some("direnv not loaded/allowed ".to_string()), renderer.collect() ); @@ -180,7 +180,7 @@ mod tests { let dir = tempfile::tempdir()?; let rc_path = dir.path().join(".envrc"); - std::fs::File::create(&rc_path)?.sync_all()?; + std::fs::File::create(rc_path)?.sync_all()?; let renderer = ModuleRenderer::new("direnv") .config(toml::toml! { @@ -196,7 +196,10 @@ mod tests { }), ); - assert_eq!(Some(format!("direnv loaded/allowed ")), renderer.collect()); + assert_eq!( + Some("direnv loaded/allowed ".to_string()), + renderer.collect() + ); dir.close() } @@ -205,7 +208,7 @@ mod tests { let dir = tempfile::tempdir()?; let rc_path = dir.path().join(".envrc"); - std::fs::File::create(&rc_path)?.sync_all()?; + std::fs::File::create(rc_path)?.sync_all()?; let renderer = ModuleRenderer::new("direnv") .config(toml::toml! { @@ -221,13 +224,16 @@ mod tests { }), ); - assert_eq!(Some(format!("direnv loaded/denied ")), renderer.collect()); + assert_eq!( + Some("direnv loaded/denied ".to_string()), + renderer.collect() + ); dir.close() } fn status_cmd_output_without_rc() -> String { String::from( - r#"\ + r"\ direnv exec path /usr/bin/direnv DIRENV_CONFIG /home/test/.config/direnv bash_path /usr/bin/bash @@ -236,7 +242,7 @@ warn_timeout 5s whitelist.prefix [] whitelist.exact map[] No .envrc or .env loaded -No .envrc or .env found"#, +No .envrc or .env found", ) } fn status_cmd_output_with_rc(dir: impl AsRef, loaded: bool, allowed: bool) -> String { diff --git a/src/modules/dotnet.rs b/src/modules/dotnet.rs index e3c59008..4539b4d5 100644 --- a/src/modules/dotnet.rs +++ b/src/modules/dotnet.rs @@ -599,13 +599,13 @@ mod tests { } fn make_csproj_with_tfm(tfm_element: &str, tfm: &str) -> String { - let json_text = r#" + let json_text = r" TFM_VALUE - "#; + "; json_text .replace("TFM_ELEMENT", tfm_element) .replace("TFM_VALUE", tfm) diff --git a/src/modules/fossil_metrics.rs b/src/modules/fossil_metrics.rs index 5ec97b6c..45ceb2b4 100644 --- a/src/modules/fossil_metrics.rs +++ b/src/modules/fossil_metrics.rs @@ -287,10 +287,10 @@ mod tests { "{}{}", expect_added .map(|added| format!("{} ", expect_added_style.paint(format!("+{added}")))) - .unwrap_or(String::from("")), + .unwrap_or_default(), expect_deleted .map(|deleted| format!("{} ", expect_deleted_style.paint(format!("-{deleted}")))) - .unwrap_or(String::from("")), + .unwrap_or_default(), )); assert_eq!(expected, actual); } diff --git a/src/modules/kubernetes.rs b/src/modules/kubernetes.rs index c56514ba..042f4773 100644 --- a/src/modules/kubernetes.rs +++ b/src/modules/kubernetes.rs @@ -21,7 +21,7 @@ fn get_current_kube_context_name(filename: path::PathBuf) -> Option { let contents = utils::read_file(filename).ok()?; let yaml_docs = YamlLoader::load_from_str(&contents).ok()?; - let conf = yaml_docs.get(0)?; + let conf = yaml_docs.first()?; conf["current-context"] .as_str() .filter(|s| !s.is_empty()) @@ -35,7 +35,7 @@ fn get_kube_ctx_components( let contents = utils::read_file(filename).ok()?; let yaml_docs = YamlLoader::load_from_str(&contents).ok()?; - let conf = yaml_docs.get(0)?; + let conf = yaml_docs.first()?; let contexts = conf["contexts"].as_vec()?; // Find the context with the name we're looking for @@ -118,16 +118,13 @@ pub fn module<'a>(context: &'a Context) -> Option> { .any(|v| !v.is_empty()); let is_kube_project = have_scan_config.then(|| { - context - .try_begin_scan() - .map(|scanner| { - scanner - .set_files(&config.detect_files) - .set_folders(&config.detect_folders) - .set_extensions(&config.detect_extensions) - .is_match() - }) - .unwrap_or(false) + context.try_begin_scan().map_or(false, |scanner| { + scanner + .set_files(&config.detect_files) + .set_folders(&config.detect_folders) + .set_extensions(&config.detect_extensions) + .is_match() + }) }); if !is_kube_project.unwrap_or(true) { diff --git a/src/modules/nix_shell.rs b/src/modules/nix_shell.rs index d8666ee8..4d5cc9a1 100644 --- a/src/modules/nix_shell.rs +++ b/src/modules/nix_shell.rs @@ -23,7 +23,7 @@ impl NixShellType { }; if use_heuristic { - Self::in_new_nix_shell(context).map(|_| Unknown) + Self::in_new_nix_shell(context).map(|()| Unknown) } else { None } diff --git a/src/modules/openstack.rs b/src/modules/openstack.rs index 35c488ba..d5e59f63 100644 --- a/src/modules/openstack.rs +++ b/src/modules/openstack.rs @@ -27,7 +27,7 @@ fn get_osp_project_from_config(context: &Context, osp_cloud: &str) -> Option Some(("v1.40.0", "x86_64-unknown-linux-gnu")), diff --git a/src/modules/shlvl.rs b/src/modules/shlvl.rs index 48d22ec8..03e32728 100644 --- a/src/modules/shlvl.rs +++ b/src/modules/shlvl.rs @@ -242,7 +242,7 @@ mod tests { disabled = false threshold = threshold }) - .env(SHLVL_ENV_VAR, format!("{}", shlvl)) + .env(SHLVL_ENV_VAR, format!("{shlvl}")) .collect() } diff --git a/src/print.rs b/src/print.rs index 4fcba218..78c3dd6c 100644 --- a/src/print.rs +++ b/src/print.rs @@ -391,7 +391,7 @@ pub fn format_duration(duration: &Duration) -> String { /// Return the modules from $all that are not already in the list fn all_modules_uniq(module_list: &BTreeSet) -> Vec { let mut prompt_order: Vec = Vec::new(); - for module in PROMPT_ORDER.iter() { + for module in PROMPT_ORDER { if !module_list.contains(*module) { prompt_order.push(String::from(*module)) } @@ -452,7 +452,7 @@ fn load_formatter_and_modules<'a>(context: &'a Context) -> (StringFormatter<'a>, let modules = [&lf, &rf] .into_iter() .flatten() - .flat_map(|f| f.get_variables()) + .flat_map(VariableHolder::get_variables) .collect(); let main_formatter = match context.target { diff --git a/src/utils.rs b/src/utils.rs index 0459f5f7..7eaeba3f 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -71,7 +71,7 @@ pub fn write_file, S: AsRef>(file_name: P, text: S) -> Resul }; match file.write_all(text.as_bytes()) { - Ok(_) => { + Ok(()) => { log::trace!("File {file_name:?} written successfully"); } Err(err) => {