From 7290c5e368aab8cd60f3055651a49a6fde78f8aa Mon Sep 17 00:00:00 2001 From: David Knaack Date: Sun, 3 Mar 2024 17:57:39 +0100 Subject: [PATCH] chore: apply clippy for rust 1.76 & bump msrv (#5763) --- Cargo.toml | 2 +- src/context.rs | 6 ++---- src/modules/direnv.rs | 26 ++++++++++++++++---------- src/modules/dotnet.rs | 4 ++-- src/utils.rs | 2 +- 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4551e7ef..8884be23 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ license = "ISC" readme = "README.md" repository = "https://github.com/starship/starship" # Note: MSRV is only intended as a hint, and only the latest version is officially supported in starship. -rust-version = "1.65" +rust-version = "1.71" description = """ The minimal, blazing-fast, and infinitely customizable prompt for any shell! ☄🌌️ """ diff --git a/src/context.rs b/src/context.rs index 4a651908..2b999412 100644 --- a/src/context.rs +++ b/src/context.rs @@ -339,10 +339,8 @@ impl<'a> Context<'a> { ); let branch = get_current_branch(&repository); - let remote = get_remote_repository_info( - &repository, - branch.as_ref().map(|name| name.as_ref()), - ); + let remote = + get_remote_repository_info(&repository, branch.as_ref().map(AsRef::as_ref)); let path = repository.path().to_path_buf(); let fs_monitor_value_is_true = repository diff --git a/src/modules/direnv.rs b/src/modules/direnv.rs index 5a5999ef..823c0adf 100644 --- a/src/modules/direnv.rs +++ b/src/modules/direnv.rs @@ -85,7 +85,7 @@ impl FromStr for DirenvState { fn from_str(s: &str) -> Result { match serde_json::from_str::(s) { - Ok(raw) => Ok(DirenvState { + Ok(raw) => Ok(Self { rc_path: raw.state.found_rc.path, allowed: raw.state.found_rc.allowed.try_into()?, loaded: matches!( @@ -93,7 +93,7 @@ impl FromStr for DirenvState { AllowStatus::Allowed ), }), - Err(_) => DirenvState::from_lines(s), + Err(_) => Self::from_lines(s), } } } @@ -225,7 +225,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! { @@ -242,7 +242,7 @@ mod tests { ); assert_eq!( - Some(format!("direnv not loaded/allowed ")), + Some("direnv not loaded/allowed ".to_string()), renderer.collect() ); @@ -281,7 +281,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! { @@ -297,7 +297,10 @@ mod tests { }), ); - assert_eq!(Some(format!("direnv loaded/allowed ")), renderer.collect()); + assert_eq!( + Some("direnv loaded/allowed ".to_string()), + renderer.collect() + ); dir.close() } @@ -334,7 +337,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! { @@ -350,7 +353,10 @@ mod tests { }), ); - assert_eq!(Some(format!("direnv loaded/denied ")), renderer.collect()); + assert_eq!( + Some("direnv loaded/denied ".to_string()), + renderer.collect() + ); dir.close() } @@ -359,7 +365,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! { @@ -376,7 +382,7 @@ mod tests { ); assert_eq!( - Some(format!("direnv loaded/not allowed ")), + Some("direnv loaded/not allowed ".to_string()), renderer.collect() ); diff --git a/src/modules/dotnet.rs b/src/modules/dotnet.rs index 4539b4d5..cdbb3f69 100644 --- a/src/modules/dotnet.rs +++ b/src/modules/dotnet.rs @@ -270,7 +270,7 @@ fn get_local_dotnet_files(context: &Context) -> Result, std::io: fn get_dotnet_file_type(path: &Path) -> Option { let file_name_lower = map_str_to_lower(path.file_name()); - match file_name_lower.as_ref().map(std::convert::AsRef::as_ref) { + match file_name_lower.as_ref().map(AsRef::as_ref) { Some(GLOBAL_JSON_FILE) => return Some(FileType::GlobalJson), Some(PROJECT_JSON_FILE) => return Some(FileType::ProjectJson), _ => (), @@ -278,7 +278,7 @@ fn get_dotnet_file_type(path: &Path) -> Option { let extension_lower = map_str_to_lower(path.extension()); - match extension_lower.as_ref().map(std::convert::AsRef::as_ref) { + match extension_lower.as_ref().map(AsRef::as_ref) { Some("sln") => return Some(FileType::SolutionFile), Some("csproj" | "fsproj" | "xproj") => return Some(FileType::ProjectFile), Some("props" | "targets") => return Some(FileType::MsBuildFile), diff --git a/src/utils.rs b/src/utils.rs index 7eaeba3f..a0d53855 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -136,7 +136,7 @@ pub fn display_command + Debug, U: AsRef + Debug>( args: &[U], ) -> String { std::iter::once(cmd.as_ref()) - .chain(args.iter().map(std::convert::AsRef::as_ref)) + .chain(args.iter().map(AsRef::as_ref)) .map(|i| i.to_string_lossy().into_owned()) .collect::>() .join(" ")