Merge pull request #1048 from neon-bindings/kv/generic-ctx

Replace all generic contexts with a single Cx type
neon-bindings · Aug 28, 2024 · dae95b1 · dae95b1
2 parents 43e0eee + d14c1e1
commit dae95b1
Show file tree

Hide file tree

Showing 8 changed files with 221 additions and 184 deletions.
diff --git a/crates/neon/src/context/internal.rs b/crates/neon/src/context/internal.rs
@@ -1,7 +1,7 @@
 use std::{cell::RefCell, ffi::c_void, mem::MaybeUninit};
 
 use crate::{
-    context::ModuleContext,
+    context::{Cx, ModuleContext},
     handle::Handle,
     result::NeonResult,
     sys::{self, raw},
@@ -46,8 +46,12 @@ impl Env {
     }
 }
 
-pub trait ContextInternal<'a>: Sized {
-    fn env(&self) -> Env;
+pub trait ContextInternal<'cx>: Sized {
+    fn cx(&self) -> &Cx<'cx>;
+    fn cx_mut(&mut self) -> &mut Cx<'cx>;
+    fn env(&self) -> Env {
+        self.cx().env
+    }
 }
 
 fn default_main(mut cx: ModuleContext) -> NeonResult<()> {