fix : bump bindgen to handle recent clang breaking change

rust-lang/rust-bindgen#2312
Wardenfar · Aug 16, 2024 · bf170ea · bf170ea
1 parent 9a6df79
commit bf170ea
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/libvex-rs/src/lib.rs b/libvex-rs/src/lib.rs
@@ -22,7 +22,7 @@ pub mod ppc64;
 pub mod s390x;
 pub mod x86;
 
-unsafe extern "C" fn failure_exit() {
+unsafe extern "C" fn failure_exit() -> ! {
     panic!("LibVEX encountered a critical error.")
 }
 

diff --git a/libvex-sys/Cargo.toml b/libvex-sys/Cargo.toml
@@ -27,7 +27,7 @@ libc = "0.2.85"
 
 [build-dependencies]
 fs_extra = "1.2"
-bindgen = "0.57"
+bindgen = "0.69"
 
 [features]
 default = []

diff --git a/libvex-sys/build.rs b/libvex-sys/build.rs
@@ -134,14 +134,14 @@ fn main() -> Result<()> {
         // Generate bindings
         let bindings = bindgen::Builder::default()
             .header("wrapper.h")
-            .blacklist_type("_IRStmt__bindgen_ty_1__bindgen_ty_1")
-            .rustified_enum("*")
+            .blocklist_type("_IRStmt__bindgen_ty_1__bindgen_ty_1")
+            .rustified_enum(".*")
             .clang_args(vex_headers()?
                         .into_iter()
                         .map(|dir| format!("-I{}", dir))
             )
             .generate()
-            .map_err(|()| "Unable to generate bindings")?;
+            .map_err(|_| "Unable to generate bindings")?;
         bindings.write_to_file(out_dir.join("bindings.rs"))?;
     }
 

diff --git a/libvex-sys/src/lib.rs b/libvex-sys/src/lib.rs
@@ -36,7 +36,7 @@ mod test {
 
     use crate::*;
 
-    unsafe extern "C" fn failure_exit() {
+    unsafe extern "C" fn failure_exit() -> ! {
         panic!("LibVEX encountered a critical error.")
     }