diff options
author | David Sherret <dsherret@users.noreply.github.com> | 2021-07-06 23:48:01 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-06 23:48:01 -0400 |
commit | 7fc0e8ec8cd4b18ba10a04cf0ac2bee48826de3d (patch) | |
tree | 70e078538ae0f3467e8a519b918ae936587ce2d4 /cli/tools/installer.rs | |
parent | 78ac19f51f48984ea16f97a0c574fa507544b8d5 (diff) |
chore: use parking_lot for synchronization primitives to align with tokio (#11289)
parking_lot is already transitively used in tokio via the "full" cargo feature
Diffstat (limited to 'cli/tools/installer.rs')
-rw-r--r-- | cli/tools/installer.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cli/tools/installer.rs b/cli/tools/installer.rs index 5877494d1..b6bb8bbb2 100644 --- a/cli/tools/installer.rs +++ b/cli/tools/installer.rs @@ -317,8 +317,8 @@ fn is_in_path(dir: &Path) -> bool { #[cfg(test)] mod tests { use super::*; + use deno_core::parking_lot::Mutex; use std::process::Command; - use std::sync::Mutex; use tempfile::TempDir; use test_util::tests_path; @@ -401,7 +401,7 @@ mod tests { #[test] fn install_basic() { - let _guard = ENV_LOCK.lock().ok(); + let _guard = ENV_LOCK.lock(); let temp_dir = TempDir::new().expect("tempdir fail"); let temp_dir_str = temp_dir.path().to_string_lossy().to_string(); // NOTE: this test overrides environmental variables @@ -591,7 +591,7 @@ mod tests { #[test] fn install_custom_dir_env_var() { - let _guard = ENV_LOCK.lock().ok(); + let _guard = ENV_LOCK.lock(); let temp_dir = TempDir::new().expect("tempdir fail"); let bin_dir = temp_dir.path().join("bin"); std::fs::create_dir(&bin_dir).unwrap(); |