From c97fe31a2962bc15b99bcedd6747a5a2560dd66c Mon Sep 17 00:00:00 2001 From: Chris Pryer Date: Sat, 3 Feb 2024 15:19:36 -0500 Subject: [PATCH] Fix clippy lints --- .../huak-package-manager/src/ops/toolchain.rs | 4 +-- .../src/python_environment.rs | 2 +- crates/huak-package-manager/src/workspace.rs | 6 +--- crates/huak-pyproject-toml/src/lib.rs | 14 +++------- crates/huak-python-manager/src/install.rs | 28 +++++++++---------- 5 files changed, 21 insertions(+), 33 deletions(-) diff --git a/crates/huak-package-manager/src/ops/toolchain.rs b/crates/huak-package-manager/src/ops/toolchain.rs index 67d217b2..f64b93d2 100644 --- a/crates/huak-package-manager/src/ops/toolchain.rs +++ b/crates/huak-package-manager/src/ops/toolchain.rs @@ -551,9 +551,7 @@ pub fn use_toolchain(channel: &Channel, config: &Config) -> HuakResult<()> { } fn resolve_installed_toolchains(config: &Config) -> Option> { - let Some(home) = config.home.clone() else { - return None; - }; + let home = config.home.clone()?; let Ok(toolchains) = std::fs::read_dir(home.join("toolchains")) else { return None; diff --git a/crates/huak-package-manager/src/python_environment.rs b/crates/huak-package-manager/src/python_environment.rs index 0f69c45d..e666d926 100644 --- a/crates/huak-package-manager/src/python_environment.rs +++ b/crates/huak-package-manager/src/python_environment.rs @@ -655,7 +655,7 @@ mod tests { fn python_search() { let dir = tempdir().unwrap(); std::fs::write(dir.path().join("python3.11"), "").unwrap(); - let path_vals = vec![dir.path().to_str().unwrap().to_string()]; + let path_vals = [dir.path().to_str().unwrap().to_string()]; std::env::set_var("PATH", path_vals.join(":")); let mut interpreter_paths = python_paths(); diff --git a/crates/huak-package-manager/src/workspace.rs b/crates/huak-package-manager/src/workspace.rs index 11863a30..f1e0a4ed 100644 --- a/crates/huak-package-manager/src/workspace.rs +++ b/crates/huak-package-manager/src/workspace.rs @@ -199,11 +199,7 @@ fn resolve_local_toolchain( channel: Option<&Channel>, ) -> Option { let config = &workspace.config; - - let Some(home) = config.home.as_ref() else { - return None; - }; - + let home = config.home.as_ref()?; let toolchains = home.join("toolchains"); let settings = toolchains.join("settings.toml"); diff --git a/crates/huak-pyproject-toml/src/lib.rs b/crates/huak-pyproject-toml/src/lib.rs index fddf1dcf..f2a87070 100644 --- a/crates/huak-pyproject-toml/src/lib.rs +++ b/crates/huak-pyproject-toml/src/lib.rs @@ -184,13 +184,10 @@ impl PyProjectToml { #[must_use] pub fn project_dependencies(&self) -> Option> { - let Some(array) = self + let array = self .project_table() .and_then(|it| it.get("dependencies")) - .and_then(Item::as_array) - else { - return None; - }; + .and_then(Item::as_array)?; Some( array @@ -245,13 +242,10 @@ impl PyProjectToml { #[must_use] pub fn project_optional_dependencies(&self) -> Option>> { - let Some(table) = self + let table = self .project_table() .and_then(|it| it.get("optional-dependencies")) - .and_then(Item::as_table) - else { - return None; - }; + .and_then(Item::as_table)?; let mut deps = HashMap::new(); let groups = table.iter().map(|(k, _)| k).collect::>(); diff --git a/crates/huak-python-manager/src/install.rs b/crates/huak-python-manager/src/install.rs index 6fefc8b1..329a14d8 100644 --- a/crates/huak-python-manager/src/install.rs +++ b/crates/huak-python-manager/src/install.rs @@ -168,24 +168,24 @@ mod tests { let py = bin.join("python"); let py3 = bin.join("python3"); let py312 = bin.join("python3.12"); - let pys = [py.clone(), py3, py312]; + let pythons = [py.clone(), py3, py312]; let module = bin.join("module"); std::fs::create_dir_all(&bin).unwrap(); - for file in pys.iter().chain([&module]) { + for file in pythons.iter().chain([&module]) { let mut file = File::create(file).unwrap(); file.write_all(&[]).unwrap(); } let release_dir = PythonReleaseDir::new(dir); - let ibin = release_dir.bin_path(); - let ipy = ibin.join("python"); + let release_bin = release_dir.bin_path(); + let release_py = release_bin.join("python"); - assert_eq!(bin, ibin); - assert_eq!(py, ipy); - assert_eq!(module, ibin.join("module")); + assert_eq!(bin, release_bin); + assert_eq!(py, release_py); + assert_eq!(module, release_bin.join("module")); } #[cfg(windows)] @@ -197,23 +197,23 @@ mod tests { let parent = dir.join("install"); let bin = parent.join("Scripts"); let py = parent.join("python.exe"); - let pys = [py.clone()]; + let pythons = [py.clone()]; let module = bin.join("module.exe"); std::fs::create_dir_all(&bin).unwrap(); - for file in pys.iter().chain([&module]) { + for file in pythons.iter().chain([&module]) { let mut file = File::create(file).unwrap(); file.write_all(&[]).unwrap(); } let release_dir = PythonReleaseDir::new(dir); - let ibin = release_dir.bin_path(); - let ipy = release_dir.python_path(None); + let release_bin = release_dir.bin_path(); + let release_py = release_dir.python_path(None); - assert_eq!(bin, ibin); - assert_eq!(py, ipy); - assert_eq!(module, ibin.join("module.exe")); + assert_eq!(bin, release_bin); + assert_eq!(py, release_py); + assert_eq!(module, release_bin.join("module.exe")); } }