unbox serial

Author: icewind1991

espflash/src/connection.rs

@@ -6,11 +6,11 @@ use crate::encoder::SlipEncoder;
 use crate::error::{ConnectionError, Error, RomError};
 use binread::io::Cursor;
 use binread::{BinRead, BinReaderExt};
-use serial::{BaudRate, SerialPort, SerialPortSettings};
+use serial::{BaudRate, SerialPort, SerialPortSettings, SystemPort};
 use slip_codec::Decoder;
 
 pub struct Connection {
-    serial: Box<dyn SerialPort>,
+    serial: SystemPort,
     decoder: Decoder,
 }
 
@@ -25,9 +25,9 @@ pub struct CommandResponse {
 }
 
 impl Connection {
-    pub fn new(serial: impl SerialPort + 'static) -> Self {
+    pub fn new(serial: SystemPort) -> Self {
         Connection {
-            serial: Box::new(serial),
+            serial,
             decoder: Decoder::new(),
         }
     }
@@ -99,7 +99,7 @@ impl Connection {
     pub fn write_command(
         &mut self,
         command: u8,
-        data: impl LazyBytes<Box<dyn SerialPort>>,
+        data: impl LazyBytes<SystemPort>,
         check: u32,
     ) -> Result<(), Error> {
         let mut encoder = SlipEncoder::new(&mut self.serial)?;
@@ -112,7 +112,7 @@ impl Connection {
         Ok(())
     }
 
-    pub fn command<Data: LazyBytes<Box<dyn SerialPort>>>(
+    pub fn command<Data: LazyBytes<SystemPort>>(
         &mut self,
         command: u8,
         data: Data,
@@ -148,6 +148,10 @@ impl Connection {
         self.serial.flush()?;
         Ok(())
     }
+
+    pub fn into_serial(self) -> SystemPort {
+        self.serial
+    }
 }
 
 pub trait LazyBytes<W: Write> {

espflash/src/flasher.rs

@@ -1,5 +1,5 @@
 use bytemuck::{__core::time::Duration, bytes_of, Pod, Zeroable};
-use serial::{BaudRate, SerialPort};
+use serial::{BaudRate, SystemPort};
 use strum_macros::Display;
 
 use std::thread::sleep;
@@ -11,7 +11,7 @@ use crate::{
     Error, PartitionTable,
 };
 
-pub(crate) type Encoder<'a> = SlipEncoder<'a, Box<dyn SerialPort>>;
+pub(crate) type Encoder<'a> = SlipEncoder<'a, SystemPort>;
 
 pub(crate) const FLASH_SECTOR_SIZE: usize = 0x1000;
 const FLASH_BLOCK_SIZE: usize = 0x100;
@@ -205,10 +205,7 @@ pub struct Flasher {
 }
 
 impl Flasher {
-    pub fn connect(
-        serial: impl SerialPort + 'static,
-        speed: Option<BaudRate>,
-    ) -> Result<Self, Error> {
+    pub fn connect(serial: SystemPort, speed: Option<BaudRate>) -> Result<Self, Error> {
         let mut flasher = Flasher {
             connection: Connection::new(serial), // default baud is always 115200
             chip: Chip::Esp8266,                 // dummy, set properly later
@@ -537,6 +534,10 @@ impl Flasher {
         self.connection.flush()?;
         Ok(())
     }
+
+    pub fn into_serial(self) -> SystemPort {
+        self.connection.into_serial()
+    }
 }
 
 pub(crate) fn get_erase_size(offset: usize, size: usize) -> usize {