diff options
author | David Knaack <davidkna@users.noreply.github.com> | 2024-03-03 17:57:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-03 17:57:39 +0100 |
commit | 7290c5e368aab8cd60f3055651a49a6fde78f8aa (patch) | |
tree | 2bca261614ac8ceda738b6f9b6e55e9bb7a9daaa /src/modules | |
parent | 7485c90c9f7259c026a84dd0335f56860005315d (diff) |
chore: apply clippy for rust 1.76 & bump msrv (#5763)
Diffstat (limited to 'src/modules')
-rw-r--r-- | src/modules/direnv.rs | 26 | ||||
-rw-r--r-- | src/modules/dotnet.rs | 4 |
2 files changed, 18 insertions, 12 deletions
diff --git a/src/modules/direnv.rs b/src/modules/direnv.rs index 5a5999ef9..823c0adf7 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<Self, Self::Err> { match serde_json::from_str::<RawDirenvState>(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 4539b4d58..cdbb3f69e 100644 --- a/src/modules/dotnet.rs +++ b/src/modules/dotnet.rs @@ -270,7 +270,7 @@ fn get_local_dotnet_files(context: &Context) -> Result<Vec<DotNetFile>, std::io: fn get_dotnet_file_type(path: &Path) -> Option<FileType> { 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<FileType> { 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), |