Fix initial clippy warnings: unused imports, non-local impl blocks, and function restructuring

Co-authored-by: karthiknadig <3840081+karthiknadig@users.noreply.github.com>

Author: Copilot

crates/pet-conda/tests/common.rs

@@ -46,27 +46,29 @@ pub struct TestEnvironment {
     root: Option<PathBuf>,
     globals_locations: Vec<PathBuf>,
 }
+
+impl Environment for TestEnvironment {
+    fn get_env_var(&self, key: String) -> Option<String> {
+        self.vars.get(&key).cloned()
+    }
+    fn get_root(&self) -> Option<PathBuf> {
+        self.root.clone()
+    }
+    fn get_user_home(&self) -> Option<PathBuf> {
+        self.home.clone()
+    }
+    fn get_know_global_search_locations(&self) -> Vec<PathBuf> {
+        self.globals_locations.clone()
+    }
+}
+
 #[allow(dead_code)]
 pub fn create_test_environment(
     vars: HashMap<String, String>,
     home: Option<PathBuf>,
     globals_locations: Vec<PathBuf>,
     root: Option<PathBuf>,
 ) -> TestEnvironment {
-    impl Environment for TestEnvironment {
-        fn get_env_var(&self, key: String) -> Option<String> {
-            self.vars.get(&key).cloned()
-        }
-        fn get_root(&self) -> Option<PathBuf> {
-            self.root.clone()
-        }
-        fn get_user_home(&self) -> Option<PathBuf> {
-            self.home.clone()
-        }
-        fn get_know_global_search_locations(&self) -> Vec<PathBuf> {
-            self.globals_locations.clone()
-        }
-    }
     TestEnvironment {
         vars,
         home,

crates/pet-core/src/python_environment.rs

@@ -416,6 +416,7 @@ pub fn get_environment_key(env: &PythonEnvironment) -> Option<PathBuf> {
 
 #[cfg(test)]
 mod tests {
+    #[cfg(windows)]
     use super::*;
 
     #[test]

crates/pet-python-utils/src/executable.rs

@@ -119,6 +119,46 @@ fn is_python_executable_name(exe: &Path) -> bool {
     }
 }
 
+pub fn should_search_for_environments_in_path<P: AsRef<Path>>(path: &P) -> bool {
+    // Never search in the .git folder
+    // Never search in the node_modules folder
+    // Mostly copied from https://github.com/github/gitignore/blob/main/Python.gitignore
+    let folders_to_ignore = [
+        "node_modules",
+        ".cargo",
+        ".devcontainer",
+        ".github",
+        ".git",
+        ".tox",
+        ".nox",
+        ".hypothesis",
+        ".ipynb_checkpoints",
+        ".eggs",
+        ".coverage",
+        ".cache",
+        ".pyre",
+        ".ptype",
+        ".pytest_cache",
+        ".vscode",
+        "__pycache__",
+        "__pypackages__",
+        ".mypy_cache",
+        "cython_debug",
+        "env.bak",
+        "venv.bak",
+        "Scripts", // If the folder ends bin/scripts, then ignore it, as the parent is most likely an env.
+        "bin", // If the folder ends bin/scripts, then ignore it, as the parent is most likely an env.
+    ];
+    for folder in folders_to_ignore.iter() {
+        if path.as_ref().ends_with(folder) {
+            trace!("Ignoring folder: {:?}", path.as_ref());
+            return false;
+        }
+    }
+
+    true
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -186,43 +226,3 @@ mod tests {
         ));
     }
 }
-
-pub fn should_search_for_environments_in_path<P: AsRef<Path>>(path: &P) -> bool {
-    // Never search in the .git folder
-    // Never search in the node_modules folder
-    // Mostly copied from https://github.com/github/gitignore/blob/main/Python.gitignore
-    let folders_to_ignore = [
-        "node_modules",
-        ".cargo",
-        ".devcontainer",
-        ".github",
-        ".git",
-        ".tox",
-        ".nox",
-        ".hypothesis",
-        ".ipynb_checkpoints",
-        ".eggs",
-        ".coverage",
-        ".cache",
-        ".pyre",
-        ".ptype",
-        ".pytest_cache",
-        ".vscode",
-        "__pycache__",
-        "__pypackages__",
-        ".mypy_cache",
-        "cython_debug",
-        "env.bak",
-        "venv.bak",
-        "Scripts", // If the folder ends bin/scripts, then ignore it, as the parent is most likely an env.
-        "bin", // If the folder ends bin/scripts, then ignore it, as the parent is most likely an env.
-    ];
-    for folder in folders_to_ignore.iter() {
-        if path.as_ref().ends_with(folder) {
-            trace!("Ignoring folder: {:?}", path.as_ref());
-            return false;
-        }
-    }
-
-    true
-}

crates/pet/tests/ci_homebrew_container.rs

@@ -107,7 +107,7 @@ fn verify_python_in_homebrew_contaner() {
         let python_env = environments
             .iter()
             .find(|e| e.executable == env.executable)
-            .expect(format!("Expected to find python environment {:?}", env.executable).as_str());
+            .unwrap_or_else(|| panic!("Expected to find python environment {:?}", env.executable));
         assert_eq!(python_env.executable, env.executable);
         assert_eq!(python_env.kind, env.kind);
         assert_eq!(python_env.manager, env.manager);

crates/pet/tests/ci_jupyter_container.rs

@@ -137,7 +137,7 @@ fn verify_python_in_jupyter_contaner() {
         let python_env = environments
             .iter()
             .find(|e| e.executable == env.executable)
-            .expect(format!("Expected to find python environment {:?}", env.executable).as_str());
+            .unwrap_or_else(|| panic!("Expected to find python environment {:?}", env.executable));
         assert_eq!(
             python_env.executable, env.executable,
             "Expected exe to be same when comparing {python_env:?} and {env:?}"

crates/pet/tests/ci_poetry.rs

@@ -40,8 +40,10 @@ fn verify_ci_poetry_global() {
     let environment = EnvironmentApi::new();
     let conda_locator = Arc::new(Conda::from(&environment));
     let poetry_locator = Arc::new(Poetry::from(&environment));
-    let mut config = Configuration::default();
-    config.workspace_directories = Some(vec![workspace_dir.clone()]);
+    let config = Configuration {
+        workspace_directories: Some(vec![workspace_dir.clone()]),
+        ..Default::default()
+    };
     let locators = create_locators(conda_locator.clone(), poetry_locator.clone(), &environment);
     for locator in locators.iter() {
         locator.configure(&config);
@@ -110,8 +112,10 @@ fn verify_ci_poetry_project() {
     let environment = EnvironmentApi::new();
     let conda_locator = Arc::new(Conda::from(&environment));
     let poetry_locator = Arc::new(Poetry::from(&environment));
-    let mut config = Configuration::default();
-    config.workspace_directories = Some(vec![workspace_dir.clone()]);
+    let config = Configuration {
+        workspace_directories: Some(vec![workspace_dir.clone()]),
+        ..Default::default()
+    };
     let locators = create_locators(conda_locator.clone(), poetry_locator.clone(), &environment);
     for locator in locators.iter() {
         locator.configure(&config);

crates/pet/tests/common.rs

@@ -22,12 +22,12 @@ pub fn resolve_test_path(paths: &[&str]) -> PathBuf {
 }
 
 #[allow(dead_code)]
-pub fn does_version_match(version: &String, expected_version: &String) -> bool {
+pub fn does_version_match(version: &str, expected_version: &str) -> bool {
     let version = get_version(version);
     expected_version.starts_with(&version)
 }
 
-fn get_version(value: &String) -> String {
+fn get_version(value: &str) -> String {
     // Regex to extract just the d.d.d version from the full version string
     let captures = PYTHON_VERSION.captures(value).unwrap();
     let version = captures.get(1).unwrap().as_str().to_string();
@@ -39,6 +39,6 @@ fn get_version(value: &String) -> String {
 }
 
 #[allow(dead_code)]
-pub fn is_valid_version(value: &String) -> bool {
+pub fn is_valid_version(value: &str) -> bool {
     PYTHON_FULLVERSION.is_match(value)
 }