summaryrefslogtreecommitdiff
path: root/runtime/permissions.rs
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2021-07-06 23:48:01 -0400
committerGitHub <noreply@github.com>2021-07-06 23:48:01 -0400
commit7fc0e8ec8cd4b18ba10a04cf0ac2bee48826de3d (patch)
tree70e078538ae0f3467e8a519b918ae936587ce2d4 /runtime/permissions.rs
parent78ac19f51f48984ea16f97a0c574fa507544b8d5 (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 'runtime/permissions.rs')
-rw-r--r--runtime/permissions.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/runtime/permissions.rs b/runtime/permissions.rs
index d78e20076..0d89fb62e 100644
--- a/runtime/permissions.rs
+++ b/runtime/permissions.rs
@@ -5,6 +5,8 @@ use crate::fs_util::resolve_from_cwd;
use deno_core::error::custom_error;
use deno_core::error::uri_error;
use deno_core::error::AnyError;
+#[cfg(test)]
+use deno_core::parking_lot::Mutex;
use deno_core::serde::Deserialize;
use deno_core::serde::Serialize;
use deno_core::url;
@@ -21,8 +23,6 @@ use std::path::{Path, PathBuf};
use std::sync::atomic::AtomicBool;
#[cfg(test)]
use std::sync::atomic::Ordering;
-#[cfg(test)]
-use std::sync::Mutex;
const PERMISSION_EMOJI: &str = "⚠️";
@@ -1502,7 +1502,7 @@ mod tests {
let mut perms: Permissions = Default::default();
#[rustfmt::skip]
{
- let _guard = PERMISSION_PROMPT_GUARD.lock().unwrap();
+ let _guard = PERMISSION_PROMPT_GUARD.lock();
set_prompt_result(true);
assert_eq!(perms.read.request(Some(&Path::new("/foo"))), PermissionState::Granted);
assert_eq!(perms.read.query(None), PermissionState::Prompt);
@@ -1599,7 +1599,7 @@ mod tests {
hrtime: Permissions::new_hrtime(false, true),
};
- let _guard = PERMISSION_PROMPT_GUARD.lock().unwrap();
+ let _guard = PERMISSION_PROMPT_GUARD.lock();
set_prompt_result(true);
assert!(perms.read.check(&Path::new("/foo")).is_ok());
@@ -1652,7 +1652,7 @@ mod tests {
hrtime: Permissions::new_hrtime(false, true),
};
- let _guard = PERMISSION_PROMPT_GUARD.lock().unwrap();
+ let _guard = PERMISSION_PROMPT_GUARD.lock();
set_prompt_result(false);
assert!(perms.read.check(&Path::new("/foo")).is_err());