diff --git a/Cargo.lock b/Cargo.lock index 866c199..b4d87bb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -96,23 +96,24 @@ checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "bindgen" -version = "0.63.0" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "cexpr", "clang-sys", + "itertools", "lazy_static", "lazycell", "log", - "peeking_take_while", + "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 1.0.109", + "syn 2.0.38", "which", ] @@ -484,6 +485,15 @@ dependencies = [ "hashbrown", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.9" @@ -606,18 +616,22 @@ version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "percent-encoding" version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +[[package]] +name = "prettyplease" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +dependencies = [ + "proc-macro2", + "syn 2.0.38", +] + [[package]] name = "proc-macro-error" version = "1.0.4" diff --git a/Cargo.toml b/Cargo.toml index 82b96f9..dfc1428 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -59,5 +59,5 @@ which = { version = "4.1", optional = true } globwalk = { version = "0.8", optional = true } tempfile = { version = "3", optional = true } ureq = { version = "2", optional = true } -bindgen = { version = "0.63", optional = true } +bindgen = { version = "0.69.4", optional = true } dep-cmake = { package = "cmake", version = "0.1", optional = true } diff --git a/src/bindgen.rs b/src/bindgen.rs index 05e0e8e..420dbd9 100644 --- a/src/bindgen.rs +++ b/src/bindgen.rs @@ -136,7 +136,7 @@ impl Factory { let builder = bindgen::Builder::default() .use_core() .layout_tests(false) - .rustfmt_bindings(false) + .formatter(bindgen::Formatter::None) .derive_default(true) .clang_arg("-D__bindgen") // Include directories provided by the build system