From 87619c19eebdcd6bc87277888bb29558c9fe9f25 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 6 May 2024 12:54:48 +0200 Subject: [PATCH] chore(core/rust): bump buildgen to 0.62.0 this fixes build on macOS [no changelog] --- core/embed/rust/Cargo.lock | 23 ++++++++++++----------- core/embed/rust/Cargo.toml | 2 +- core/embed/rust/build.rs | 5 ++++- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/core/embed/rust/Cargo.lock b/core/embed/rust/Cargo.lock index c2149e641..de76974f6 100644 --- a/core/embed/rust/Cargo.lock +++ b/core/embed/rust/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bindgen" -version = "0.60.1" +version = "0.62.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6" +checksum = "c6720a8b7b2d39dd533285ed438d458f65b31b5c257e6ac7bb3d7e82844dd722" dependencies = [ "bitflags", "cexpr", @@ -31,6 +31,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", + "syn", ] [[package]] @@ -203,11 +204,11 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "proc-macro2" -version = "1.0.29" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] @@ -296,13 +297,13 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.80" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d010a1623fbd906d51d650a9916aaefc05ffa0e4053ff7fe601167f3e715d194" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] @@ -360,10 +361,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e87a2ed6b42ec5e28cc3b94c09982969e9227600b2e3dcbc1db927a84c06bd69" [[package]] -name = "unicode-xid" -version = "0.2.2" +name = "unicode-ident" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unsize" diff --git a/core/embed/rust/Cargo.toml b/core/embed/rust/Cargo.toml index 21a2f1038..fafd9bf59 100644 --- a/core/embed/rust/Cargo.toml +++ b/core/embed/rust/Cargo.toml @@ -127,7 +127,7 @@ version = "1.1.0" # Build dependencies [build-dependencies.bindgen] -version = "0.60.1" +version = "0.62.0" default_features = false features = ["runtime"] diff --git a/core/embed/rust/build.rs b/core/embed/rust/build.rs index 768241b4d..7277d94e4 100644 --- a/core/embed/rust/build.rs +++ b/core/embed/rust/build.rs @@ -77,7 +77,10 @@ fn generate_qstr_bindings() { bindgen::Builder::default() .header("qstr.h") // Build the Qstr enum as a newtype so we can define method on it. - .default_enum_style(bindgen::EnumVariation::NewType { is_bitfield: false }) + .default_enum_style(bindgen::EnumVariation::NewType { + is_bitfield: false, + is_global: false, + }) // Pass in correct include paths. .clang_args(&[ "-I",