Fixes

Author: DonJayamanne

crates/pet-pyenv/src/lib.rs

@@ -61,21 +61,18 @@ impl PyEnv {
         let mut versions = self.versions_dir.lock().unwrap();
         if !self.found_pyenv.load(Ordering::Relaxed) && (managers.is_none() || versions.is_none()) {
             let pyenv_info = PyEnvInfo::from(&self.env_vars);
-            let mut manager: Option<EnvManager> = None;
             if let Some(ref exe) = pyenv_info.exe {
                 let version = pyenv_info.version.clone();
-                manager = Some(EnvManager::new(exe.clone(), EnvManagerType::Pyenv, version));
+                let manager = EnvManager::new(exe.clone(), EnvManagerType::Pyenv, version);
+                managers.replace(manager);
+            } else {
+                managers.take();
             }
             if let Some(version_path) = &pyenv_info.versions {
                 versions.replace(version_path.clone());
             } else {
                 versions.take();
             }
-            if let Some(manager) = manager {
-                managers.replace(manager.clone());
-            } else {
-                managers.take();
-            }
             self.found_pyenv.store(true, Ordering::Relaxed);
         }
 
@@ -136,6 +133,10 @@ impl Locator for PyEnv {
 
         let (manager, versions) = self.get_manager_versions_dir();
 
+        if let Some(manager) = &manager {
+            reporter.report_manager(manager);
+        }
+
         if let Some(versions) = versions {
             let conda_locator = self.conda_locator.clone();
             thread::scope(|s| {

crates/pet-windows-registry/src/environments.rs

@@ -123,7 +123,7 @@ fn get_registry_pythons_from_key_for_company(
                         // Possible this is a conda install folder.
                         if is_conda_env(&env_path) {
                             if let Some(reporter) = reporter {
-                                conda_locator.find_and_report(reporter, &env_path);
+                                conda_locator.find_and_report(*reporter, &env_path);
                             }
                             continue;
                         }

crates/pet-windows-registry/src/lib.rs

@@ -36,21 +36,13 @@ impl WindowsRegistry {
             return Some(result);
         }
 
-        if let Some(registry_result) = get_registry_pythons(&self.conda_locator, &reporter) {
-            result.replace(registry_result);
-        } else {
-            result.replace(LocatorResult {
-                managers: vec![],
-                environments: vec![],
-            });
-        }
+        let registry_result = get_registry_pythons(&self.conda_locator, &reporter);
+        result.replace(registry_result.clone());
 
         Some(registry_result)
     }
     #[cfg(windows)]
     fn clear(&self) {
-        use std::sync::atomic::Ordering;
-
         let mut search_result = self.search_result.lock().unwrap();
         search_result.take();
     }

crates/pet-windows-store/src/lib.rs

@@ -46,8 +46,6 @@ impl WindowsStore {
     }
     #[cfg(windows)]
     fn clear(&self) {
-        use std::sync::atomic::Ordering;
-
         self.environments.lock().unwrap().take();
     }
 }