Replace std::sync::Mutex
with parking_lot::Mutex
in languages/src/python.rs
(#29889)
This appears to be the only place `std::sync::Mutex` is used, Zed always prefers `parking_lot`. Release Notes: - N/A
This commit is contained in:
parent
f4e9ea3cd8
commit
86484233c0
3 changed files with 6 additions and 8 deletions
|
@ -46,6 +46,7 @@ language.workspace = true
|
|||
log.workspace = true
|
||||
lsp.workspace = true
|
||||
node_runtime.workspace = true
|
||||
parking_lot.workspace = true
|
||||
paths.workspace = true
|
||||
pet-conda.workspace = true
|
||||
pet-core.workspace = true
|
||||
|
|
|
@ -23,8 +23,8 @@ use serde_json::{Value, json};
|
|||
use smol::lock::OnceCell;
|
||||
use std::cmp::Ordering;
|
||||
|
||||
use parking_lot::Mutex;
|
||||
use std::str::FromStr;
|
||||
use std::sync::Mutex;
|
||||
use std::{
|
||||
any::Any,
|
||||
borrow::Cow,
|
||||
|
@ -671,7 +671,6 @@ impl ToolchainLister for PythonToolchainProvider {
|
|||
let mut toolchains = reporter
|
||||
.environments
|
||||
.lock()
|
||||
.ok()
|
||||
.map_or(Vec::new(), |mut guard| std::mem::take(&mut guard));
|
||||
|
||||
let wr = worktree_root;
|
||||
|
@ -823,7 +822,7 @@ impl pet_core::os_environment::Environment for EnvironmentApi<'_> {
|
|||
}
|
||||
|
||||
fn get_know_global_search_locations(&self) -> Vec<PathBuf> {
|
||||
if self.global_search_locations.lock().unwrap().is_empty() {
|
||||
if self.global_search_locations.lock().is_empty() {
|
||||
let mut paths =
|
||||
std::env::split_paths(&self.get_env_var("PATH".to_string()).unwrap_or_default())
|
||||
.collect::<Vec<PathBuf>>();
|
||||
|
@ -840,12 +839,9 @@ impl pet_core::os_environment::Environment for EnvironmentApi<'_> {
|
|||
.filter(|p| p.exists())
|
||||
.collect::<Vec<PathBuf>>();
|
||||
|
||||
self.global_search_locations
|
||||
.lock()
|
||||
.unwrap()
|
||||
.append(&mut paths);
|
||||
self.global_search_locations.lock().append(&mut paths);
|
||||
}
|
||||
self.global_search_locations.lock().unwrap().clone()
|
||||
self.global_search_locations.lock().clone()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue