Merge branch 'rust-1.51.0'

Author: benma

.ci/run-container-ci

@@ -25,7 +25,7 @@
 set -e
 set -x
 
-CONTAINER=shiftcrypto/firmware_v2:19
+CONTAINER=shiftcrypto/firmware_v2:20
 
 if [ "$1" == "pull" ] ; then
 	docker pull "$CONTAINER"

src/CMakeLists.txt

@@ -474,6 +474,9 @@ if(NOT CMAKE_CROSSCOMPILING)
             -A clippy::type_complexity
             -A clippy::collapsible-if
             -A clippy::len_without_is_empty
+            -A clippy::result_unit_err
+            -A clippy::upper_case_acronyms
+            -A clippy::manual_range_contains
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/rust/
     )
   add_dependencies(rust-clippy rust-bindgen)

src/rust/bitbox02-rust-c/src/util.rs

@@ -39,7 +39,12 @@ pub extern "C" fn rust_util_validate_name(cstr: CStr, max_len: size_t) -> bool {
 pub extern "C" fn rust_util_uint8_to_hex(buf: Bytes, mut out: CStrMut) {
     let min_len = buf.len * 2;
     out.write(min_len, |out| {
-        hex::encode_to_slice(&buf, out).unwrap();
+        // Avoid .unwrap() here until the following compiler regression is fixed:
+        // https://github.com/rust-lang/rust/issues/83925
+        match hex::encode_to_slice(&buf, out) {
+            Ok(()) => {}
+            Err(err) => panic!("{:?}", err),
+        }
     });
 }
 

src/rust/bitbox02-rust/src/bb02_async.rs

@@ -48,8 +48,8 @@ impl<O> core::future::Future for AsyncOption<'_, O> {
 
 /// Waits for an option to contain a value and returns that value, leaving `None` in its place.
 /// E.g. `assert_eq!(option(&Some(42)).await, 42)`.
-pub fn option<'a, O>(option: &'a RefCell<Option<O>>) -> AsyncOption<'a, O> {
-    AsyncOption(&option)
+pub fn option<O>(option: &RefCell<Option<O>>) -> AsyncOption<O> {
+    AsyncOption(option)
 }
 
 /// Polls a future until the result is available.

src/rust/bitbox02-rust/src/hww/api/ethereum/amount.rs

@@ -56,7 +56,7 @@ mod tests {
             decimals: usize,
             unit: &'a str,
             expected_result: &'a str,
-        };
+        }
 
         let tests = vec![
             Test {

src/rust/bitbox02-rust/src/workflow/mnemonic.rs

@@ -207,7 +207,7 @@ pub async fn get() -> Result<zeroize::Zeroizing<String>, ()> {
                 enum GetWordError {
                     Cancel,
                     EditPrevious,
-                };
+                }
 
                 let cancel_choice = if word_idx == 0 {
                     // In the first word, there is no previous word, so we go straight to the cancel

src/rust/bitbox02/src/app_eth.rs

@@ -30,7 +30,7 @@ pub fn params_get(coin: bitbox02_sys::ETHCoin) -> Option<Params> {
                 let len = crate::util::strlen_ptr(params.unit);
                 core::slice::from_raw_parts(params.unit, len as _)
             };
-            core::str::from_utf8(&s[..]).unwrap()
+            core::str::from_utf8(s).unwrap()
         },
     })
 }
@@ -55,14 +55,14 @@ pub fn erc20_params_get(
                 let len = crate::util::strlen_ptr(params.unit);
                 core::slice::from_raw_parts(params.unit, len as _)
             };
-            core::str::from_utf8(&s[..]).unwrap()
+            core::str::from_utf8(s).unwrap()
         },
         name: {
             let s = unsafe {
                 let len = crate::util::strlen_ptr(params.name);
                 core::slice::from_raw_parts(params.name, len as _)
             };
-            core::str::from_utf8(&s[..]).unwrap()
+            core::str::from_utf8(s).unwrap()
         },
         contract_address: params.contract_address,
         decimals: params.decimals,

src/rust/bitbox02/src/keystore.rs

@@ -100,7 +100,7 @@ pub fn get_bip39_word(idx: u16) -> Result<zeroize::Zeroizing<String>, ()> {
             let word = unsafe {
                 let len = crate::util::strlen_ptr(word_ptr);
                 let slice = core::slice::from_raw_parts(word_ptr, len as _);
-                zeroize::Zeroizing::new(core::str::from_utf8(&slice[..]).unwrap().into())
+                zeroize::Zeroizing::new(core::str::from_utf8(slice).unwrap().into())
             };
             unsafe {
                 bitbox02_sys::wally_free_string(word_ptr as _);

src/rust/bitbox02/src/lib.rs

@@ -180,7 +180,7 @@ pub enum Color {
 }
 
 pub fn leds_turn_big_led(led: i32, color: Option<Color>) {
-    if led < 0 || led > 2 {
+    if !(0..=2).contains(&led) {
         panic!("Invalid led");
     }
     let c = match color {

src/rust/bitbox02/src/util.rs

@@ -76,7 +76,7 @@ macro_rules! str_to_cstr_force {
     ($input:expr, $len:expr) => {
         match $crate::str_to_cstr!($input, $len) {
             Ok(buf) => buf,
-            Err(msg) => panic!(msg),
+            Err(msg) => panic!("{}", msg),
         }
     };
 }