difftreelog
fix(libjsonnet) update to rust 2024
in: master
8 files changed
bindings/jsonnet/src/import.rsdiffbeforeafterboth1//! Import resolution manipulation utilities23use std::{4 alloc::Layout,5 cell::RefCell,6 collections::HashMap,7 env::current_dir,8 ffi::{CStr, CString, c_void},9 os::raw::{c_char, c_int},10 path::PathBuf,11 ptr::null_mut,12};1314use jrsonnet_evaluator::{15 AsPathLike, ImportResolver, ResolvePath, bail,16 error::{ErrorKind::*, Result},17};18use jrsonnet_gcmodule::Acyclic;19use jrsonnet_ir::{SourceDirectory, SourceFile, SourcePath};2021use crate::VM;2223pub type JsonnetImportCallback = unsafe extern "C" fn(24 ctx: *mut c_void,25 base: *const c_char,26 rel: *const c_char,27 found_here: *mut *const c_char,28 buf: *mut *mut c_char,29 buflen: *mut usize,30) -> c_int;3132/// Resolves imports using callback33#[derive(Acyclic)]34pub struct CallbackImportResolver {35 cb: JsonnetImportCallback,36 ctx: *mut c_void,37 out: RefCell<HashMap<SourcePath, Vec<u8>>>,38}39impl ImportResolver for CallbackImportResolver {40 fn resolve_from(&self, from: &SourcePath, path: &dyn AsPathLike) -> Result<SourcePath> {41 let base = if let Some(p) = from.downcast_ref::<SourceFile>() {42 let mut o = p.path().to_owned();43 o.pop();44 o45 } else if let Some(d) = from.downcast_ref::<SourceDirectory>() {46 d.path().to_owned()47 } else if from.is_default() {48 current_dir().map_err(|e| ImportIo(e.to_string()))?49 } else {50 unreachable!("can't resolve this path");51 };52 let base = unsafe { crate::unparse_path(&base) };53 let rel = path.as_path();54 let rel = match rel {55 ResolvePath::Str(s) => CString::new(s.as_bytes()).unwrap(),56 ResolvePath::Path(p) => unsafe { crate::unparse_path(p) },57 };58 let found_here: *mut c_char = null_mut();5960 let mut buf = null_mut();61 let mut buf_len = 0;62 let success = unsafe {63 (self.cb)(64 self.ctx,65 base.as_ptr(),66 rel.as_ptr(),67 &mut found_here.cast_const(),68 &raw mut buf,69 &raw mut buf_len,70 )71 };72 let buf_slice: &[u8] = unsafe { std::slice::from_raw_parts(buf.cast(), buf_len) };73 unsafe {74 std::alloc::dealloc(75 buf.cast(),76 Layout::from_size_align(buf_len, 1).expect("layout is valid"),77 );78 };79 let buf_intern = buf_slice.to_vec();8081 assert!(success == 0 || success == 1);82 if success == 0 {83 let result = String::from_utf8(buf_intern).expect("error should be valid string");84 bail!(ImportCallbackError(result));85 }8687 let found_here_raw = unsafe { CStr::from_ptr(found_here) };88 let found_here_buf = SourcePath::new(SourceFile::new(PathBuf::from(89 found_here_raw.to_str().unwrap(),90 )));91 unsafe {92 let _ = CString::from_raw(found_here);93 }9495 let mut out = self.out.borrow_mut();96 if !out.contains_key(&found_here_buf) {97 out.insert(found_here_buf.clone(), buf_intern);98 }99100 Ok(found_here_buf)101 }102 fn load_file_contents(&self, resolved: &SourcePath) -> Result<Vec<u8>> {103 Ok(self.out.borrow().get(resolved).unwrap().clone())104 }105}106107/// # Safety108///109/// It should be safe to call `cb` using valid values with passed `ctx`110#[unsafe(no_mangle)]111pub unsafe extern "C" fn jsonnet_import_callback(112 vm: &VM,113 cb: JsonnetImportCallback,114 ctx: *mut c_void,115) {116 vm.replace_import_resolver(CallbackImportResolver {117 cb,118 ctx,119 out: RefCell::new(HashMap::new()),120 });121}122123/// # Safety124///125/// `path` should be a NUL-terminated string126#[unsafe(no_mangle)]127pub unsafe extern "C" fn jsonnet_jpath_add(vm: &VM, path: *const c_char) {128 let cstr = unsafe { CStr::from_ptr(path) };129 let path = PathBuf::from(cstr.to_str().unwrap());130 vm.add_jpath(path);131}bindings/jsonnet/src/interop.rsdiffbeforeafterboth--- 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<ThreadCTX>) {
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<ThreadId> = unsafe { Box::from_raw(id.cast()) };
}
bindings/jsonnet/src/lib.rsdiffbeforeafterboth--- 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,
bindings/jsonnet/src/native.rsdiffbeforeafterboth--- 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();
bindings/jsonnet/src/val_extract.rsdiffbeforeafterboth--- 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,
bindings/jsonnet/src/val_make.rsdiffbeforeafterboth--- 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())))
}
bindings/jsonnet/src/val_modify.rsdiffbeforeafterboth--- 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,
bindings/jsonnet/src/vars_tlas.rsdiffbeforeafterboth--- 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) };