bumb dependencies

Author: icewind1991

cargo-espflash/Cargo.toml

@@ -27,11 +27,11 @@ categories = [
 miette = { version = "3", features = ["fancy"] }
 cargo_metadata = "0.14"
 cargo_toml = "0.10"
-clap = "2.33"
+clap = "2"
 crossterm = "0.21"
 espflash = { version = "1", path = "../espflash" }
 guess_host_triple = "0.1"
-serde = { version = "1.0", features = ["derive"] }
+serde = { version = "1", features = ["derive"] }
 serial = "0.4"
 toml = "0.5"
 thiserror = "1"

espflash/Cargo.toml

@@ -15,31 +15,28 @@ path = "src/main.rs"
 [lib]
 
 [dependencies]
-binread = "2.1.0"
-bytemuck = { version = "1.4.0", features = ["derive"] }
+binread = "2"
+bytemuck = { version = "1", features = ["derive"] }
 indicatif = "0.16"
-md5 = "0.7.0"
-pico-args = "0.4.0"
+md5 = "0.7"
+pico-args = "0.4"
 serial = "0.4"
-sha2 = "0.9.1"
-slip-codec =  "0.2.4"
-thiserror = "1.0.20"
-xmas-elf = "0.8.0"
-serde = { version = "1.0", features = ["derive"] }
+sha2 = "0.9"
+slip-codec =  "0.2"
+thiserror = "1"
+xmas-elf = "0.8"
+serde = { version = "1", features = ["derive"] }
 serde_plain = "1"
 toml = "0.5"
-directories-next = "2.0.0"
+directories-next = "2"
 color-eyre = "0.5"
-strum = "0.21.0"
-strum_macros = "0.21.1"
-csv = "1.1.6"
-regex = "1.5.4"
+strum = "0.22"
+strum_macros = "0.22"
+csv = "1"
+regex = "1"
 flate2 = "1"
 miette = { version = "3", features = ["fancy"] }
 
-[dev-dependencies]
-pretty_assertions = "0.7.1"
-
 [package.metadata.binstall]
 pkg-url = "{ repo }/releases/download/v{ version }/{ name }"
 pkg-fmt = "bin"

espflash/src/chip/esp8266.rs

@@ -94,8 +94,6 @@ impl ReadEFuse for Esp8266 {
 fn test_esp8266_rom() {
     use std::fs::read;
 
-    use pretty_assertions::assert_eq;
-
     let input_bytes = read("./tests/data/esp8266").unwrap();
     let expected_bin = read("./tests/data/esp8266.bin").unwrap();
 

espflash/src/error.rs

@@ -6,7 +6,7 @@ use miette::{Diagnostic, SourceOffset, SourceSpan};
 use slip_codec::Error as SlipError;
 use std::fmt::{Display, Formatter};
 use std::io;
-use strum::{AsStaticRef, VariantNames};
+use strum::VariantNames;
 use thiserror::Error;
 
 #[derive(Error, Debug, Diagnostic)]
@@ -555,7 +555,7 @@ impl UnsupportedImageFormatError {
         self.chip
             .supported_image_formats()
             .iter()
-            .map(|format| format.as_static())
+            .map(|format| format.into())
             .collect::<Vec<&'static str>>()
             .join(", ")
     }

espflash/src/image_format/mod.rs

@@ -11,7 +11,7 @@ pub use esp8266::*;
 use crate::error::Error;
 use serde::Deserialize;
 use std::str::FromStr;
-use strum_macros::{AsStaticStr, Display, EnumVariantNames};
+use strum_macros::{Display, EnumVariantNames, IntoStaticStr};
 
 const ESP_MAGIC: u8 = 0xE9;
 const WP_PIN_DISABLED: u8 = 0xEE;
@@ -48,7 +48,7 @@ pub trait ImageFormat<'a> {
 }
 
 #[derive(
-    Debug, Copy, Clone, Eq, PartialEq, Display, AsStaticStr, EnumVariantNames, Deserialize,
+    Debug, Copy, Clone, Eq, PartialEq, Display, IntoStaticStr, EnumVariantNames, Deserialize,
 )]
 #[strum(serialize_all = "kebab-case")]
 #[serde(rename_all = "kebab-case")]