Skip to content

Commit 2253cbe

Browse files
committed
Fixes
1 parent a9c2fab commit 2253cbe

File tree

4 files changed

+11
-20
lines changed

4 files changed

+11
-20
lines changed

crates/pet-pyenv/src/lib.rs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,21 +61,18 @@ impl PyEnv {
6161
let mut versions = self.versions_dir.lock().unwrap();
6262
if !self.found_pyenv.load(Ordering::Relaxed) && (managers.is_none() || versions.is_none()) {
6363
let pyenv_info = PyEnvInfo::from(&self.env_vars);
64-
let mut manager: Option<EnvManager> = None;
6564
if let Some(ref exe) = pyenv_info.exe {
6665
let version = pyenv_info.version.clone();
67-
manager = Some(EnvManager::new(exe.clone(), EnvManagerType::Pyenv, version));
66+
let manager = EnvManager::new(exe.clone(), EnvManagerType::Pyenv, version);
67+
managers.replace(manager);
68+
} else {
69+
managers.take();
6870
}
6971
if let Some(version_path) = &pyenv_info.versions {
7072
versions.replace(version_path.clone());
7173
} else {
7274
versions.take();
7375
}
74-
if let Some(manager) = manager {
75-
managers.replace(manager.clone());
76-
} else {
77-
managers.take();
78-
}
7976
self.found_pyenv.store(true, Ordering::Relaxed);
8077
}
8178

@@ -136,6 +133,10 @@ impl Locator for PyEnv {
136133

137134
let (manager, versions) = self.get_manager_versions_dir();
138135

136+
if let Some(manager) = &manager {
137+
reporter.report_manager(manager);
138+
}
139+
139140
if let Some(versions) = versions {
140141
let conda_locator = self.conda_locator.clone();
141142
thread::scope(|s| {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ fn get_registry_pythons_from_key_for_company(
123123
// Possible this is a conda install folder.
124124
if is_conda_env(&env_path) {
125125
if let Some(reporter) = reporter {
126-
conda_locator.find_and_report(reporter, &env_path);
126+
conda_locator.find_and_report(*reporter, &env_path);
127127
}
128128
continue;
129129
}

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,13 @@ impl WindowsRegistry {
3636
return Some(result);
3737
}
3838

39-
if let Some(registry_result) = get_registry_pythons(&self.conda_locator, &reporter) {
40-
result.replace(registry_result);
41-
} else {
42-
result.replace(LocatorResult {
43-
managers: vec![],
44-
environments: vec![],
45-
});
46-
}
39+
let registry_result = get_registry_pythons(&self.conda_locator, &reporter);
40+
result.replace(registry_result.clone());
4741

4842
Some(registry_result)
4943
}
5044
#[cfg(windows)]
5145
fn clear(&self) {
52-
use std::sync::atomic::Ordering;
53-
5446
let mut search_result = self.search_result.lock().unwrap();
5547
search_result.take();
5648
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ impl WindowsStore {
4646
}
4747
#[cfg(windows)]
4848
fn clear(&self) {
49-
use std::sync::atomic::Ordering;
50-
5149
self.environments.lock().unwrap().take();
5250
}
5351
}

0 commit comments

Comments
 (0)