Fix typos in error variants names, resolve clippy warnings (#782)

* Fix typos in error variant names

* Resolve clippy errors

* Update `CHANGELOG.md`

Author: jessebraham

CHANGELOG.md

@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Update the app image SHA in the correct location for padded images (#715)
 - Fix `-s` argument collision (#731)
 - `address` and `size` in `erase-region` have to be multiples of 4096 (#771)
+- Fixed typos in error variant names (#782)
 
 ### Removed
 

espflash/src/error.rs

@@ -40,9 +40,9 @@ pub enum Error {
     )]
     ChipDetectError(u32),
 
-    #[error("Chip provided ({0}) with `-c/--chip` does not match the detected chip ({1})")]
+    #[error("Chip provided with `-c/--chip` ({0}) does not match the detected chip ({1})")]
     #[diagnostic(
-        code(espflash::chip_missmatch),
+        code(espflash::chip_mismatch),
         help("Ensure that the correct chip is selected, or remove the `-c/--chip` option to autodetect the chip")
     )]
     ChipMismatch(String, String),
@@ -59,8 +59,8 @@ pub enum Error {
     CorruptData(usize, usize),
 
     #[error("MD5 digest missmatch: expected {0:2x?}, received: {1:2x?}")]
-    #[diagnostic(code(espflash::read_flash::digest_missmatch))]
-    DigestMissmatch(Vec<u8>, Vec<u8>),
+    #[diagnostic(code(espflash::read_flash::digest_mismatch))]
+    DigestMismatch(Vec<u8>, Vec<u8>),
 
     #[error("Supplied ELF image can not be run from RAM, as it includes segments mapped to ROM addresses")]
     #[diagnostic(
@@ -89,7 +89,7 @@ pub enum Error {
 
     #[error("Incorrect response from the sutb/ROM loader")]
     #[diagnostic(code(espflash::read_flash::incorrect_response))]
-    IncorrectReposnse,
+    IncorrectResponse,
 
     #[error("The provided bootloader binary is invalid")]
     InvalidBootloader,

espflash/src/flasher/mod.rs

@@ -906,7 +906,7 @@ impl Flasher {
         self.connection
             .write_reg(spi_registers.usr(), flags, None)?;
         self.connection
-            .write_reg(spi_registers.usr2(), 7 << 28 | command as u32, None)?;
+            .write_reg(spi_registers.usr2(), (7 << 28) | command as u32, None)?;
 
         if let (Some(mosi_data_length), Some(miso_data_length)) =
             (spi_registers.mosi_length(), spi_registers.miso_length())
@@ -928,7 +928,7 @@ impl Flasher {
             let miso_mask = if read_bits == 0 { 0 } else { read_bits - 1 };
             self.connection.write_reg(
                 spi_registers.usr1(),
-                miso_mask << 8 | mosi_mask << 17,
+                (miso_mask << 8) | (mosi_mask << 17),
                 None,
             )?;
         }
@@ -1250,7 +1250,7 @@ impl Flasher {
             let chunk: Vec<u8> = if let Some(response) = response {
                 response.value.try_into().unwrap()
             } else {
-                return Err(Error::IncorrectReposnse);
+                return Err(Error::IncorrectResponse);
             };
 
             data.extend_from_slice(&chunk);
@@ -1270,7 +1270,7 @@ impl Flasher {
         let digest: Vec<u8> = if let Some(response) = response {
             response.value.try_into().unwrap()
         } else {
-            return Err(Error::IncorrectReposnse);
+            return Err(Error::IncorrectResponse);
         };
 
         if digest.len() != 16 {
@@ -1282,7 +1282,7 @@ impl Flasher {
         let checksum_md5 = md5_hasher.finalize();
 
         if digest != checksum_md5.as_slice() {
-            return Err(Error::DigestMissmatch(
+            return Err(Error::DigestMismatch(
                 digest,
                 checksum_md5.as_slice().to_vec(),
             ));

espflash/src/targets/esp32c2.rs

@@ -59,12 +59,12 @@ impl Target for Esp32c2 {
 
     #[cfg(feature = "serialport")]
     fn major_chip_version(&self, connection: &mut Connection) -> Result<u32, Error> {
-        Ok(self.read_efuse(connection, 17)? >> 20 & 0x3)
+        Ok((self.read_efuse(connection, 17)? >> 20) & 0x3)
     }
 
     #[cfg(feature = "serialport")]
     fn minor_chip_version(&self, connection: &mut Connection) -> Result<u32, Error> {
-        Ok(self.read_efuse(connection, 17)? >> 16 & 0xf)
+        Ok((self.read_efuse(connection, 17)? >> 16) & 0xf)
     }
 
     #[cfg(feature = "serialport")]

espflash/src/targets/esp32c3.rs

@@ -59,13 +59,13 @@ impl Target for Esp32c3 {
 
     #[cfg(feature = "serialport")]
     fn major_chip_version(&self, connection: &mut Connection) -> Result<u32, Error> {
-        Ok(self.read_efuse(connection, 22)? >> 24 & 0x3)
+        Ok((self.read_efuse(connection, 22)? >> 24) & 0x3)
     }
 
     #[cfg(feature = "serialport")]
     fn minor_chip_version(&self, connection: &mut Connection) -> Result<u32, Error> {
-        let hi = self.read_efuse(connection, 22)? >> 23 & 0x1;
-        let lo = self.read_efuse(connection, 20)? >> 18 & 0x7;
+        let hi = (self.read_efuse(connection, 22)? >> 23) & 0x1;
+        let lo = (self.read_efuse(connection, 20)? >> 18) & 0x7;
 
         Ok((hi << 3) + lo)
     }

espflash/src/targets/esp32p4.rs

@@ -53,7 +53,7 @@ impl Target for Esp32p4 {
 
     #[cfg(feature = "serialport")]
     fn major_chip_version(&self, connection: &mut Connection) -> Result<u32, Error> {
-        Ok(self.read_efuse(connection, 19)? >> 4 & 0x03)
+        Ok((self.read_efuse(connection, 19)? >> 4) & 0x03)
     }
 
     #[cfg(feature = "serialport")]

espflash/src/targets/esp32s2.rs

@@ -119,13 +119,13 @@ impl Target for Esp32s2 {
 
     #[cfg(feature = "serialport")]
     fn major_chip_version(&self, connection: &mut Connection) -> Result<u32, Error> {
-        Ok(self.read_efuse(connection, 20)? >> 18 & 0x3)
+        Ok((self.read_efuse(connection, 20)? >> 18) & 0x3)
     }
 
     #[cfg(feature = "serialport")]
     fn minor_chip_version(&self, connection: &mut Connection) -> Result<u32, Error> {
-        let hi = self.read_efuse(connection, 20)? >> 20 & 0x1;
-        let lo = self.read_efuse(connection, 21)? >> 4 & 0x7;
+        let hi = (self.read_efuse(connection, 20)? >> 20) & 0x1;
+        let lo = (self.read_efuse(connection, 21)? >> 4) & 0x7;
 
         Ok((hi << 3) + lo)
     }

espflash/src/targets/esp32s3.rs

@@ -39,7 +39,7 @@ impl Esp32s3 {
     #[cfg(feature = "serialport")]
     /// Return the minor BLK version based on eFuses
     fn blk_version_minor(&self, connection: &mut Connection) -> Result<u32, Error> {
-        Ok(self.read_efuse(connection, 20)? >> 24 & 0x7)
+        Ok((self.read_efuse(connection, 20)? >> 24) & 0x7)
     }
 
     /// Check if the magic value contains the specified value
@@ -66,7 +66,7 @@ impl Target for Esp32s3 {
 
     #[cfg(feature = "serialport")]
     fn major_chip_version(&self, connection: &mut Connection) -> Result<u32, Error> {
-        let major = self.read_efuse(connection, 22)? >> 24 & 0x3;
+        let major = (self.read_efuse(connection, 22)? >> 24) & 0x3;
 
         // Workaround: The major version field was allocated to other purposes when
         // block version is v1.1. Luckily only chip v0.0 have this kind of block version
@@ -83,8 +83,8 @@ impl Target for Esp32s3 {
 
     #[cfg(feature = "serialport")]
     fn minor_chip_version(&self, connection: &mut Connection) -> Result<u32, Error> {
-        let hi = self.read_efuse(connection, 22)? >> 23 & 0x1;
-        let lo = self.read_efuse(connection, 20)? >> 18 & 0x7;
+        let hi = (self.read_efuse(connection, 22)? >> 23) & 0x1;
+        let lo = (self.read_efuse(connection, 20)? >> 18) & 0x7;
 
         Ok((hi << 3) + lo)
     }