From 69563a45bfad0f7d7cab577695e1fd7d64458b20 Mon Sep 17 00:00:00 2001 From: Jeffrey Charles Date: Fri, 3 Nov 2023 06:40:50 -0700 Subject: [PATCH] Update bindgen to 0.69 (#552) --- Cargo.lock | 4 ++-- crates/quickjs-wasm-sys/Cargo.toml | 2 +- crates/quickjs-wasm-sys/build.rs | 2 +- supply-chain/config.toml | 4 ++++ supply-chain/imports.lock | 31 ------------------------------ 5 files changed, 8 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 016bccb4..487a3968 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -223,9 +223,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.68.1" +version = "0.69.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" +checksum = "042e2e131c066e496ea7880ef6cfeec415a9adc79fc882a65979394f8840bf7c" dependencies = [ "bitflags 2.4.1", "cexpr", diff --git a/crates/quickjs-wasm-sys/Cargo.toml b/crates/quickjs-wasm-sys/Cargo.toml index 9875edb2..d58a012f 100644 --- a/crates/quickjs-wasm-sys/Cargo.toml +++ b/crates/quickjs-wasm-sys/Cargo.toml @@ -11,7 +11,7 @@ categories = ["external-ffi-bindings"] [build-dependencies] cc = "1.0" -bindgen = "0.68.1" +bindgen = "0.69.0" walkdir = "2" anyhow.workspace = true tokio = { version = "1.33", default-features = false, features = ["rt", "macros"] } diff --git a/crates/quickjs-wasm-sys/build.rs b/crates/quickjs-wasm-sys/build.rs index fffb372e..2aaa8f60 100644 --- a/crates/quickjs-wasm-sys/build.rs +++ b/crates/quickjs-wasm-sys/build.rs @@ -239,7 +239,7 @@ async fn main() -> Result<()> { // Generate bindings for quickjs let bindings = bindgen::Builder::default() .header("wrapper.h") - .parse_callbacks(Box::new(bindgen::CargoCallbacks)) + .parse_callbacks(Box::new(bindgen::CargoCallbacks::new())) .clang_args(&["-fvisibility=default", "--target=wasm32-wasi", &sysroot]) .size_t_is_usize(false) .generate()?; diff --git a/supply-chain/config.toml b/supply-chain/config.toml index 0ca5719b..83415853 100644 --- a/supply-chain/config.toml +++ b/supply-chain/config.toml @@ -88,6 +88,10 @@ criteria = "safe-to-deploy" version = "1.3.3" criteria = "safe-to-deploy" +[[exemptions.bindgen]] +version = "0.69.0" +criteria = "safe-to-deploy" + [[exemptions.bitflags]] version = "1.3.2" criteria = "safe-to-deploy" diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock index 6fdc068f..897206b1 100644 --- a/supply-chain/imports.lock +++ b/supply-chain/imports.lock @@ -1828,37 +1828,6 @@ version = "1.1.0" notes = "All code written or reviewed by Josh Stone." aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" -[[audits.mozilla.audits.bindgen]] -who = "Emilio Cobos Álvarez " -criteria = "safe-to-deploy" -version = "0.59.2" -notes = "I'm the primary author and maintainer of the crate." -aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" - -[[audits.mozilla.audits.bindgen]] -who = "Emilio Cobos Álvarez " -criteria = "safe-to-deploy" -delta = "0.59.2 -> 0.63.0" -aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" - -[[audits.mozilla.audits.bindgen]] -who = "Mike Hommey " -criteria = "safe-to-deploy" -delta = "0.63.0 -> 0.64.0" -aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" - -[[audits.mozilla.audits.bindgen]] -who = "Mike Hommey " -criteria = "safe-to-deploy" -delta = "0.64.0 -> 0.66.1" -aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" - -[[audits.mozilla.audits.bindgen]] -who = "Mike Hommey " -criteria = "safe-to-deploy" -delta = "0.66.1 -> 0.68.1" -aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" - [[audits.mozilla.audits.bitflags]] who = "Alex Franchuk " criteria = "safe-to-deploy"