Switch to binrw from unmaintained binread

esp-rs · Sep 18, 2023 · 1c75bce · 1c75bce
1 parent 28fab99
commit 1c75bce
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/espflash/Cargo.toml b/espflash/Cargo.toml
@@ -33,7 +33,7 @@ required-features = ["cli"]
 [dependencies]
 addr2line = { version = "0.20.0", optional = true }
 base64 = "0.21.2"
-binread = "2.2.0"
+binrw = "0.11.2"
 bytemuck = { version = "1.13.1", features = ["derive"] }
 clap = { version = "4.3.*", features = ["derive", "env", "wrap_help"], optional = true }
 clap_complete = { version = "4.3.*", optional = true }

diff --git a/espflash/src/connection.rs b/espflash/src/connection.rs
@@ -6,7 +6,7 @@
 
 use std::{io::BufWriter, thread::sleep, time::Duration};
 
-use binread::{io::Cursor, BinRead, BinReaderExt};
+use binrw::{io::Cursor, BinRead, BinReaderExt};
 use log::info;
 use serialport::UsbPortInfo;
 use slip_codec::SlipDecoder;

diff --git a/espflash/src/error.rs b/espflash/src/error.rs
@@ -149,8 +149,8 @@ impl From<io::Error> for Error {
     }
 }
 
-impl From<binread::Error> for Error {
-    fn from(err: binread::Error) -> Self {
+impl From<binrw::Error> for Error {
+    fn from(err: binrw::Error) -> Self {
         Self::Connection(err.into())
     }
 }
@@ -223,10 +223,10 @@ impl From<io::Error> for ConnectionError {
     }
 }
 
-impl From<binread::Error> for ConnectionError {
-    fn from(err: binread::Error) -> Self {
+impl From<binrw::Error> for ConnectionError {
+    fn from(err: binrw::Error) -> Self {
         match err {
-            binread::Error::Io(e) => ConnectionError::from(e),
+            binrw::Error::Io(e) => ConnectionError::from(e),
             _ => unreachable!(),
         }
     }