--- 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()); --- a/bindings/jsonnet/src/interop.rs +++ b/bindings/jsonnet/src/interop.rs @@ -8,8 +8,7 @@ use crate::VM; - extern "C" { - + unsafe extern "C" { pub fn _jrsonnet_static_import_callback( ctx: *mut c_void, base: *const c_char, @@ -27,7 +26,7 @@ ) -> *mut Val; } - #[no_mangle] + #[unsafe(no_mangle)] #[cfg(feature = "interop-wasm")] // ctx arg is passed as-is to callback #[allow(clippy::not_unsafe_ptr_arg_deref)] @@ -38,7 +37,7 @@ /// # Safety /// /// `name` and `raw_params` should be correctly initialized - #[no_mangle] + #[unsafe(no_mangle)] #[cfg(feature = "interop-wasm")] pub unsafe extern "C" fn jrsonnet_apply_static_native_callback( vm: &VM, @@ -64,7 +63,7 @@ use crate::VM; - #[no_mangle] + #[unsafe(no_mangle)] pub extern "C" fn jrsonnet_set_trace_format(vm: &mut VM, format: u8) { match format { 0 => { @@ -105,7 +104,7 @@ /// /// Current thread GC will be broken after this call, need to call /// `jrsonet_enter_thread` before doing anything. - #[no_mangle] + #[unsafe(no_mangle)] pub unsafe extern "C" fn jrsonnet_exit_thread() -> *mut ThreadCTX { Box::into_raw(Box::new(ThreadCTX { interner: jrsonnet_interner::interop::exit_thread(), @@ -113,7 +112,7 @@ })) } - #[no_mangle] + #[unsafe(no_mangle)] pub extern "C" fn jrsonnet_reenter_thread(mut ctx: Box) { use std::ptr::null_mut; assert!( @@ -132,12 +131,12 @@ // boxing. pub enum JrThreadId {} - #[no_mangle] + #[unsafe(no_mangle)] pub extern "C" fn jrsonnet_thread_id() -> *mut JrThreadId { Box::into_raw(Box::new(std::thread::current().id())).cast() } - #[no_mangle] + #[unsafe(no_mangle)] pub extern "C" fn jrsonnet_thread_id_compare( a: *const JrThreadId, b: *const JrThreadId, @@ -147,7 +146,7 @@ i32::from(*a == *b) } - #[no_mangle] + #[unsafe(no_mangle)] pub unsafe extern "C" fn jrsonnet_thread_id_free(id: *mut JrThreadId) { let _id: Box = unsafe { Box::from_raw(id.cast()) }; } --- 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) { 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) { 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::() { 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) };