changes for edition 2018

Author: ryankurte

Cargo.toml

@@ -1,11 +1,14 @@
 [package]
-authors = ["Jorge Aparicio <jorge@japaric.io>"]
+authors = [
+    "The Embedded Linux Team <embedded-linux@teams.rust-embedded.org>",
+    "Jorge Aparicio <jorge@japaric.io>"
+]
 categories = ["embedded", "hardware-support"]
 description = "Implementation of the `embedded-hal` traits for Linux devices"
 keywords = ["Linux", "hal"]
 license = "MIT OR Apache-2.0"
 name = "linux-embedded-hal"
-repository = "https://github.com/japaric/linux-embedded-hal"
+repository = "https://github.com/rust-embedded/linux-embedded-hal"
 version = "0.3.0"
 edition = "2018"
 

src/cdev_pin.rs

@@ -15,7 +15,7 @@ impl CdevPin {
     }
 }
 
-impl hal::digital::OutputPin for CdevPin {
+impl embedded_hal::digital::OutputPin for CdevPin {
     type Error = gpio_cdev::errors::Error;
 
     fn try_set_low(&mut self) -> Result<(), Self::Error> {
@@ -27,7 +27,7 @@ impl hal::digital::OutputPin for CdevPin {
     }
 }
 
-impl hal::digital::InputPin for CdevPin {
+impl embedded_hal::digital::InputPin for CdevPin {
     type Error = gpio_cdev::errors::Error;
 
     fn try_is_high(&self) -> Result<bool, Self::Error> {

src/lib.rs

@@ -12,19 +12,19 @@
 
 #![deny(missing_docs)]
 
-extern crate cast;
-extern crate embedded_hal as hal;
-pub extern crate i2cdev;
-pub extern crate nb;
-pub extern crate serial_core;
-pub extern crate serial_unix;
-pub extern crate spidev;
+use cast;
+pub use i2cdev;
+pub use nb;
+pub use serial_core;
+pub use serial_unix;
+pub use spidev;
 
 #[cfg(feature = "gpio_sysfs")]
-pub extern crate sysfs_gpio;
+pub use sysfs_gpio;
 
 #[cfg(feature = "gpio_cdev")]
-pub extern crate gpio_cdev;
+pub use gpio_cdev;
+
 
 use core::convert::Infallible;
 use std::io::{self, Write};
@@ -61,7 +61,7 @@ pub use sysfs_pin::SysfsPin;
 /// Empty struct that provides delay functionality on top of `thread::sleep`
 pub struct Delay;
 
-impl hal::blocking::delay::DelayUs<u8> for Delay {
+impl embedded_hal::blocking::delay::DelayUs<u8> for Delay {
     type Error = Infallible;
 
     fn try_delay_us(&mut self, n: u8) -> Result<(), Self::Error> {
@@ -70,7 +70,7 @@ impl hal::blocking::delay::DelayUs<u8> for Delay {
     }
 }
 
-impl hal::blocking::delay::DelayUs<u16> for Delay {
+impl embedded_hal::blocking::delay::DelayUs<u16> for Delay {
     type Error = Infallible;
 
     fn try_delay_us(&mut self, n: u16) -> Result<(), Self::Error> {
@@ -79,7 +79,7 @@ impl hal::blocking::delay::DelayUs<u16> for Delay {
     }
 }
 
-impl hal::blocking::delay::DelayUs<u32> for Delay {
+impl embedded_hal::blocking::delay::DelayUs<u32> for Delay {
     type Error = Infallible;
 
     fn try_delay_us(&mut self, n: u32) -> Result<(), Self::Error> {
@@ -91,7 +91,7 @@ impl hal::blocking::delay::DelayUs<u32> for Delay {
     }
 }
 
-impl hal::blocking::delay::DelayUs<u64> for Delay {
+impl embedded_hal::blocking::delay::DelayUs<u64> for Delay {
     type Error = Infallible;
 
     fn try_delay_us(&mut self, n: u64) -> Result<(), Self::Error> {
@@ -103,7 +103,7 @@ impl hal::blocking::delay::DelayUs<u64> for Delay {
     }
 }
 
-impl hal::blocking::delay::DelayMs<u8> for Delay {
+impl embedded_hal::blocking::delay::DelayMs<u8> for Delay {
     type Error = Infallible;
 
     fn try_delay_ms(&mut self, n: u8) -> Result<(), Self::Error> {
@@ -112,7 +112,7 @@ impl hal::blocking::delay::DelayMs<u8> for Delay {
     }
 }
 
-impl hal::blocking::delay::DelayMs<u16> for Delay {
+impl embedded_hal::blocking::delay::DelayMs<u16> for Delay {
     type Error = Infallible;
 
     fn try_delay_ms(&mut self, n: u16) -> Result<(), Self::Error> {
@@ -121,7 +121,7 @@ impl hal::blocking::delay::DelayMs<u16> for Delay {
     }
 }
 
-impl hal::blocking::delay::DelayMs<u32> for Delay {
+impl embedded_hal::blocking::delay::DelayMs<u32> for Delay {
     type Error = Infallible;
 
     fn try_delay_ms(&mut self, n: u32) -> Result<(), Self::Error> {
@@ -130,7 +130,7 @@ impl hal::blocking::delay::DelayMs<u32> for Delay {
     }
 }
 
-impl hal::blocking::delay::DelayMs<u64> for Delay {
+impl embedded_hal::blocking::delay::DelayMs<u64> for Delay {
     type Error = Infallible;
 
     fn try_delay_ms(&mut self, n: u64) -> Result<(), Self::Error> {
@@ -173,7 +173,7 @@ impl I2cdev {
     }
 }
 
-impl hal::blocking::i2c::Read for I2cdev {
+impl embedded_hal::blocking::i2c::Read for I2cdev {
     type Error = i2cdev::linux::LinuxI2CError;
 
     fn try_read(&mut self, address: u8, buffer: &mut [u8]) -> Result<(), Self::Error> {
@@ -182,7 +182,7 @@ impl hal::blocking::i2c::Read for I2cdev {
     }
 }
 
-impl hal::blocking::i2c::Write for I2cdev {
+impl embedded_hal::blocking::i2c::Write for I2cdev {
     type Error = i2cdev::linux::LinuxI2CError;
 
     fn try_write(&mut self, address: u8, bytes: &[u8]) -> Result<(), Self::Error> {
@@ -191,7 +191,7 @@ impl hal::blocking::i2c::Write for I2cdev {
     }
 }
 
-impl hal::blocking::i2c::WriteRead for I2cdev {
+impl embedded_hal::blocking::i2c::WriteRead for I2cdev {
     type Error = i2cdev::linux::LinuxI2CError;
 
     fn try_write_read(
@@ -240,7 +240,7 @@ impl Spidev {
     }
 }
 
-impl hal::blocking::spi::Transfer<u8> for Spidev {
+impl embedded_hal::blocking::spi::Transfer<u8> for Spidev {
     type Error = io::Error;
 
     fn try_transfer<'b>(&mut self, buffer: &'b mut [u8]) -> io::Result<&'b [u8]> {
@@ -251,18 +251,18 @@ impl hal::blocking::spi::Transfer<u8> for Spidev {
     }
 }
 
-impl hal::blocking::spi::Write<u8> for Spidev {
+impl embedded_hal::blocking::spi::Write<u8> for Spidev {
     type Error = io::Error;
 
     fn try_write(&mut self, buffer: &[u8]) -> io::Result<()> {
         self.0.write_all(buffer)
     }
 }
 
-pub use hal::blocking::spi::{Operation as SpiOperation};
+pub use embedded_hal::blocking::spi::{Operation as SpiOperation};
 
 /// Transactional implementation batches SPI operations into a single transaction
-impl hal::blocking::spi::Transactional<u8> for Spidev {
+impl embedded_hal::blocking::spi::Transactional<u8> for Spidev {
     type Error = io::Error;
 
     fn try_exec<'a>(&mut self, operations: &mut [SpiOperation<'a, u8>]) -> Result<(), Self::Error> {
@@ -285,9 +285,7 @@ impl hal::blocking::spi::Transactional<u8> for Spidev {
         }).collect();
 
         // Execute transfer
-        self.0.transfer_multiple(&mut messages)?;
-
-        Ok(())
+        self.0.transfer_multiple(&mut messages)
     }
 }
 

src/serial.rs

@@ -5,7 +5,6 @@ use std::path::Path;
 
 use nb;
 
-use hal;
 use serial_core;
 use serial_unix::TTYPort;
 
@@ -30,7 +29,7 @@ fn translate_io_errors(err: std::io::Error) -> nb::Error<IoErrorKind> {
     }
 }
 
-impl hal::serial::Read<u8> for Serial {
+impl embedded_hal::serial::Read<u8> for Serial {
     type Error = IoErrorKind;
 
     fn try_read(&mut self) -> nb::Result<u8, Self::Error> {
@@ -44,7 +43,7 @@ impl hal::serial::Read<u8> for Serial {
     }
 }
 
-impl hal::serial::Write<u8> for Serial {
+impl embedded_hal::serial::Write<u8> for Serial {
     type Error = IoErrorKind;
 
     fn try_write(&mut self, word: u8) -> nb::Result<(), Self::Error> {
@@ -61,7 +60,7 @@ impl hal::serial::Write<u8> for Serial {
 mod test {
     use std::path::Path;
 
-    use hal::serial::{Read, Write};
+    use embedded_hal::serial::{Read, Write};
     use std::io::{Read as IoRead, Write as IoWrite};
 
     use super::*;

src/sysfs_pin.rs

@@ -26,7 +26,7 @@ impl SysfsPin {
     }
 }
 
-impl hal::digital::OutputPin for SysfsPin {
+impl embedded_hal::digital::OutputPin for SysfsPin {
     type Error = sysfs_gpio::Error;
 
     fn try_set_low(&mut self) -> Result<(), Self::Error> {
@@ -38,7 +38,7 @@ impl hal::digital::OutputPin for SysfsPin {
     }
 }
 
-impl hal::digital::InputPin for SysfsPin {
+impl embedded_hal::digital::InputPin for SysfsPin {
     type Error = sysfs_gpio::Error;
 
     fn try_is_high(&self) -> Result<bool, Self::Error> {

src/timer.rs

@@ -3,7 +3,7 @@
 use core::convert::Infallible;
 use std::time::{Duration, Instant};
 
-use hal::timer::{CountDown, Periodic};
+use embedded_hal::timer::{CountDown, Periodic};
 
 /// A periodic timer based on [`std::time::Instant`][instant], which is a
 /// monotonically nondecreasing clock.