From 1a8211c392ea33a6192e4556b99762d704991cab Mon Sep 17 00:00:00 2001 From: Pierre Tondereau Date: Fri, 20 Oct 2023 14:44:47 +0200 Subject: [PATCH] chore: Bump Bindgen to 0.68.1 (#271) --- Cargo.toml | 12 ++--- docsrs_bindings.rs | 125 ++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 118 insertions(+), 19 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 385a5cc..f2af962 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,12 +24,15 @@ skeptic = "0.13" [build-dependencies] anyhow = "1" -bindgen = "0.65.1" +bindgen = "0.68.1" cc = "1.0" skeptic = "0.13" [target.'cfg(windows)'.build-dependencies] -ureq = { version = "2.4", features = ["native-tls", "gzip"], default-features = false } +ureq = { version = "2.4", features = [ + "native-tls", + "gzip", +], default-features = false } native-tls = "0.2" zip = "0.6" @@ -38,10 +41,7 @@ closure = [] embed = [] [workspace] -members = [ - "crates/macros", - "crates/cli" -] +members = ["crates/macros", "crates/cli"] [package.metadata.docs.rs] rustdoc-args = ["--cfg", "docs"] diff --git a/docsrs_bindings.rs b/docsrs_bindings.rs index 40d153a..2d22490 100644 --- a/docsrs_bindings.rs +++ b/docsrs_bindings.rs @@ -1,4 +1,4 @@ -/* automatically generated by rust-bindgen 0.65.1 */ +/* automatically generated by rust-bindgen 0.68.1 */ pub const ZEND_DEBUG: u32 = 1; pub const _ZEND_TYPE_NAME_BIT: u32 = 16777216; @@ -109,11 +109,65 @@ pub const CONST_CS: u32 = 0; pub const CONST_PERSISTENT: u32 = 1; pub const CONST_NO_FILE_CACHE: u32 = 2; pub const CONST_DEPRECATED: u32 = 4; +pub type __int64_t = ::std::os::raw::c_longlong; +pub type __darwin_off_t = __int64_t; +pub type fpos_t = __darwin_off_t; #[repr(C)] #[derive(Debug, Copy, Clone)] -pub struct __sigset_t { - pub __val: [::std::os::raw::c_ulong; 16usize], +pub struct __sbuf { + pub _base: *mut ::std::os::raw::c_uchar, + pub _size: ::std::os::raw::c_int, } +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct __sFILEX { + _unused: [u8; 0], +} +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct __sFILE { + pub _p: *mut ::std::os::raw::c_uchar, + pub _r: ::std::os::raw::c_int, + pub _w: ::std::os::raw::c_int, + pub _flags: ::std::os::raw::c_short, + pub _file: ::std::os::raw::c_short, + pub _bf: __sbuf, + pub _lbfsize: ::std::os::raw::c_int, + pub _cookie: *mut ::std::os::raw::c_void, + pub _close: ::std::option::Option< + unsafe extern "C" fn(arg1: *mut ::std::os::raw::c_void) -> ::std::os::raw::c_int, + >, + pub _read: ::std::option::Option< + unsafe extern "C" fn( + arg1: *mut ::std::os::raw::c_void, + arg2: *mut ::std::os::raw::c_char, + arg3: ::std::os::raw::c_int, + ) -> ::std::os::raw::c_int, + >, + pub _seek: ::std::option::Option< + unsafe extern "C" fn( + arg1: *mut ::std::os::raw::c_void, + arg2: fpos_t, + arg3: ::std::os::raw::c_int, + ) -> fpos_t, + >, + pub _write: ::std::option::Option< + unsafe extern "C" fn( + arg1: *mut ::std::os::raw::c_void, + arg2: *const ::std::os::raw::c_char, + arg3: ::std::os::raw::c_int, + ) -> ::std::os::raw::c_int, + >, + pub _ub: __sbuf, + pub _extra: *mut __sFILEX, + pub _ur: ::std::os::raw::c_int, + pub _ubuf: [::std::os::raw::c_uchar; 3usize], + pub _nbuf: [::std::os::raw::c_uchar; 1usize], + pub _lb: __sbuf, + pub _blksize: ::std::os::raw::c_int, + pub _offset: fpos_t, +} +pub type FILE = __sFILE; pub type zend_long = i64; pub type zend_ulong = u64; pub type zend_uchar = ::std::os::raw::c_uchar; @@ -487,6 +541,52 @@ pub struct _zend_class_arrayaccess_funcs { pub zf_offsetunset: *mut zend_function, } pub type zend_class_arrayaccess_funcs = _zend_class_arrayaccess_funcs; +pub type zend_stream_fsizer_t = + ::std::option::Option usize>; +pub type zend_stream_reader_t = ::std::option::Option< + unsafe extern "C" fn( + handle: *mut ::std::os::raw::c_void, + buf: *mut ::std::os::raw::c_char, + len: usize, + ) -> isize, +>; +pub type zend_stream_closer_t = + ::std::option::Option; +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct _zend_stream { + pub handle: *mut ::std::os::raw::c_void, + pub isatty: ::std::os::raw::c_int, + pub reader: zend_stream_reader_t, + pub fsizer: zend_stream_fsizer_t, + pub closer: zend_stream_closer_t, +} +pub type zend_stream = _zend_stream; +#[repr(C)] +#[derive(Copy, Clone)] +pub struct _zend_file_handle { + pub handle: _zend_file_handle__bindgen_ty_1, + pub filename: *mut zend_string, + pub opened_path: *mut zend_string, + pub type_: zend_uchar, + pub primary_script: bool, + pub in_list: bool, + pub buf: *mut ::std::os::raw::c_char, + pub len: usize, +} +#[repr(C)] +#[derive(Copy, Clone)] +pub union _zend_file_handle__bindgen_ty_1 { + pub fp: *mut FILE, + pub stream: zend_stream, +} +pub type zend_file_handle = _zend_file_handle; +extern "C" { + pub fn zend_stream_init_filename( + handle: *mut zend_file_handle, + filename: *const ::std::os::raw::c_char, + ); +} #[repr(C)] #[derive(Debug, Copy, Clone)] pub struct _zend_serialize_data { @@ -1065,15 +1165,7 @@ pub struct _zend_execute_data { pub run_time_cache: *mut *mut ::std::os::raw::c_void, pub extra_named_params: *mut zend_array, } -pub type __jmp_buf = [::std::os::raw::c_long; 8usize]; -#[repr(C)] -#[derive(Debug, Copy, Clone)] -pub struct __jmp_buf_tag { - pub __jmpbuf: __jmp_buf, - pub __mask_was_saved: ::std::os::raw::c_int, - pub __saved_mask: __sigset_t, -} -pub type jmp_buf = [__jmp_buf_tag; 1usize]; +pub type sigjmp_buf = [::std::os::raw::c_int; 49usize]; pub type zend_executor_globals = _zend_executor_globals; extern "C" { pub static mut executor_globals: zend_executor_globals; @@ -1143,7 +1235,7 @@ pub struct _zend_executor_globals { pub symtable_cache_ptr: *mut *mut zend_array, pub symbol_table: zend_array, pub included_files: HashTable, - pub bailout: *mut jmp_buf, + pub bailout: *mut sigjmp_buf, pub error_reporting: ::std::os::raw::c_int, pub exit_status: ::std::os::raw::c_int, pub function_table: *mut HashTable, @@ -1279,6 +1371,13 @@ extern "C" { flags: u32, ) -> *mut zend_class_entry; } +extern "C" { + pub fn zend_eval_string( + str_: *const ::std::os::raw::c_char, + retval_ptr: *mut zval, + string_name: *const ::std::os::raw::c_char, + ) -> zend_result; +} #[repr(C)] #[derive(Debug, Copy, Clone)] pub struct _zend_vm_stack {