Cleanup and fixes (#148)

microsoft · Sep 6, 2024 · 8a79c63 · 8a79c63
1 parent 202c526
commit 8a79c63
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/crates/pet-core/src/os_environment.rs b/crates/pet-core/src/os_environment.rs
@@ -50,7 +50,6 @@ impl Environment for EnvironmentApi {
         if self.global_search_locations.lock().unwrap().is_empty() {
             let mut paths =
                 env::split_paths(&self.get_env_var("PATH".to_string()).unwrap_or_default())
-                    .into_iter()
                     .filter(|p| p.exists())
                     .collect::<Vec<PathBuf>>();
             trace!("Env PATH: {:?}", paths);

diff --git a/crates/pet-windows-registry/src/environments.rs b/crates/pet-windows-registry/src/environments.rs
@@ -101,7 +101,7 @@ fn get_registry_pythons_from_key_for_company(
                     Ok(install_path_key) => {
                         let env_path: String =
                             install_path_key.get_value("").ok().unwrap_or_default();
-                        let env_path = norm_case(&PathBuf::from(env_path));
+                        let env_path = norm_case(PathBuf::from(env_path));
                         if is_windows_app_folder_in_program_files(&env_path) {
                             trace!(
                                 "Found Python ({}) in {}\\Software\\Python\\{}\\{}, but skipping as this is a Windows Store Python",
@@ -144,7 +144,7 @@ fn get_registry_pythons_from_key_for_company(
                             );
                             continue;
                         }
-                        let executable = norm_case(&PathBuf::from(executable));
+                        let executable = norm_case(PathBuf::from(executable));
                         if !executable.exists() {
                             warn!(
                                 "Python executable ({}) file not found for {}\\Software\\Python\\{}\\{}",

diff --git a/crates/pet-windows-store/src/environments.rs b/crates/pet-windows-store/src/environments.rs
@@ -32,6 +32,7 @@ lazy_static! {
 }
 
 #[derive(Default)]
+#[allow(dead_code)]
 struct PotentialPython {
     #[allow(dead_code)]
     path: Option<PathBuf>,

diff --git a/crates/pet-windows-store/src/lib.rs b/crates/pet-windows-store/src/lib.rs
@@ -74,7 +74,7 @@ impl Locator for WindowsStore {
         }
         let list_of_possible_exes = vec![env.executable.clone()]
             .into_iter()
-            .chain(env.symlinks.clone().unwrap_or_default().into_iter())
+            .chain(env.symlinks.clone().unwrap_or_default())
             .collect::<Vec<PathBuf>>();
         if let Some(environments) = self.find_with_cache() {
             for found_env in environments {

diff --git a/crates/pet/src/locators.rs b/crates/pet/src/locators.rs
@@ -200,6 +200,7 @@ fn find_symlinks(executable: &PathBuf) -> Option<Vec<PathBuf>> {
 }
 
 #[cfg(windows)]
+#[allow(clippy::ptr_arg)]
 fn find_symlinks(_executable: &PathBuf) -> Option<Vec<PathBuf>> {
     // In windows we will need to spawn the Python exe and then get the exes.
     // Lets wait and see if this is necessary.