diff --git a/Cargo.toml b/Cargo.toml index fcbf6ddd8..e8c023de3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ dyn-cache = { path = "dyn-cache", version = "0.12.0"} futures = "0.3.5" illicit = { path = "illicit", version = "1.1.1"} moxie-macros = { path = "macros", version = "0.1.0-pre" } -parking_lot = "0.11" +simple-mutex = "1.1.5" scopeguard = "1" topo = { path = "topo", version = "0.13.0"} tracing = "^0.1" diff --git a/dyn-cache/Cargo.toml b/dyn-cache/Cargo.toml index 9229b855f..b1daa9160 100644 --- a/dyn-cache/Cargo.toml +++ b/dyn-cache/Cargo.toml @@ -18,7 +18,7 @@ downcast-rs = "1.1.1" hash_hasher = "2.0.3" hashbrown = "0.9.0" illicit = { path = "../illicit", version = "1.1.1"} -parking_lot = "0.11.0" +simple-mutex = "1.1.5" paste = "1.0.0" [dev-dependencies] diff --git a/dyn-cache/src/definition.rs b/dyn-cache/src/definition.rs index 8f3de3418..8a0042922 100644 --- a/dyn-cache/src/definition.rs +++ b/dyn-cache/src/definition.rs @@ -379,7 +379,7 @@ impl std::panic::RefUnwindSafe for $shared {} mod $test_mod { use super::*; use std::sync::Arc; - use parking_lot::Mutex; + use simple_mutex::Mutex; #[test] fn single_query_with_gc() { diff --git a/dyn-cache/src/dep_node.rs b/dyn-cache/src/dep_node.rs index b5d807acd..f029eb224 100644 --- a/dyn-cache/src/dep_node.rs +++ b/dyn-cache/src/dep_node.rs @@ -1,6 +1,6 @@ use super::Liveness; use illicit::AsContext; -use parking_lot::Mutex; +use simple_mutex::Mutex; use std::{ cmp::Ordering, hash::{Hash, Hasher}, diff --git a/dyn-cache/src/lib.rs b/dyn-cache/src/lib.rs index b9d18ae93..5b09b55ad 100644 --- a/dyn-cache/src/lib.rs +++ b/dyn-cache/src/lib.rs @@ -423,7 +423,7 @@ pub mod local { /// A thread-safe cache which requires stored types implement `Send`. pub mod sync { - use parking_lot::Mutex; + use simple_mutex::Mutex; use std::sync::Arc; define_cache!(sync, SendCache: Send, Arc, Mutex::lock); diff --git a/src/lib.rs b/src/lib.rs index 2ef4e8d10..09224378a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -60,7 +60,7 @@ pub mod runtime; pub mod testing; use crate::runtime::{Context, Var}; -use parking_lot::Mutex; +use simple_mutex::Mutex; use std::{ borrow::Borrow, fmt::{Debug, Display, Formatter, Result as FmtResult}, diff --git a/src/runtime/var.rs b/src/runtime/var.rs index e9334464b..d3d0901e4 100644 --- a/src/runtime/var.rs +++ b/src/runtime/var.rs @@ -1,5 +1,5 @@ use crate::{Commit, Key}; -use parking_lot::Mutex; +use simple_mutex::Mutex; use std::{sync::Arc, task::Waker}; /// The underlying container of state variables. Vends copies of the latest diff --git a/topo/Cargo.toml b/topo/Cargo.toml index 9f67177c0..1190f4f54 100644 --- a/topo/Cargo.toml +++ b/topo/Cargo.toml @@ -17,7 +17,7 @@ edition = "2018" dyn-cache = { path = "../dyn-cache", version = "0.12.0"} illicit = { path = "../illicit", version = "1.1.1"} once_cell = "1.4.0" -parking_lot = "0.11.0" +simple-mutex = "1.1.5" topo-macro = { path = "macro", version = "0.10.0"} [dev-dependencies] diff --git a/topo/src/slot.rs b/topo/src/slot.rs index 74ee24b0e..1a6d45a30 100644 --- a/topo/src/slot.rs +++ b/topo/src/slot.rs @@ -1,6 +1,6 @@ use dyn_cache::sync::SendCache; use once_cell::sync::Lazy; -use parking_lot::Mutex; +use simple_mutex::Mutex; use std::{ any::{type_name, TypeId}, borrow::Borrow,