Switch from serial to serial_unix

By not using the platform-independent implementation, we can simplify
some things.

Author: dbrgn

Cargo.toml

@@ -13,7 +13,7 @@ embedded-hal = { version = "0.2.0", features = ["unproven"] }
 i2cdev = "0.4.1"
 spidev = "0.3.0"
 sysfs_gpio = "0.5.1"
-serial = "0.4.0"
+serial-unix = "0.4.0"
 nb = "0.1.1"
 
 [dev-dependencies]

src/lib.rs

@@ -17,7 +17,7 @@ extern crate embedded_hal as hal;
 pub extern crate i2cdev;
 pub extern crate spidev;
 pub extern crate sysfs_gpio;
-pub extern crate serial;
+pub extern crate serial_unix;
 pub extern crate nb;
 
 use std::io::{self, Write};

src/serial_impl.rs

@@ -1,17 +1,20 @@
 //! Implementation of [`Serial`](https://docs.rs/embedded-hal/0.2.1/embedded_hal/serial/index.html)
 
-use hal::serial::{Read, Write};
+use std::io::{Error as IoError, Read, Write};
+
 use nb;
-use serial;
 
-/// Newtype around [`serial::SystemPort`] that implements the `embedded-hal` traits
-pub struct Serial(pub serial::SystemPort);
+use hal;
+use serial_unix::TTYPort;
+
+/// Newtype around [`serial_unix::TTYPort`] that implements
+/// the `embedded-hal` traits.
+pub struct Serial(pub TTYPort);
 
-impl Read<u8> for Serial {
-    type Error = serial::Error;
+impl hal::serial::Read<u8> for Serial {
+    type Error = IoError;
 
     fn read(&mut self) -> nb::Result<u8, Self::Error> {
-        use std::io::Read;
         let mut buffer = [0; 1];
         let bytes_read = self
             .0
@@ -25,19 +28,17 @@ impl Read<u8> for Serial {
     }
 }
 
-impl Write<u8> for Serial {
-    type Error = serial::Error;
+impl hal::serial::Write<u8> for Serial {
+    type Error = IoError;
 
     fn write(&mut self, word: u8) -> nb::Result<(), Self::Error> {
-        use std::io::Write;
         self.0
             .write(&[word])
             .map_err(|err| nb::Error::Other(Self::Error::from(err)))?;
         Ok(())
     }
 
     fn flush(&mut self) -> nb::Result<(), Self::Error> {
-        use std::io::Write;
         self.0
             .flush()
             .map_err(|err| nb::Error::Other(Self::Error::from(err)))
@@ -58,7 +59,7 @@ mod test {
         let (mut master, _slave, name) =
             openpty::openpty(None, None, None).expect("Creating pty failed");
         println!("{:?}", name);
-        let port = serial::open(Path::new(&name)).unwrap();
+        let port = TTYPort::open(Path::new(&name)).unwrap();
         let mut serial = Serial(port);
         master.write(&[1]).unwrap();
         serial.read().unwrap();