Add methods to get Cx to ContextInternal

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},
@@ -47,7 +47,11 @@ impl Env {
 }
 
 pub trait ContextInternal<'cx>: Sized {
-    fn env(&self) -> Env;
+    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<()> {

crates/neon/src/context/mod.rs

@@ -266,8 +266,12 @@ impl<'cx> Cx<'cx> {
 }
 
 impl<'cx> ContextInternal<'cx> for Cx<'cx> {
-    fn env(&self) -> Env {
-        self.env
+    fn cx(&self) -> &Cx<'cx> {
+        self
+    }
+
+    fn cx_mut(&mut self) -> &mut Cx<'cx> {
+        self
     }
 }
 
@@ -664,13 +668,13 @@ impl<'cx> Deref for ModuleContext<'cx> {
     type Target = Cx<'cx>;
 
     fn deref(&self) -> &Self::Target {
-        &self.cx
+        self.cx()
     }
 }
 
 impl<'cx> DerefMut for ModuleContext<'cx> {
     fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.cx
+        self.cx_mut()
     }
 }
 
@@ -727,8 +731,12 @@ impl<'cx> ModuleContext<'cx> {
 }
 
 impl<'cx> ContextInternal<'cx> for ModuleContext<'cx> {
-    fn env(&self) -> Env {
-        self.cx.env
+    fn cx(&self) -> &Cx<'cx> {
+        &self.cx
+    }
+
+    fn cx_mut(&mut self) -> &mut Cx<'cx> {
+        &mut self.cx
     }
 }
 
@@ -873,8 +881,12 @@ impl<'cx> FunctionContext<'cx> {
 }
 
 impl<'cx> ContextInternal<'cx> for FunctionContext<'cx> {
-    fn env(&self) -> Env {
-        self.cx.env
+    fn cx(&self) -> &Cx<'cx> {
+        &self.cx
+    }
+
+    fn cx_mut(&mut self) -> &mut Cx<'cx> {
+        &mut self.cx
     }
 }