git.delta.rocks / jrsonnet / refs/commits / 41db4d558ad2

--- a/bindings/jsonnet/Cargo.toml
+++ b/bindings/jsonnet/Cargo.toml
@@ -10,6 +10,7 @@
 [dependencies]
 jrsonnet-evaluator = { path = "../../crates/jrsonnet-evaluator", version = "0.4.2" }
 jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "0.4.2" }
+jrsonnet-stdlib = { path = "../../crates/jrsonnet-stdlib", version = "0.4.2" }
 jrsonnet-gcmodule = { version = "0.3.4" }
 
 [lib]

--- a/bindings/jsonnet/src/lib.rs
+++ b/bindings/jsonnet/src/lib.rs
@@ -31,8 +31,9 @@
 #[no_mangle]
 pub extern "C" fn jsonnet_make() -> *mut State {
 	let state = State::default();
-	state.with_stdlib();
 	state.settings_mut().import_resolver = Box::new(NativeImportResolver::default());
+	state.settings_mut().context_initializer =
+		Box::new(jrsonnet_stdlib::ContextInitializer::new(state.clone()));
 	Box::into_raw(Box::new(state))
 }
 
@@ -40,7 +41,7 @@
 #[no_mangle]
 #[allow(clippy::boxed_local)]
 pub unsafe extern "C" fn jsonnet_destroy(vm: *mut State) {
-	Box::from_raw(vm);
+	drop(Box::from_raw(vm));
 }
 
 #[no_mangle]
@@ -92,7 +93,7 @@
 #[no_mangle]
 #[allow(clippy::boxed_local)]
 pub unsafe extern "C" fn jsonnet_json_destroy(_vm: &State, v: *mut Val) {
-	Box::from_raw(v);
+	drop(Box::from_raw(v));
 }
 
 #[no_mangle]

--- a/bindings/jsonnet/src/native.rs
+++ b/bindings/jsonnet/src/native.rs
@@ -73,12 +73,17 @@
 		raw_params = raw_params.offset(1);
 	}
 
-	vm.add_native(
-		name,
-		#[allow(deprecated)]
-		Cc::new(tb!(NativeCallback::new(
-			params,
-			tb!(JsonnetNativeCallbackHandler { ctx, cb }),
-		))),
-	)
+	let any_resolver = vm.context_initializer();
+	any_resolver
+		.as_any()
+		.downcast_ref::<jrsonnet_stdlib::ContextInitializer>()
+		.expect("only stdlib context initializer supported")
+		.add_native(
+			name,
+			#[allow(deprecated)]
+			Cc::new(tb!(NativeCallback::new(
+				params,
+				tb!(JsonnetNativeCallbackHandler { ctx, cb }),
+			))),
+		)
 }

--- a/bindings/jsonnet/src/val_extract.rs
+++ b/bindings/jsonnet/src/val_extract.rs
@@ -10,7 +10,7 @@
 #[no_mangle]
 pub extern "C" fn jsonnet_json_extract_string(_vm: &State, v: &Val) -> *mut c_char {
 	match v {
-		Val::Str(s) => CString::new(&*s as &str).unwrap().into_raw(),
+		Val::Str(s) => CString::new(s as &str).unwrap().into_raw(),
 		_ => std::ptr::null_mut(),
 	}
 }

10	let name = CStr::from_ptr(name);10	let name = CStr::from_ptr(name);
11	let value = CStr::from_ptr(value);11	let value = CStr::from_ptr(value);
12
13	let any_resolver = vm.context_initializer();
14	any_resolver
15		.as_any()
16		.downcast_ref::<jrsonnet_stdlib::ContextInitializer>()
17		.expect("only stdlib context initializer supported")
12	vm.add_ext_str(18		.add_ext_str(
13		name.to_str().unwrap().into(),19			name.to_str().unwrap().into(),
14		value.to_str().unwrap().into(),20			value.to_str().unwrap().into(),
15	)21		)
21	let name = CStr::from_ptr(name);27	let name = CStr::from_ptr(name);
22	let value = CStr::from_ptr(value);28	let value = CStr::from_ptr(value);
29
30	let any_resolver = vm.context_initializer();
31	any_resolver
32		.as_any()
33		.downcast_ref::<jrsonnet_stdlib::ContextInitializer>()
34		.expect("only stdlib context initializer supported")
23	vm.add_ext_code(name.to_str().unwrap(), value.to_str().unwrap().into())35		.add_ext_code(name.to_str().unwrap(), value.to_str().unwrap().into())
24		.unwrap()36		.unwrap()
25}37}
26/// # Safety38/// # Safety