stamp: move DenoRuntimeDropToken to base_rt crate

supabase · laktek · Nov 1, 2024 · Jul 11, 2024 · Jul 15, 2024 · Jul 12, 2024
commit ce29ee9773da68f97b0d7d6b396c4e9be815dc1a
diff --git a/crates/base/src/deno_runtime.rs b/crates/base/src/deno_runtime.rs
@@ -24,7 +24,7 @@ use futures_util::future::poll_fn;
 use futures_util::task::AtomicWaker;
 use log::{error, trace};
 use once_cell::sync::{Lazy, OnceCell};
-use sb_core::conn_sync::DenoRuntimeDropToken;
+use base_rt::DenoRuntimeDropToken;
 use sb_core::http::sb_core_http;
 use sb_core::http_start::sb_core_http_start;
 use sb_core::util::sync::AtomicFlag;

diff --git a/crates/base_rt/src/lib.rs b/crates/base_rt/src/lib.rs
@@ -1,6 +1,7 @@
 use std::num::NonZeroUsize;
 
 use once_cell::sync::Lazy;
+use tokio_util::sync::CancellationToken;
 
 pub mod error;
 
@@ -58,3 +59,15 @@ pub static USER_WORKER_RT: Lazy<tokio_util::task::LocalPoolHandle> = Lazy::new(|
         )
     })
 });
+
+#[derive(Clone)]
+pub struct DenoRuntimeDropToken(pub CancellationToken);
+
+impl std::ops::Deref for DenoRuntimeDropToken {
+    type Target = CancellationToken;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
diff --git a/crates/sb_core/conn_sync.rs b/crates/sb_core/conn_sync.rs
@@ -14,6 +14,3 @@ impl ConnWatcher {
         self.0.clone()
     }
 }
-
-#[derive(Clone)]
-pub struct DenoRuntimeDropToken(pub CancellationToken);
diff --git a/crates/sb_core/net.rs b/crates/sb_core/net.rs
@@ -1,3 +1,4 @@
+use base_rt::DenoRuntimeDropToken;
 use deno_core::error::bad_resource;
 use deno_core::error::AnyError;
 use deno_core::op2;
@@ -20,8 +21,6 @@ use tokio_util::sync::CancellationToken;
 use tracing::span;
 use tracing::Level;
 
-use crate::conn_sync::DenoRuntimeDropToken;
-
 pub struct TokioDuplexResource {
     id: usize,
     rw: AsyncRefCell<io::DuplexStream>,