Updated to edition 2018, bumped crate version to 0.8.0

therealprof · therealprof · commit 162083af74a5 · 2018-12-11T16:12:00.000Z
Signed-off-by: Daniel Egger &lt;daniel@eggers-club.de&gt;
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,5 @@
 [package]
+edition = "2018"
 authors = ["Daniel Egger <daniel@eggers-club.de>"]
 categories = [
     "embedded",
@@ -17,12 +18,12 @@ license = "0BSD"
 name = "stm32f0xx-hal"
 readme = "README.md"
 repository = "https://github.com/stm32-rs/stm32f0xx-hal"
-version = "0.7.0"
+version = "0.8.0"
 
 [dependencies]
 bare-metal = { version = "0.2.4", features = ["const-fn"] }
 cortex-m = "0.5.8"
-cortex-m-rt = "0.6.5"
+cortex-m-rt = "0.6.6"
 nb = "0.1.1"
 void = { version = "1.0.2", default-features = false }
 stm32f0 = "0.4.0"
@@ -36,7 +37,7 @@ features = ["unproven"]
 version = "0.2.2"
 
 [dev-dependencies]
-ina260 = "0.2.3"
+ina260 = "0.2.6"
 numtoa = "0.2.3"
 panic-halt = "0.2.0"
 
diff --git a/examples/blinky.rs b/examples/blinky.rs
@@ -1,13 +1,12 @@
 #![no_main]
 #![no_std]
 
-extern crate cortex_m_rt;
-extern crate panic_halt;
+use panic_halt;
 
-extern crate stm32f0xx_hal as hal;
+use stm32f0xx_hal as hal;
 
-use hal::prelude::*;
-use hal::stm32;
+use crate::hal::prelude::*;
+use crate::hal::stm32;
 
 use cortex_m_rt::entry;
 
diff --git a/examples/blinky_delay.rs b/examples/blinky_delay.rs
@@ -1,15 +1,13 @@
 #![no_main]
 #![no_std]
 
-extern crate cortex_m;
-extern crate cortex_m_rt;
-extern crate panic_halt;
+use panic_halt;
 
-extern crate stm32f0xx_hal as hal;
+use stm32f0xx_hal as hal;
 
-use hal::delay::Delay;
-use hal::prelude::*;
-use hal::stm32;
+use crate::hal::delay::Delay;
+use crate::hal::prelude::*;
+use crate::hal::stm32;
 
 use cortex_m::peripheral::Peripherals;
 use cortex_m_rt::entry;
@@ -23,7 +21,7 @@ fn main() -> ! {
         let mut led = gpioa.pa1.into_push_pull_output();
 
         /* Constrain clocking registers */
-        let mut rcc = p.RCC.constrain();
+        let rcc = p.RCC.constrain();
 
         /* Configure clock to 8 MHz (i.e. the default) and freeze it */
         let clocks = rcc.cfgr.sysclk(8.mhz()).freeze();
diff --git a/examples/flash_systick.rs b/examples/flash_systick.rs
@@ -1,15 +1,13 @@
 #![no_main]
 #![no_std]
 
-extern crate cortex_m;
-extern crate cortex_m_rt;
-extern crate panic_halt;
+use panic_halt;
 
-extern crate stm32f0xx_hal as hal;
+use stm32f0xx_hal as hal;
 
-use hal::gpio::*;
-use hal::prelude::*;
-use hal::stm32;
+use crate::hal::gpio::*;
+use crate::hal::prelude::*;
+use crate::hal::stm32;
 
 use cortex_m::interrupt::Mutex;
 use cortex_m::peripheral::syst::SystClkSource::Core;
@@ -25,12 +23,12 @@ static GPIO: Mutex<RefCell<Option<gpioa::PA1<Output<PushPull>>>>> = Mutex::new(R
 fn main() -> ! {
     if let (Some(p), Some(cp)) = (stm32::Peripherals::take(), Peripherals::take()) {
         let gpioa = p.GPIOA.split();
-        let mut rcc = p.RCC.constrain();
+        let rcc = p.RCC.constrain();
         let _ = rcc.cfgr.sysclk(48.mhz()).freeze();
         let mut syst = cp.SYST;
 
         /* (Re-)configure PA1 as output */
-        let mut led = gpioa.pa1.into_push_pull_output();
+        let led = gpioa.pa1.into_push_pull_output();
 
         cortex_m::interrupt::free(move |cs| {
             *GPIO.borrow(cs).borrow_mut() = Some(led);
diff --git a/examples/i2c_hal_ina260reader.rs b/examples/i2c_hal_ina260reader.rs
@@ -1,18 +1,13 @@
 #![no_main]
 #![no_std]
 
-extern crate cortex_m;
-extern crate cortex_m_rt;
-extern crate embedded_hal;
-extern crate panic_halt;
+use panic_halt;
 
-extern crate stm32f0xx_hal as hal;
+use stm32f0xx_hal as hal;
 
-extern crate numtoa;
-
-use hal::i2c::*;
-use hal::prelude::*;
-use hal::stm32;
+use crate::hal::i2c::*;
+use crate::hal::prelude::*;
+use crate::hal::stm32;
 
 use embedded_hal::blocking::i2c::Write;
 
@@ -45,7 +40,7 @@ const SSD1306_CHARGE_PUMP: u8 = 0x8D;
 fn main() -> ! {
     if let Some(p) = stm32::Peripherals::take() {
         let gpiof = p.GPIOF.split();
-        let mut rcc = p.RCC.constrain();
+        let rcc = p.RCC.constrain();
         let _ = rcc.cfgr.freeze();
 
         let scl = gpiof
diff --git a/examples/i2c_hal_ina260serial.rs b/examples/i2c_hal_ina260serial.rs
@@ -1,20 +1,14 @@
 #![no_main]
 #![no_std]
 
-extern crate cortex_m;
-extern crate cortex_m_rt;
-extern crate embedded_hal;
-extern crate panic_halt;
+use panic_halt;
 
-extern crate stm32f0xx_hal as hal;
+use stm32f0xx_hal as hal;
 
-extern crate ina260;
-extern crate numtoa;
-
-use hal::i2c::*;
-use hal::prelude::*;
-use hal::serial::*;
-use hal::stm32;
+use crate::hal::i2c::*;
+use crate::hal::prelude::*;
+use crate::hal::serial::*;
+use crate::hal::stm32;
 
 use numtoa::NumToA;
 
@@ -28,7 +22,7 @@ fn main() -> ! {
     if let Some(p) = stm32::Peripherals::take() {
         let gpiof = p.GPIOF.split();
         let gpioa = p.GPIOA.split();
-        let mut clocks = p.RCC.constrain().cfgr.freeze();
+        let clocks = p.RCC.constrain().cfgr.freeze();
 
         /* Initialise serial pins */
         let tx = gpioa.pa9.into_alternate_af1();
@@ -51,7 +45,7 @@ fn main() -> ! {
             .set_open_drain();
 
         /* Setup I2C1 */
-        let mut i2c = I2c::i2c1(p.I2C1, (scl, sda), 1.khz());
+        let i2c = I2c::i2c1(p.I2C1, (scl, sda), 1.khz());
         let mut ina260 = INA260::new(i2c, 0x40).unwrap();
 
         /* Endless loop */
diff --git a/examples/i2c_hal_ssd1306alphabeter.rs b/examples/i2c_hal_ssd1306alphabeter.rs
@@ -1,16 +1,13 @@
 #![no_main]
 #![no_std]
 
-extern crate cortex_m;
-extern crate cortex_m_rt;
-extern crate embedded_hal;
-extern crate panic_halt;
+use panic_halt;
 
-extern crate stm32f0xx_hal as hal;
+use stm32f0xx_hal as hal;
 
-use hal::i2c::*;
-use hal::prelude::*;
-use hal::stm32;
+use crate::hal::i2c::*;
+use crate::hal::prelude::*;
+use crate::hal::stm32;
 
 use cortex_m_rt::entry;
 use embedded_hal::blocking::i2c::Write;
@@ -40,7 +37,7 @@ const SSD1306_CHARGE_PUMP: u8 = 0x8D;
 fn main() -> ! {
     if let Some(p) = stm32::Peripherals::take() {
         let gpiof = p.GPIOF.split();
-        let mut rcc = p.RCC.constrain();
+        let rcc = p.RCC.constrain();
         let _ = rcc.cfgr.freeze();
 
         let scl = gpiof
diff --git a/examples/led_hal_button_irq.rs b/examples/led_hal_button_irq.rs
@@ -1,23 +1,21 @@
 #![no_main]
 #![no_std]
 
-extern crate cortex_m;
-extern crate cortex_m_rt;
-extern crate panic_halt;
+use panic_halt;
 
-#[macro_use]
-extern crate stm32f0xx_hal as hal;
+use stm32f0xx_hal as hal;
 
-use hal::delay::Delay;
-use hal::gpio::*;
-use hal::prelude::*;
+use crate::hal::delay::Delay;
+use crate::hal::gpio::*;
+use crate::hal::prelude::*;
 
 use cortex_m::interrupt::Mutex;
 use cortex_m::peripheral::Peripherals as c_m_Peripherals;
 use cortex_m_rt::entry;
 
-pub use hal::stm32;
-pub use hal::stm32::*;
+pub use crate::hal::interrupt;
+pub use crate::hal::stm32;
+pub use crate::hal::stm32::*;
 
 use core::cell::RefCell;
 use core::ops::DerefMut;
@@ -39,7 +37,7 @@ fn main() -> ! {
         let exti = p.EXTI;
 
         // Enable clock for SYSCFG
-        let mut rcc = p.RCC;
+        let rcc = p.RCC;
         rcc.apb2enr.modify(|_, w| w.syscfgen().set_bit());
 
         // Configure PB1 as input (button)
@@ -55,7 +53,7 @@ fn main() -> ! {
         let clocks = rcc.constrain().cfgr.sysclk(8.mhz()).freeze();
 
         // Initialise delay provider
-        let mut delay = Delay::new(cp.SYST, clocks);
+        let delay = Delay::new(cp.SYST, clocks);
 
         // Enable external interrupt for PB1
         syscfg
diff --git a/examples/serial_echo.rs b/examples/serial_echo.rs
@@ -1,27 +1,23 @@
 #![no_main]
 #![no_std]
 
-extern crate cortex_m;
-extern crate cortex_m_rt;
-extern crate panic_halt;
+use panic_halt;
 
-extern crate stm32f0xx_hal as hal;
+use stm32f0xx_hal as hal;
 
-use hal::prelude::*;
-use hal::stm32;
+use crate::hal::prelude::*;
+use crate::hal::serial::Serial;
+use crate::hal::stm32;
 
-#[macro_use(block)]
-extern crate nb;
-
-use hal::serial::Serial;
+use nb::block;
 
 use cortex_m_rt::entry;
 
 #[entry]
 fn main() -> ! {
     if let Some(p) = stm32::Peripherals::take() {
         let gpioa = p.GPIOA.split();
-        let mut rcc = p.RCC.constrain();
+        let rcc = p.RCC.constrain();
         let clocks = rcc.cfgr.sysclk(48.mhz()).freeze();
 
         let tx = gpioa.pa9.into_alternate_af1();
diff --git a/examples/spi_hal_apa102c.rs b/examples/spi_hal_apa102c.rs
@@ -1,16 +1,14 @@
 #![no_main]
 #![no_std]
 
-extern crate cortex_m;
-extern crate cortex_m_rt;
-extern crate panic_halt;
+use panic_halt;
 
-extern crate stm32f0xx_hal as hal;
+use stm32f0xx_hal as hal;
 
-use hal::prelude::*;
-use hal::spi::Spi;
-use hal::spi::{Mode, Phase, Polarity};
-use hal::stm32;
+use crate::hal::prelude::*;
+use crate::hal::spi::Spi;
+use crate::hal::spi::{Mode, Phase, Polarity};
+use crate::hal::stm32;
 
 use cortex_m_rt::entry;
 
@@ -22,9 +20,9 @@ fn main() -> ! {
     };
 
     if let Some(p) = stm32::Peripherals::take() {
-        let mut rcc = p.RCC.constrain();
+        let rcc = p.RCC.constrain();
         let clocks = rcc.cfgr.freeze();
-        let mut gpioa = p.GPIOA.split();
+        let gpioa = p.GPIOA.split();
 
         // Configure pins for SPI
         let sck = gpioa.pa5.into_alternate_af0();
diff --git a/src/delay.rs b/src/delay.rs
@@ -4,8 +4,8 @@ use cast::u32;
 use cortex_m::peripheral::syst::SystClkSource;
 use cortex_m::peripheral::SYST;
 
-use hal::blocking::delay::{DelayMs, DelayUs};
-use rcc::Clocks;
+use crate::rcc::Clocks;
+use embedded_hal::blocking::delay::{DelayMs, DelayUs};
 
 /// System timer (SysTick) as a delay provider
 pub struct Delay {
diff --git a/src/gpio.rs b/src/gpio.rs
@@ -57,10 +57,10 @@ macro_rules! gpio {
         pub mod $gpiox {
             use core::marker::PhantomData;
 
-            use hal::digital::{InputPin, OutputPin, StatefulOutputPin};
-            use stm32::$GPIOX;
+            use embedded_hal::digital::{InputPin, OutputPin, StatefulOutputPin};
+            use crate::stm32::$GPIOX;
 
-            use stm32::RCC;
+            use crate::stm32::RCC;
             use super::{
                 Alternate, Floating, GpioExt, Input, OpenDrain, Output,
                 PullDown, PullUp, PushPull, AF0, AF1, AF2, AF3, AF4, AF5, AF6, AF7,
diff --git a/src/i2c.rs b/src/i2c.rs
@@ -1,13 +1,13 @@
-use stm32::{I2C1, RCC};
+use crate::stm32::{I2C1, RCC};
 
-use hal::blocking::i2c::{Write, WriteRead};
+use embedded_hal::blocking::i2c::{Write, WriteRead};
 
 use core::cmp;
-use gpio::gpioa::{PA10, PA11, PA12, PA9};
-use gpio::gpiob::{PB10, PB11, PB13, PB14, PB6, PB7, PB8, PB9};
-use gpio::gpiof::{PF0, PF1};
-use gpio::{Alternate, AF1, AF4, AF5};
-use time::{KiloHertz, U32Ext};
+use crate::gpio::gpioa::{PA10, PA11, PA12, PA9};
+use crate::gpio::gpiob::{PB10, PB11, PB13, PB14, PB6, PB7, PB8, PB9};
+use crate::gpio::gpiof::{PF0, PF1};
+use crate::gpio::{Alternate, AF1, AF4, AF5};
+use crate::time::{KiloHertz, U32Ext};
 
 /// I2C abstraction
 pub struct I2c<I2C, PINS> {
diff --git a/src/lib.rs b/src/lib.rs
diff --git a/src/prelude.rs b/src/prelude.rs
diff --git a/src/rcc.rs b/src/rcc.rs
diff --git a/src/serial.rs b/src/serial.rs
diff --git a/src/spi.rs b/src/spi.rs
