Address all occurrences of statement expression attributes

src/ctap/mod.rs

@@ -1173,11 +1173,9 @@ impl CtapState {
             String::from(FIDO2_1_VERSION_STRING),
         ];
         #[cfg(feature = "with_ctap1")]
-        {
         if !has_always_uv {
             versions.insert(0, String::from(U2F_VERSION_STRING))
         }
-        }
         let mut options = vec![];
         if ENTERPRISE_ATTESTATION_MODE.is_some() {
             options.push((String::from("ep"), storage::enterprise_attestation(env)?));
@@ -1246,6 +1244,8 @@ impl CtapState {
         self.client_pin.reset(env.rng());
         #[cfg(feature = "with_ctap1")]
         {
+            // We create a block statement to wrap this assignment expression, because attributes
+            // (like #[cfg]) are not supported on expressions.
             self.u2f_up_state = U2fUserPresenceState::new(U2F_UP_PROMPT_TIMEOUT, TOUCH_TIMEOUT);
         }
         Ok(ResponseData::AuthenticatorReset)

src/main.rs

@@ -82,8 +82,8 @@ fn main() {
         });
         #[cfg(feature = "with_ctap1")]
         let mut buttons = buttons_callback.init().flex_unwrap();
-        #[cfg(feature = "with_ctap1")]
         // At the moment, all buttons are accepted. You can customize your setup here.
+        #[cfg(feature = "with_ctap1")]
         for mut button in &mut buttons {
             button.enable().flex_unwrap();
         }
@@ -168,7 +168,6 @@ fn main() {
             #[cfg(not(feature = "with_ctap1"))]
             switch_off_leds();
             #[cfg(feature = "with_ctap1")]
-            {
             if ctap.state().u2f_needs_user_presence(now) {
                 // Flash the LEDs with an almost regular pattern. The inaccuracy comes from
                 // delay caused by processing and sending of packets.
@@ -178,7 +177,6 @@ fn main() {
             }
         }
     }
-    }
 }
 
 #[cfg(feature = "debug_ctap")]

third_party/libtock-drivers/src/usb_ctap_hid.rs

@@ -188,11 +188,9 @@ pub fn recv_with_timeout(
     let result = recv_with_timeout_detail(buf, timeout_delay);
 
     #[cfg(feature = "verbose_usb")]
-    {
     if let Some(SendOrRecvStatus::Received) = result {
         writeln!(Console::new(), "Received packet = {:02x?}", buf as &[u8]).unwrap();
     }
-    }
 
     result
 }
@@ -216,11 +214,9 @@ pub fn send_or_recv_with_timeout(
     let result = send_or_recv_with_timeout_detail(buf, timeout_delay);
 
     #[cfg(feature = "verbose_usb")]
-    {
     if let Some(SendOrRecvStatus::Received) = result {
         writeln!(Console::new(), "Received packet = {:02x?}", buf as &[u8]).unwrap();
     }
-    }
 
     result
 }