Fix clippy issues

mozilla · Jul 15, 2019 · 987f3c4 · 987f3c4
1 parent 0d89862
commit 987f3c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/u2fprotocol.rs b/src/u2fprotocol.rs
@@ -133,10 +133,10 @@ where
 
     let vendor = dev
         .get_property("Manufacturer")
-        .unwrap_or(String::from("Unknown Vendor"));
+        .unwrap_or_else(|_| String::from("Unknown Vendor"));
     let product = dev
         .get_property("Product")
-        .unwrap_or(String::from("Unknown Device"));
+        .unwrap_or_else(|_| String::from("Unknown Device"));
 
     dev.set_device_info(U2FDeviceInfo {
         vendor_name: vendor.as_bytes().to_vec(),
@@ -322,7 +322,7 @@ mod tests {
             }
 
             fn get_property(&self, prop_name: &str) -> io::Result<String> {
-                Ok(String::from(format!("{} not implemented", prop_name)))
+                Ok(format!("{} not implemented", prop_name))
             }
             fn get_device_info(&self) -> U2FDeviceInfo {
                 self.dev_info.clone().unwrap()

diff --git a/src/u2ftypes.rs b/src/u2ftypes.rs
@@ -171,7 +171,7 @@ impl U2FHIDInitResp {
 
         let rsp = U2FHIDInitResp {
             cid: [
-                data[INIT_NONCE_SIZE + 0],
+                data[INIT_NONCE_SIZE],
                 data[INIT_NONCE_SIZE + 1],
                 data[INIT_NONCE_SIZE + 2],
                 data[INIT_NONCE_SIZE + 3],