1 files changed, 19 insertions, 12 deletions
diff --git a/incria/src/thunk.rs b/incria/src/thunk.rs
index 6aa44dd..f076ba1 100644
--- a/incria/src/thunk.rs
+++ b/incria/src/thunk.rs
@@ -1,8 +1,7 @@
 //! A mapper based on a function from keys to values.
 use std::{collections::HashMap, hash::Hash, pin::Pin, sync::Arc};
 
-use parking_lot::{MappedRwLockReadGuard, Mutex, RwLock, RwLockReadGuard};
-use tokio::sync::Notify;
+use tokio::sync::{Mutex, Notify, RwLock, RwLockReadGuard};
 
 use crate::{
     deps::{self, NodeId},
@@ -39,13 +38,13 @@ impl<K: Clone + Eq + Hash + Send + Sync, V: Send + Sync, C: Thunk<K, V>> Mapper
 {
     type Key = K;
     type Value = V;
-    type Wrapper<'a> = MappedRwLockReadGuard<'a, V> where V: 'a;
+    type Wrapper<'a> = RwLockReadGuard<'a, V> where V: 'a;
 
     async fn get<'a>(&'a self, key: &Self::Key) -> Self::Wrapper<'a> {
         // Attempt to reuse or evict the existing value
         let mut reuse_dep_id = None;
         {
-            let finished = self.calculated.read();
+            let finished = self.calculated.read().await;
             if let Some((_, dep)) = finished.get(key) {
                 if !deps::is_dirty(*dep) {
                     deps::add_dep(*dep);
@@ -54,7 +53,7 @@ impl<K: Clone + Eq + Hash + Send + Sync, V: Send + Sync, C: Thunk<K, V>> Mapper
                     reuse_dep_id = Some(*dep);
                     drop(finished);
                     // Dirty, so we'll recompute below but we should remove it now
-                    if self.calculated.write().remove(key).is_none() {
+                    if self.calculated.write().await.remove(key).is_none() {
                         // Someone else already noticed it was dirty and removed it before us, so we need to deal with that
                         todo!("dirty value removed between us noticing and us doing something")
                     }
@@ -62,19 +61,22 @@ impl<K: Clone + Eq + Hash + Send + Sync, V: Send + Sync, C: Thunk<K, V>> Mapper
             }
         }
 
-        let barrier = self.waiting.lock().get(key).cloned();
+        let barrier = self.waiting.lock().await.get(key).cloned();
         if let Some(barrier) = barrier {
             // Waiting for completion
             barrier.notified().await;
 
-            let val = RwLockReadGuard::map(self.calculated.read(), |hm| hm.get(key).unwrap());
+            let val = RwLockReadGuard::map(self.calculated.read().await, |hm| hm.get(key).unwrap());
             deps::add_dep(val.1);
 
-            return MappedRwLockReadGuard::map(val, |inf| &inf.0);
+            return RwLockReadGuard::map(val, |inf| &inf.0);
         } else {
             // Needs calculated
             let notify = Arc::new(Notify::new());
-            self.waiting.lock().insert(key.clone(), notify.clone());
+            self.waiting
+                .lock()
+                .await
+                .insert(key.clone(), notify.clone());
 
             let dep = if let Some(x) = reuse_dep_id {
                 deps::clear(x);
@@ -86,12 +88,17 @@ impl<K: Clone + Eq + Hash + Send + Sync, V: Send + Sync, C: Thunk<K, V>> Mapper
             let val = deps::with_node_id(dep, self.thunk.compute(key.clone())).await;
             deps::add_dep(dep);
 
-            self.calculated.write().insert(key.clone(), (val, dep));
-            self.waiting.lock().remove(key);
+            self.calculated
+                .write()
+                .await
+                .insert(key.clone(), (val, dep));
+            self.waiting.lock().await.remove(key);
 
             notify.notify_waiters();
 
-            return RwLockReadGuard::map(self.calculated.read(), |hm| &hm.get(key).unwrap().0);
+            return RwLockReadGuard::map(self.calculated.read().await, |hm| {
+                &hm.get(key).unwrap().0
+            });
         }
     }
 }