Cleanups (Ralim#16)

* Update deps

* Update cargo vet

* Increase optimisation in release mode, drop .idea folder

* updating errors

* drop this_error

* update deps

bestool/.gitignore

@@ -0,0 +1 @@
+.idea/

bestool/Cargo.toml

@@ -8,7 +8,11 @@ edition = "2021"
 [dependencies]
 serialport = "4.2.2"
 clap = { version = "4.4.8", features = ["derive"] }
-thiserror = "1.0.50"
 tracing = "0.1.40"
 tracing-subscriber = "0.3.18"
 crc = "3.0.1"
+
+
+[profile.release]
+lto = "fat"
+build-override.codegen-units = 1

bestool/src/beslink/errors.rs

@@ -1,25 +1,25 @@
-use thiserror::Error;
-
-#[derive(Error, Debug)]
+#[derive(Debug)]
 pub enum BESLinkError {
-    #[error("IOError")]
-    IOError(#[from] std::io::Error),
-    #[error("SerialPortError")]
-    SerialPortError(#[from] serialport::Error),
-    #[error("BadChecksumError Bad checksum; got {got:?} wanted {wanted:?} : {failed_packet:X?}")]
+    IOError {
+        e: std::io::Error,
+    },
     BadChecksumError {
         failed_packet: Vec<u8>,
         got: u8,
         wanted: u8,
     },
-    #[error("BadResponseCode Bad result; got {got:?} wanted {wanted:?} : {failed_packet:X?}")]
     BadResponseCode {
         failed_packet: Vec<u8>,
         got: u8,
         wanted: u8,
     },
-    #[error("Invalid Argument")]
     InvalidArgs,
     // #[error("Communications timed out")]
     // Timeout,
 }
+
+impl From<std::io::Error> for BESLinkError {
+    fn from(value: std::io::Error) -> Self {
+        Self::IOError { e: value }
+    }
+}

bestool/src/beslink/sync.rs

@@ -24,13 +24,10 @@ pub fn sync(
                 }
             }
             Err(e) => match e {
-                BESLinkError::IOError(_) => return Err(e),
-                BESLinkError::SerialPortError(_) => return Err(e),
                 BESLinkError::BadChecksumError { .. } => {
                     warn!("Ignoring bad checksum; you might not be in programmer mode.")
                 }
-                BESLinkError::BadResponseCode { .. } => return Err(e),
-                BESLinkError::InvalidArgs => return Err(e),
+                _ => return Err(e),
             },
         }
     }

bestool/supply-chain/audits.toml

@@ -11,6 +11,11 @@ who = "Ben V. Brown <[email protected]>"
 criteria = "safe-to-deploy"
 version = "0.4.0"
 
+[[audits.log]]
+who = "Ben V. Brown <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.4.20 -> 0.4.21"
+
 [[audits.pkg-config]]
 who = "Ben V. Brown <[email protected]>"
 criteria = "safe-to-deploy"

bestool/supply-chain/imports.lock

@@ -9,8 +9,8 @@ user-login = "BurntSushi"
 user-name = "Andrew Gallant"
 
 [[publisher.anstream]]
-version = "0.6.11"
-when = "2024-01-18"
+version = "0.6.13"
+when = "2024-02-27"
 user-id = 6743
 user-login = "epage"
 user-name = "Ed Page"
@@ -156,8 +156,8 @@ user-login = "mbrubeck"
 user-name = "Matt Brubeck"
 
 [[publisher.syn]]
-version = "2.0.49"
-when = "2024-02-16"
+version = "2.0.52"
+when = "2024-02-28"
 user-id = 3618
 user-login = "dtolnay"
 user-name = "David Tolnay"
@@ -177,8 +177,8 @@ user-login = "dtolnay"
 user-name = "David Tolnay"
 
 [[publisher.thread_local]]
-version = "1.1.7"
-when = "2023-02-12"
+version = "1.1.8"
+when = "2024-02-20"
 user-id = 2915
 user-login = "Amanieu"
 user-name = "Amanieu d'Antras"
@@ -205,57 +205,57 @@ user-login = "kennykerr"
 user-name = "Kenny Kerr"
 
 [[publisher.windows-targets]]
-version = "0.52.0"
-when = "2023-11-15"
+version = "0.52.4"
+when = "2024-02-28"
 user-id = 64539
 user-login = "kennykerr"
 user-name = "Kenny Kerr"
 
 [[publisher.windows_aarch64_gnullvm]]
-version = "0.52.0"
-when = "2023-11-15"
+version = "0.52.4"
+when = "2024-02-28"
 user-id = 64539
 user-login = "kennykerr"
 user-name = "Kenny Kerr"
 
 [[publisher.windows_aarch64_msvc]]
-version = "0.52.0"
-when = "2023-11-15"
+version = "0.52.4"
+when = "2024-02-28"
 user-id = 64539
 user-login = "kennykerr"
 user-name = "Kenny Kerr"
 
 [[publisher.windows_i686_gnu]]
-version = "0.52.0"
-when = "2023-11-15"
+version = "0.52.4"
+when = "2024-02-28"
 user-id = 64539
 user-login = "kennykerr"
 user-name = "Kenny Kerr"
 
 [[publisher.windows_i686_msvc]]
-version = "0.52.0"
-when = "2023-11-15"
+version = "0.52.4"
+when = "2024-02-28"
 user-id = 64539
 user-login = "kennykerr"
 user-name = "Kenny Kerr"
 
 [[publisher.windows_x86_64_gnu]]
-version = "0.52.0"
-when = "2023-11-15"
+version = "0.52.4"
+when = "2024-02-28"
 user-id = 64539
 user-login = "kennykerr"
 user-name = "Kenny Kerr"
 
 [[publisher.windows_x86_64_gnullvm]]
-version = "0.52.0"
-when = "2023-11-15"
+version = "0.52.4"
+when = "2024-02-28"
 user-id = 64539
 user-login = "kennykerr"
 user-name = "Kenny Kerr"
 
 [[publisher.windows_x86_64_msvc]]
-version = "0.52.0"
-when = "2023-11-15"
+version = "0.52.4"
+when = "2024-02-28"
 user-id = 64539
 user-login = "kennykerr"
 user-name = "Kenny Kerr"