git.delta.rocks / jrsonnet / refs/commits / d86715261b8b

--- a/bindings/jsonnet/src/import.rs
+++ b/bindings/jsonnet/src/import.rs
@@ -107,7 +107,7 @@
 /// # Safety
 ///
 /// It should be safe to call `cb` using valid values with passed `ctx`
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub unsafe extern "C" fn jsonnet_import_callback(
 	vm: &VM,
 	cb: JsonnetImportCallback,
@@ -123,7 +123,7 @@
 /// # Safety
 ///
 /// `path` should be a NUL-terminated string
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub unsafe extern "C" fn jsonnet_jpath_add(vm: &VM, path: *const c_char) {
 	let cstr = unsafe { CStr::from_ptr(path) };
 	let path = PathBuf::from(cstr.to_str().unwrap());

88
9	use crate::VM;9	use crate::VM;
1010
11	extern "C" {11	unsafe extern "C" {
12
13		pub fn _jrsonnet_static_import_callback(12		pub fn _jrsonnet_static_import_callback(
14			ctx: *mut c_void,13			ctx: *mut c_void,
27		) -> *mut Val;26		) -> *mut Val;
28	}27	}
2928
30	#[no_mangle]29	#[unsafe(no_mangle)]
31	#[cfg(feature = "interop-wasm")]30	#[cfg(feature = "interop-wasm")]
32	// ctx arg is passed as-is to callback31	// ctx arg is passed as-is to callback
33	#[allow(clippy::not_unsafe_ptr_arg_deref)]32	#[allow(clippy::not_unsafe_ptr_arg_deref)]
38	/// # Safety37	/// # Safety
39	///38	///
40	/// `name` and `raw_params` should be correctly initialized39	/// `name` and `raw_params` should be correctly initialized
41	#[no_mangle]40	#[unsafe(no_mangle)]
42	#[cfg(feature = "interop-wasm")]41	#[cfg(feature = "interop-wasm")]
43	pub unsafe extern "C" fn jrsonnet_apply_static_native_callback(42	pub unsafe extern "C" fn jrsonnet_apply_static_native_callback(
44		vm: &VM,43		vm: &VM,
6463
65	use crate::VM;64	use crate::VM;
6665
67	#[no_mangle]66	#[unsafe(no_mangle)]
68	pub extern "C" fn jrsonnet_set_trace_format(vm: &mut VM, format: u8) {67	pub extern "C" fn jrsonnet_set_trace_format(vm: &mut VM, format: u8) {
69		match format {68		match format {
70			0 => {69			0 => {
105	///104	///
106	/// Current thread GC will be broken after this call, need to call105	/// Current thread GC will be broken after this call, need to call
107	/// `jrsonet_enter_thread` before doing anything.106	/// `jrsonet_enter_thread` before doing anything.
108	#[no_mangle]107	#[unsafe(no_mangle)]
109	pub unsafe extern "C" fn jrsonnet_exit_thread() -> *mut ThreadCTX {108	pub unsafe extern "C" fn jrsonnet_exit_thread() -> *mut ThreadCTX {
110		Box::into_raw(Box::new(ThreadCTX {109		Box::into_raw(Box::new(ThreadCTX {
111			interner: jrsonnet_interner::interop::exit_thread(),110			interner: jrsonnet_interner::interop::exit_thread(),
112			gc: unsafe { jrsonnet_gcmodule::interop::exit_thread() },111			gc: unsafe { jrsonnet_gcmodule::interop::exit_thread() },
113		}))112		}))
114	}113	}
115114
116	#[no_mangle]115	#[unsafe(no_mangle)]
117	pub extern "C" fn jrsonnet_reenter_thread(mut ctx: Box<ThreadCTX>) {116	pub extern "C" fn jrsonnet_reenter_thread(mut ctx: Box<ThreadCTX>) {
118		use std::ptr::null_mut;117		use std::ptr::null_mut;
119		assert!(118		assert!(
132	// boxing.131	// boxing.
133	pub enum JrThreadId {}132	pub enum JrThreadId {}
134133
135	#[no_mangle]134	#[unsafe(no_mangle)]
136	pub extern "C" fn jrsonnet_thread_id() -> *mut JrThreadId {135	pub extern "C" fn jrsonnet_thread_id() -> *mut JrThreadId {
137		Box::into_raw(Box::new(std::thread::current().id())).cast()136		Box::into_raw(Box::new(std::thread::current().id())).cast()
138	}137	}
139138
140	#[no_mangle]139	#[unsafe(no_mangle)]
141	pub extern "C" fn jrsonnet_thread_id_compare(140	pub extern "C" fn jrsonnet_thread_id_compare(
142		a: *const JrThreadId,141		a: *const JrThreadId,
143		b: *const JrThreadId,142		b: *const JrThreadId,
147		i32::from(*a == *b)146		i32::from(*a == *b)
148	}147	}
149148
150	#[no_mangle]149	#[unsafe(no_mangle)]
151	pub unsafe extern "C" fn jrsonnet_thread_id_free(id: *mut JrThreadId) {150	pub unsafe extern "C" fn jrsonnet_thread_id_free(id: *mut JrThreadId) {
152		let _id: Box<ThreadId> = unsafe { Box::from_raw(id.cast()) };151		let _id: Box<ThreadId> = unsafe { Box::from_raw(id.cast()) };
153	}152	}

--- a/bindings/jsonnet/src/lib.rs
+++ b/bindings/jsonnet/src/lib.rs
@@ -43,7 +43,7 @@
 /// Conforms to [semantic versioning](http://semver.org/).
 /// If this does not match `LIB_JSONNET_VERSION`
 /// then there is a mismatch between header and compiled library.
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn jsonnet_version() -> &'static [u8; 12] {
 	b"v0.22.0-rc1\0"
 }
@@ -130,7 +130,7 @@
 }
 
 /// Creates a new Jsonnet virtual machine.
-#[no_mangle]
+#[unsafe(no_mangle)]
 #[allow(clippy::box_default)]
 pub extern "C" fn jsonnet_make() -> *mut VM {
 	let mut state = State::builder();
@@ -147,14 +147,14 @@
 }
 
 /// Complement of [`jsonnet_vm_make`].
-#[no_mangle]
+#[unsafe(no_mangle)]
 #[allow(clippy::boxed_local)]
 pub extern "C" fn jsonnet_destroy(vm: Box<VM>) {
 	drop(vm);
 }
 
 /// Set the maximum stack depth.
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn jsonnet_max_stack(_vm: &VM, v: c_uint) {
 	set_stack_depth_limit(v as usize);
 }
@@ -162,17 +162,17 @@
 /// Set the number of objects required before a garbage collection cycle is allowed.
 ///
 /// No-op for now
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn jsonnet_gc_min_objects(_vm: &VM, _v: c_uint) {}
 
 /// Run the garbage collector after this amount of growth in the number of objects
 ///
 /// No-op for now
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn jsonnet_gc_growth_trigger(_vm: &VM, _v: c_double) {}
 
 /// Expect a string as output and don't JSON encode it.
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn jsonnet_string_output(vm: &mut VM, v: c_int) {
 	vm.manifest_format = match v {
 		0 => Box::new(JsonFormat::default()),
@@ -189,7 +189,7 @@
 /// `buf` should be either previosly allocated by this library, or NULL
 ///
 /// This function is most definitely broken, but it works somehow, see TODO inside
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub unsafe extern "C" fn jsonnet_realloc(_vm: &VM, buf: *mut u8, sz: usize) -> *mut u8 {
 	if buf.is_null() {
 		if sz == 0 {
@@ -214,14 +214,14 @@
 /// Clean up a JSON subtree.
 ///
 /// This is useful if you want to abort with an error mid-way through building a complex value.
-#[no_mangle]
+#[unsafe(no_mangle)]
 #[allow(clippy::boxed_local)]
 pub extern "C" fn jsonnet_json_destroy(_vm: &VM, v: Box<Val>) {
 	drop(v);
 }
 
 /// Set the number of lines of stack trace to display (0 for all of them).
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn jsonnet_max_trace(vm: &mut VM, v: c_uint) {
 	if let Some(format) = vm.trace_format.as_any_mut().downcast_mut::<CompactFormat>() {
 		format.max_trace = v as usize;
@@ -237,7 +237,7 @@
 /// # Safety
 ///
 /// `filename` should be a NUL-terminated string
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub unsafe extern "C" fn jsonnet_evaluate_file(
 	vm: &VM,
 	filename: *const c_char,
@@ -270,7 +270,7 @@
 /// # Safety
 ///
 /// `filename`, `snippet` should be a NUL-terminated strings
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub unsafe extern "C" fn jsonnet_evaluate_snippet(
 	vm: &VM,
 	filename: *const c_char,
@@ -330,7 +330,7 @@
 }
 
 /// # Safety
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub unsafe extern "C" fn jsonnet_evaluate_file_multi(
 	vm: &VM,
 	filename: *const c_char,
@@ -357,7 +357,7 @@
 }
 
 /// # Safety
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub unsafe extern "C" fn jsonnet_evaluate_snippet_multi(
 	vm: &VM,
 	filename: *const c_char,
@@ -412,7 +412,7 @@
 }
 
 /// # Safety
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub unsafe extern "C" fn jsonnet_evaluate_file_stream(
 	vm: &VM,
 	filename: *const c_char,
@@ -439,7 +439,7 @@
 }
 
 /// # Safety
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub unsafe extern "C" fn jsonnet_evaluate_snippet_stream(
 	vm: &VM,
 	filename: *const c_char,

--- a/bindings/jsonnet/src/native.rs
+++ b/bindings/jsonnet/src/native.rs
@@ -62,7 +62,7 @@
 /// `name` should be a NUL-terminated string
 /// `cb` should be a function pointer
 /// `raw_params` should point to a NULL-terminated array of NUL-terminated strings
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub unsafe extern "C" fn jsonnet_native_callback(
 	vm: &VM,
 	name: *const c_char,
@@ -82,7 +82,7 @@
 				.expect("param name is not utf-8")
 		};
 		params.push(param.into());
-		raw_params = unsafe { raw_params.offset(1) };
+		raw_params = unsafe { raw_params.add(1) };
 	}
 
 	let any_resolver = vm.state.context_initializer();

--- a/bindings/jsonnet/src/val_extract.rs
+++ b/bindings/jsonnet/src/val_extract.rs
@@ -10,7 +10,7 @@
 use crate::VM;
 
 /// If the value is a string, return it as UTF-8, otherwise return `NULL`.
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn jsonnet_json_extract_string(_vm: &VM, v: &Val) -> *mut c_char {
 	match v {
 		Val::Str(s) => {
@@ -22,7 +22,7 @@
 }
 
 /// If the value is a number, return `1` and store the number in out, otherwise return `0`.
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn jsonnet_json_extract_number(_vm: &VM, v: &Val, out: &mut c_double) -> c_int {
 	match v {
 		Val::Num(n) => {
@@ -34,7 +34,7 @@
 }
 
 /// Return `0` if the value is `false`, `1` if it is `true`, and `2` if it is not a `bool`.
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn jsonnet_json_extract_bool(_vm: &VM, v: &Val) -> c_int {
 	match v {
 		Val::Bool(false) => 0,
@@ -44,7 +44,7 @@
 }
 
 /// Return `1` if the value is `null`, otherwise return `0`.
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn jsonnet_json_extract_null(_vm: &VM, v: &Val) -> c_int {
 	match v {
 		Val::Null => 1,

--- a/bindings/jsonnet/src/val_make.rs
+++ b/bindings/jsonnet/src/val_make.rs
@@ -14,7 +14,7 @@
 /// # Safety
 ///
 /// `v` should be a NUL-terminated string
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub unsafe extern "C" fn jsonnet_json_make_string(_vm: &VM, val: *const c_char) -> *mut Val {
 	let val = unsafe { CStr::from_ptr(val) };
 	let val = val.to_str().expect("string is not utf-8");
@@ -22,7 +22,7 @@
 }
 
 /// Convert the given double to a `JsonnetJsonValue`.
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn jsonnet_json_make_number(_vm: &VM, v: c_double) -> *mut Val {
 	Box::into_raw(Box::new(Val::Num(
 		NumValue::new(v).expect("jsonnet numbers are finite"),
@@ -30,14 +30,14 @@
 }
 
 /// Convert the given `bool` (`1` or `0`) to a `JsonnetJsonValue`.
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn jsonnet_json_make_bool(_vm: &VM, v: c_int) -> *mut Val {
 	assert!(v == 0 || v == 1, "bad boolean value");
 	Box::into_raw(Box::new(Val::Bool(v == 1)))
 }
 
 /// Make a `JsonnetJsonValue` representing `null`.
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn jsonnet_json_make_null(_vm: &VM) -> *mut Val {
 	Box::into_raw(Box::new(Val::Null))
 }
@@ -45,13 +45,13 @@
 /// Make a `JsonnetJsonValue` representing an array.
 ///
 /// Assign elements with [`jsonnet_json_array_append`].
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn jsonnet_json_make_array(_vm: &VM) -> *mut Val {
 	Box::into_raw(Box::new(Val::arr(())))
 }
 
 /// Make a `JsonnetJsonValue` representing an object.
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn jsonnet_json_make_object(_vm: &VM) -> *mut Val {
 	Box::into_raw(Box::new(Val::Obj(ObjValue::empty())))
 }

--- a/bindings/jsonnet/src/val_modify.rs
+++ b/bindings/jsonnet/src/val_modify.rs
@@ -14,7 +14,7 @@
 ///
 /// `arr` should be a pointer to array value allocated by `make_array`, or returned by other library call
 /// `val` should be a pointer to value allocated using this library
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub unsafe extern "C" fn jsonnet_json_array_append(_vm: &VM, arr: &mut Val, val: &Val) {
 	match arr {
 		Val::Arr(old) => {
@@ -38,7 +38,7 @@
 ///
 /// `obj` should be a pointer to object value allocated by `make_object`, or returned by other library call
 /// `name` should be NUL-terminated string
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub unsafe extern "C" fn jsonnet_json_object_append(
 	_vm: &VM,
 	obj: &mut Val,

--- a/bindings/jsonnet/src/vars_tlas.rs
+++ b/bindings/jsonnet/src/vars_tlas.rs
@@ -13,7 +13,7 @@
 /// # Safety
 ///
 /// `name`, `code` should be a NUL-terminated strings
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub unsafe extern "C" fn jsonnet_ext_var(vm: &VM, name: *const c_char, value: *const c_char) {
 	let name = unsafe { CStr::from_ptr(name) };
 	let value = unsafe { CStr::from_ptr(value) };
@@ -36,7 +36,7 @@
 /// # Safety
 ///
 /// `name`, `code` should be a NUL-terminated strings
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub unsafe extern "C" fn jsonnet_ext_code(vm: &VM, name: *const c_char, code: *const c_char) {
 	let name = unsafe { CStr::from_ptr(name) };
 	let code = unsafe { CStr::from_ptr(code) };
@@ -60,7 +60,7 @@
 /// # Safety
 ///
 /// `name`, `value` should be a NUL-terminated strings
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub unsafe extern "C" fn jsonnet_tla_var(vm: &mut VM, name: *const c_char, value: *const c_char) {
 	let name = unsafe { CStr::from_ptr(name) };
 	let value = unsafe { CStr::from_ptr(value) };
@@ -77,7 +77,7 @@
 /// # Safety
 ///
 /// `name`, `code` should be a NUL-terminated strings
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub unsafe extern "C" fn jsonnet_tla_code(vm: &mut VM, name: *const c_char, code: *const c_char) {
 	let name = unsafe { CStr::from_ptr(name) };
 	let code = unsafe { CStr::from_ptr(code) };