Move over to using parking_lot for all locks

Author: sminez

Cargo.lock

@@ -61,6 +61,7 @@ libc = "0.2.186"
 libloading = "0.9.0"
 lsp-types = "0.97.0"
 ninep = { version = "0.6", path = "crates/ninep", default-features = false }
+parking_lot = "0.12.5"
 serde = "1.0.228"
 serde_json = "1.0.149"
 structex = { version = "0.6", default-features = false }

Cargo.toml

@@ -2,10 +2,8 @@
 use ad_editor::{Config, buffer::Buffer, dot::TextObject, editor::Action};
 use ad_event::Source;
 use criterion::{Criterion, criterion_group};
-use std::{
-    env::current_dir,
-    sync::{Arc, RwLock},
-};
+use parking_lot::RwLock;
+use std::{env::current_dir, sync::Arc};
 
 fn criterion_benchmark(c: &mut Criterion) {
     let mut group = c.benchmark_group("TS update");

benches/benchmarks/ts_update.rs

@@ -6,11 +6,12 @@ use ad_editor::{
     ui::{GenericTui, Layout, UserInterface},
 };
 use criterion::{BenchmarkGroup, Criterion, criterion_group, measurement::WallTime};
+use parking_lot::RwLock;
 use std::{
     env::current_dir,
     hint::black_box,
     io::{self, Write},
-    sync::{Arc, RwLock},
+    sync::Arc,
 };
 
 fn criterion_benchmark(c: &mut Criterion) {

benches/benchmarks/tui_render.rs

@@ -21,7 +21,7 @@ util_fs = ["dep:uzers"]
 [dependencies]
 bitflags = "2"
 jiff = "0.2"
-parking_lot = "0.12.5"
+parking_lot = "0.12"
 simple_coro = "0.1.5"
 tokio =  { version = "1", features = ["macros", "net", "io-util", "rt", "sync"], optional = true }
 uzers = { version = "0.12", optional = true }

crates/ninep/Cargo.toml

@@ -6,10 +6,8 @@ use crate::{
     fs::{FileType, Perm, QID_ROOT, Qid, Stat, WStat},
     sansio::server::{E_CREATE_NON_DIR, E_ILLEGAL_CREATE_NAME, E_UNKNOWN_FILE},
 };
-use std::{
-    collections::BTreeMap,
-    sync::{Arc, RwLock},
-};
+use parking_lot::RwLock;
+use std::{collections::BTreeMap, sync::Arc};
 
 const E_ALREADY_EXISTS: &str = "file already exists";
 
@@ -37,14 +35,14 @@ where
     where
         F: FnOnce(&Nodes<T>) -> U,
     {
-        f(&self.nodes.read().unwrap())
+        f(&self.nodes.read())
     }
 
     fn with_nodes_mut<F, U>(&self, f: F) -> U
     where
         F: FnOnce(&mut Nodes<T>) -> U,
     {
-        f(&mut self.nodes.write().unwrap())
+        f(&mut self.nodes.write())
     }
 
     /// Add a new node to the tree, returning its `qid`.

crates/ninep/src/fs/simple.rs

@@ -6,6 +6,7 @@ use crate::{
         DEFAULT_MSIZE, FileType, MAXWELEM, NineP, Qid, RawStat, Rdata, SharedBuf, Tdata, Tmessage,
     },
 };
+use parking_lot::RwLock;
 use simple_coro::{Coro, Handle, ReadyCoro};
 use std::{
     cmp::min,
@@ -14,7 +15,7 @@ use std::{
     future::Future,
     ops::{Deref, DerefMut},
     path::{Path, PathBuf},
-    sync::{Arc, RwLock},
+    sync::Arc,
 };
 
 /// Marker afid to denode that auth is not required for establishing connections
@@ -153,7 +154,7 @@ impl SessionType for Attached {}
 
 impl Drop for Attached {
     fn drop(&mut self) {
-        let mut guard = self.qids.write().unwrap();
+        let mut guard = self.qids.write();
         for fm in self.fids.values() {
             if let Some(meta) = guard.get_mut(&fm.qid) {
                 meta.opened_by.remove(&self.client_id);
@@ -219,7 +220,7 @@ where
     where
         F: FnOnce(&BTreeMap<u64, QidMeta>) -> U,
     {
-        f(&self.qids.read().unwrap())
+        f(&self.qids.read())
     }
 
     /// Run a closure with mutable access to the shared server-level Qid map.
@@ -231,7 +232,7 @@ where
     where
         F: FnOnce(&mut BTreeMap<u64, QidMeta>) -> U,
     {
-        f(&mut self.qids.write().unwrap())
+        f(&mut self.qids.write())
     }
 
     pub(crate) fn parent_qid(&self, qid: u64) -> Option<u64> {

crates/ninep/src/sansio/server.rs

@@ -14,10 +14,11 @@ use crate::{
     tokio::{AsyncNineP, server::AsyncServe9pFromSync},
 };
 use jiff::Timestamp;
+use parking_lot::Mutex;
 use std::{
     io, mem,
     os::unix::net::UnixStream,
-    sync::{Arc, Mutex, mpsc},
+    sync::{Arc, mpsc},
     thread::{sleep, spawn},
     time::Duration,
 };
@@ -257,14 +258,14 @@ pub(crate) struct RecordedCalls(Arc<Mutex<Vec<Call>>>);
 
 impl RecordedCalls {
     fn push(&self, call: Call) {
-        self.0.lock().unwrap().push(call);
+        self.0.lock().push(call);
     }
 
     /// Extract the [Call]s that have been recorded up until this point.
     ///
     /// This method clears the internal log state of the associated [TestFs].
     pub(crate) fn take(&self) -> Vec<Call> {
-        mem::take(&mut self.0.lock().unwrap())
+        mem::take(&mut self.0.lock())
     }
 }
 

crates/ninep/src/test_utils/mod.rs

@@ -12,6 +12,7 @@ opt-level = 3
 [dependencies]
 ad-editor = { path = "../" }
 libflate = "2.1.0"
+parking_lot = "0.12.5"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.143"
 

reference-tests/Cargo.toml

@@ -97,8 +97,9 @@ impl From<(usize, usize, String)> for TestPatch {
 mod tests {
     use super::*;
     use ad_editor::Config;
+    use parking_lot::RwLock;
     use pretty_assertions::assert_eq;
-    use std::sync::{Arc, RwLock};
+    use std::sync::Arc;
 
     fn run_reference_test(name: &str) {
         let path = format!("{}/data/{name}.json.gz", env!("CARGO_MANIFEST_DIR"),);