Revamp `RwLock` usage in the lib

Also not quite sure if they goofed rustfmt or something, but its changes it did were a bit bizarre.

1 files changed, 18 insertions, 0 deletions

diff --git a/src/internal/rwlock_ext.rs b/src/internal/rwlock_ext.rs
new file mode 100644
index 0000000..8266cdf
--- /dev/null
+++ b/src/internal/rwlock_ext.rs
@@ -0,0 +1,18 @@
+use std::sync::{Arc, RwLock};
+
+pub trait RwLockExt<T> {
+    fn with<Y, F: Fn(&T) -> Y>(&self, f: F) -> Y;
+    fn with_mut<Y, F: FnMut(&mut T) -> Y>(&self, f: F) -> Y;
+}
+
+impl<T> RwLockExt<T> for Arc<RwLock<T>> {
+    fn with<Y, F: Fn(&T) -> Y>(&self, f: F) -> Y {
+        let r = self.read().unwrap();
+        f(&r)
+    }
+
+    fn with_mut<Y, F: FnMut(&mut T) -> Y>(&self, mut f: F) -> Y {
+        let mut w = self.write().unwrap();
+        f(&mut w)
+    }
+}