Replace uses of ! with Void

With this commit, the library compiles on stable Rust now. Close #11
lpc-rs · Mar 14, 2019 · 642af46 · 642af46
1 parent e4dd0a2
commit 642af46
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/i2c.rs b/src/i2c.rs
@@ -46,6 +46,7 @@
 
 
 use embedded_hal::blocking::i2c;
+use void::Void;
 
 use crate::{
     init_state,
@@ -147,7 +148,7 @@ impl I2C<init_state::Disabled> {
 }
 
 impl i2c::Write for I2C<init_state::Enabled> {
-    type Error = !;
+    type Error = Void;
 
     /// Write to the I2C bus
     ///
@@ -190,7 +191,7 @@ impl i2c::Write for I2C<init_state::Enabled> {
 }
 
 impl i2c::Read for I2C<init_state::Enabled> {
-    type Error = !;
+    type Error = Void;
 
     /// Read from the I2C bus
     ///

diff --git a/src/lib.rs b/src/lib.rs
@@ -136,8 +136,6 @@
 //! [available from NXP]: https://www.nxp.com/docs/en/user-guide/UM10800.pdf
 
 
-#![feature(never_type)]
-
 #![deny(warnings)]
 #![deny(missing_docs)]
 

diff --git a/src/usart.rs b/src/usart.rs
@@ -65,6 +65,7 @@ use embedded_hal::serial::{
     Write,
 };
 use nb;
+use void::Void;
 
 use crate::{
     dma,
@@ -341,7 +342,7 @@ impl<'usart, UsartX> Transmitter<'usart, UsartX> where UsartX: Peripheral {
 impl<'usart, UsartX> Write<u8> for Transmitter<'usart, UsartX>
     where UsartX: Peripheral,
 {
-    type Error = !;
+    type Error = Void;
 
     fn write(&mut self, word: u8) -> nb::Result<(), Self::Error> {
         if self.0.usart.stat.read().txrdy().bit_is_clear() {
@@ -388,7 +389,7 @@ impl<'usart, UsartX> fmt::Write for Transmitter<'usart, UsartX>
 impl<'usart, UsartX> dma::Dest for Transmitter<'usart, UsartX>
     where UsartX: Peripheral,
 {
-    type Error = !;
+    type Error = Void;
 
     fn wait(&mut self) -> nb::Result<(), Self::Error> {
         self.flush()