rust: update to toolchain 1.85.1

Saves ~4.5kB of binary space.

Code changes are due to new clippy warnings.

Author: benma

.containerversion

@@ -1 +1 @@
-45
+46

Dockerfile

@@ -150,7 +150,7 @@ RUN rustup target add thumbv7em-none-eabi
 RUN rustup component add rustfmt
 RUN rustup component add clippy
 RUN rustup component add rust-src
-RUN CARGO_HOME=/opt/cargo cargo install cbindgen --version 0.27.0 --locked
+RUN CARGO_HOME=/opt/cargo cargo install cbindgen --version 0.28.0 --locked
 RUN CARGO_HOME=/opt/cargo cargo install bindgen-cli --version 0.71.1 --locked
 
 # Until cargo vendor supports vendoring dependencies of the rust std libs we

src/rust/bitbox02-rust/src/hww/api/cardano/address.rs

@@ -326,7 +326,7 @@ fn address_header(params: &params::Params, script_config: &Config) -> u8 {
         Config::PkhSkh(_) => 0,
     };
 
-    address_tag << 4 | params.network_id
+    (address_tag << 4) | params.network_id
 }
 
 /// Encode the given address using bech32, validating that the keypaths are valid. If

src/rust/bitbox02-rust/src/hww/api/cardano/keypath.rs

@@ -62,7 +62,7 @@ pub fn validate_address_shelley_payment(
     bip44_account: Option<u32>,
 ) -> Result<(), Error> {
     if let &[BIP44_PURPOSE_SHELLEY, BIP44_COIN, account, role, address] = keypath {
-        if !bip44_account.map_or(true, |a| a == account) {
+        if bip44_account.is_some_and(|a| a != account) {
             return Err(Error);
         }
         check_account(account)?;
@@ -88,7 +88,7 @@ pub fn validate_address_shelley_stake(
     if let &[BIP44_PURPOSE_SHELLEY, BIP44_COIN, account, BIP44_STAKE_ROLE, BIP44_STAKE_ADDRESS] =
         keypath
     {
-        if !bip44_account.map_or(true, |a| a == account) {
+        if bip44_account.is_some_and(|a| a != account) {
             return Err(Error);
         }
         check_account(account)?;

src/rust/bitbox02-rust/src/hww/api/cardano/sign_transaction/cbor.rs

@@ -63,7 +63,7 @@ pub fn encode_withdrawal_address(
     let pubkey_hash = pubkey_hash_at_keypath(keypath)?;
     let mut encoded: Vec<u8> = Vec::with_capacity(1 + ADDRESS_HASH_SIZE);
     let address_tag = 0b1110; // reward address using a stake keyhash.
-    let header = address_tag << 4 | params.network_id;
+    let header = (address_tag << 4) | params.network_id;
     encoded.push(header);
     encoded.extend_from_slice(&pubkey_hash);
     Ok(encoded)

src/rust/erc20_params/src/lib.rs

@@ -14,7 +14,7 @@
 
 #![no_std]
 
-#[repr(packed)]
+#[repr(Rust, packed)]
 struct P {
     // Null-terminated strings, saving a few bytes of binary space per token stored versus using
     // `&str`, which also stores the size of the string. We could further optimize for space by

src/rust/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.84.1"
+channel = "1.85.1"