difftreelog
refactor(libjsonnet) move to split stdlib
in: master
5 files changed
bindings/jsonnet/Cargo.tomldiffbeforeafterboth--- 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]
bindings/jsonnet/src/lib.rsdiffbeforeafterboth--- 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]
bindings/jsonnet/src/native.rsdiffbeforeafterboth--- 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 }),
+ ))),
+ )
}
bindings/jsonnet/src/val_extract.rsdiffbeforeafterboth--- 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(),
}
}
bindings/jsonnet/src/vars_tlas.rsdiffbeforeafterboth1//! Manipulate external variables and top level arguments23use std::{ffi::CStr, os::raw::c_char};45use jrsonnet_evaluator::State;67/// # Safety8#[no_mangle]9pub unsafe extern "C" fn jsonnet_ext_var(vm: &State, name: *const c_char, value: *const c_char) {10 let name = CStr::from_ptr(name);11 let value = CStr::from_ptr(value);12 vm.add_ext_str(13 name.to_str().unwrap().into(),14 value.to_str().unwrap().into(),15 )16}1718/// # Safety19#[no_mangle]20pub unsafe extern "C" fn jsonnet_ext_code(vm: &State, name: *const c_char, value: *const c_char) {21 let name = CStr::from_ptr(name);22 let value = CStr::from_ptr(value);23 vm.add_ext_code(name.to_str().unwrap(), value.to_str().unwrap().into())24 .unwrap()25}26/// # Safety27#[no_mangle]28pub unsafe extern "C" fn jsonnet_tla_var(vm: &State, name: *const c_char, value: *const c_char) {29 let name = CStr::from_ptr(name);30 let value = CStr::from_ptr(value);31 vm.add_tla_str(32 name.to_str().unwrap().into(),33 value.to_str().unwrap().into(),34 )35}36/// # Safety37#[no_mangle]38pub unsafe extern "C" fn jsonnet_tla_code(vm: &State, name: *const c_char, value: *const c_char) {39 let name = CStr::from_ptr(name);40 let value = CStr::from_ptr(value);41 vm.add_tla_code(name.to_str().unwrap().into(), value.to_str().unwrap())42 .unwrap()43}