From aba97e29807e23aaf0793afdf9368c38213b7820 Mon Sep 17 00:00:00 2001 From: Andrew Tolvstad Date: Tue, 17 Mar 2020 23:27:25 -0700 Subject: [PATCH] Clean up imports and crate attributes The imports in most files appear to have been incompletely converted from edition 2015 to edition 2018, with duplicates and repeated prefixes. Additionally, some crate attributes were set separately when they could have been set jointly. This change cleans up imports and consolidates crate attributes. Some import sections have been annotated `#[rustfmt::skip]` and manually formatted for readability. --- .../tiva-c-connected-launchpad/src/main.rs | 5 ++- examples/tiva-c-launchpad/src/main.rs | 5 ++- tm4c-hal/src/delay.rs | 15 ++++----- tm4c-hal/src/lib.rs | 6 +--- tm4c123x-hal/src/gpio.rs | 8 +++-- tm4c123x-hal/src/i2c.rs | 23 ++++++------- tm4c123x-hal/src/lib.rs | 15 +++------ tm4c123x-hal/src/prelude.rs | 11 ++++--- tm4c123x-hal/src/serial.rs | 33 +++++++++---------- tm4c123x-hal/src/spi.rs | 20 ++++++----- tm4c123x-hal/src/sysctl.rs | 10 +++--- tm4c123x-hal/src/timer.rs | 19 ++++++----- tm4c129x-hal/src/gpio.rs | 8 +++-- tm4c129x-hal/src/i2c.rs | 11 ++++--- tm4c129x-hal/src/lib.rs | 7 ++-- tm4c129x-hal/src/prelude.rs | 11 ++++--- tm4c129x-hal/src/serial.rs | 25 ++++++-------- tm4c129x-hal/src/spi.rs | 19 ++++++----- tm4c129x-hal/src/sysctl.rs | 10 +++--- 19 files changed, 130 insertions(+), 131 deletions(-) diff --git a/examples/tiva-c-connected-launchpad/src/main.rs b/examples/tiva-c-connected-launchpad/src/main.rs index 7dfc08d..44ce78c 100644 --- a/examples/tiva-c-connected-launchpad/src/main.rs +++ b/examples/tiva-c-connected-launchpad/src/main.rs @@ -1,12 +1,11 @@ #![no_std] #![no_main] -extern crate panic_halt; // you can put a breakpoint on `rust_begin_unwind` to catch panics -extern crate tm4c129x_hal as hal; +use panic_halt as _; // you can put a breakpoint on `rust_begin_unwind` to catch panics use core::fmt::Write; use cortex_m_rt::entry; -use hal::prelude::*; +use tm4c129x_hal::{self as hal, prelude::*}; #[entry] fn main() -> ! { diff --git a/examples/tiva-c-launchpad/src/main.rs b/examples/tiva-c-launchpad/src/main.rs index 103e540..60539ed 100644 --- a/examples/tiva-c-launchpad/src/main.rs +++ b/examples/tiva-c-launchpad/src/main.rs @@ -1,12 +1,11 @@ #![no_std] #![no_main] -extern crate panic_halt; // you can put a breakpoint on `rust_begin_unwind` to catch panics -extern crate tm4c123x_hal as hal; +use panic_halt as _; // you can put a breakpoint on `rust_begin_unwind` to catch panics use core::fmt::Write; use cortex_m_rt::entry; -use hal::prelude::*; +use tm4c123x_hal::{self as hal, prelude::*}; #[entry] fn main() -> ! { diff --git a/tm4c-hal/src/delay.rs b/tm4c-hal/src/delay.rs index c8643cd..e7b7ae8 100644 --- a/tm4c-hal/src/delay.rs +++ b/tm4c-hal/src/delay.rs @@ -1,10 +1,7 @@ //! Code for busy-waiting -use crate::sysctl::Clocks; -use crate::time::Hertz; -use cast::u32; -use cortex_m::peripheral::syst::SystClkSource; -use cortex_m::peripheral::SYST; +use crate::{sysctl::Clocks, time::Hertz}; +use cortex_m::peripheral::{syst::SystClkSource, SYST}; use embedded_hal::blocking::delay::{DelayMs, DelayUs}; /// System timer (SysTick) as a delay provider @@ -38,13 +35,13 @@ impl DelayMs for Delay { impl DelayMs for Delay { fn delay_ms(&mut self, ms: u16) { - self.delay_ms(u32(ms)); + self.delay_ms(cast::u32(ms)); } } impl DelayMs for Delay { fn delay_ms(&mut self, ms: u8) { - self.delay_ms(u32(ms)); + self.delay_ms(cast::u32(ms)); } } @@ -75,12 +72,12 @@ impl DelayUs for Delay { impl DelayUs for Delay { fn delay_us(&mut self, us: u16) { - self.delay_us(u32(us)) + self.delay_us(cast::u32(us)) } } impl DelayUs for Delay { fn delay_us(&mut self, us: u8) { - self.delay_us(u32(us)) + self.delay_us(cast::u32(us)) } } diff --git a/tm4c-hal/src/lib.rs b/tm4c-hal/src/lib.rs index 7da121e..ec1af60 100644 --- a/tm4c-hal/src/lib.rs +++ b/tm4c-hal/src/lib.rs @@ -1,13 +1,9 @@ //! Generic implementation code for both TM4C123 and TM4C129. #![no_std] -#![deny(missing_docs)] -#![deny(warnings)] +#![deny(missing_docs, warnings)] #![allow(deprecated)] -extern crate embedded_hal as hal; -extern crate nb; - pub mod bb; pub mod delay; pub mod gpio; diff --git a/tm4c123x-hal/src/gpio.rs b/tm4c123x-hal/src/gpio.rs index 449f56f..60ccddb 100644 --- a/tm4c123x-hal/src/gpio.rs +++ b/tm4c123x-hal/src/gpio.rs @@ -34,9 +34,11 @@ pub use tm4c_hal::gpio::*; -use crate::bb; -use crate::hal::digital::{InputPin, OutputPin, StatefulOutputPin}; -use crate::sysctl; +use crate::{ + bb, + hal::digital::{InputPin, OutputPin, StatefulOutputPin}, + sysctl, +}; use core::marker::PhantomData; use tm4c_hal::gpio_macro; diff --git a/tm4c123x-hal/src/i2c.rs b/tm4c123x-hal/src/i2c.rs index 93c3328..95899c0 100644 --- a/tm4c123x-hal/src/i2c.rs +++ b/tm4c123x-hal/src/i2c.rs @@ -3,17 +3,18 @@ use cortex_m::asm::delay; use tm4c123x::{I2C0, I2C1, I2C2, I2C3}; -use crate::gpio::gpioa::{PA6, PA7}; -use crate::gpio::gpiob::{PB2, PB3}; -use crate::gpio::gpiod::{PD0, PD1}; -use crate::gpio::gpioe::{PE4, PE5}; - -use crate::gpio::{AlternateFunction, Floating, OpenDrain, OutputMode, AF3}; - -use crate::sysctl::{self, Clocks}; - -use crate::hal::blocking::i2c::{Read, Write, WriteRead}; -use crate::time::Hertz; +use crate::{ + gpio::{ + gpioa::{PA6, PA7}, + gpiob::{PB2, PB3}, + gpiod::{PD0, PD1}, + gpioe::{PE4, PE5}, + AlternateFunction, Floating, OpenDrain, OutputMode, AF3, + }, + hal::blocking::i2c::{Read, Write, WriteRead}, + sysctl::{self, Clocks}, + time::Hertz, +}; /// I2C error #[derive(Debug)] diff --git a/tm4c123x-hal/src/lib.rs b/tm4c123x-hal/src/lib.rs index 74b62cf..0d39774 100644 --- a/tm4c123x-hal/src/lib.rs +++ b/tm4c123x-hal/src/lib.rs @@ -19,14 +19,14 @@ //! //! [`f3`]: https://docs.rs/f3/~0.5.1 -#![deny(missing_docs)] -#![deny(warnings)] +#![deny(missing_docs, warnings)] #![allow(deprecated)] #![no_std] -pub use tm4c_hal::bb; -pub use tm4c_hal::delay; -pub use tm4c_hal::time; +pub use tm4c123x::{self, CorePeripherals, Peripherals}; +pub use tm4c_hal::{bb, delay, time}; + +use embedded_hal as hal; pub mod gpio; pub mod i2c; @@ -35,8 +35,3 @@ pub mod serial; pub mod spi; pub mod sysctl; pub mod timer; - -extern crate embedded_hal as hal; -extern crate nb; -pub use tm4c123x; -pub use tm4c123x::{CorePeripherals, Peripherals}; diff --git a/tm4c123x-hal/src/prelude.rs b/tm4c123x-hal/src/prelude.rs index 9914822..ef0ec85 100644 --- a/tm4c123x-hal/src/prelude.rs +++ b/tm4c123x-hal/src/prelude.rs @@ -1,6 +1,9 @@ //! Prelude -pub use crate::gpio::GpioExt as _tm4c123x_hal_gpio_GpioExt; -pub use crate::hal::prelude::*; -pub use crate::sysctl::SysctlExt; -pub use crate::time::U32Ext; +#[rustfmt::skip] +pub use crate::{ + gpio::GpioExt as _, + hal::prelude::*, + sysctl::SysctlExt, + time::U32Ext, +}; diff --git a/tm4c123x-hal/src/serial.rs b/tm4c123x-hal/src/serial.rs index 8b387fd..4dc8404 100644 --- a/tm4c123x-hal/src/serial.rs +++ b/tm4c123x-hal/src/serial.rs @@ -1,26 +1,23 @@ //! Serial -use core::fmt; -use core::marker::PhantomData; - -use crate::hal::prelude::*; -use crate::hal::serial; -use nb::{self, block}; pub use tm4c123x::{UART0, UART1, UART2, UART3, UART4, UART5, UART6, UART7}; +pub use tm4c_hal::{serial::*, uart_hal_macro, uart_pin_macro}; + +#[rustfmt::skip] +use crate::{ + gpio::{ + gpioa, gpiob, gpioc, gpiod, gpioe, gpiof, + AlternateFunction, OutputMode, AF1, AF2, AF8, + }, + hal::{prelude::*, serial}, + sysctl, + sysctl::Clocks, + time::Bps, +}; +use core::{fmt, marker::PhantomData}; +use nb::{self, block}; use void::Void; -use crate::gpio::{gpioa, gpiob, gpioc, gpiod, gpioe, gpiof}; -use crate::gpio::{AlternateFunction, OutputMode, AF1, AF2, AF8}; -use crate::sysctl; -use crate::sysctl::Clocks; -use crate::time::Bps; - -pub use tm4c_hal::serial::*; - -pub use tm4c_hal::serial::*; - -pub use tm4c_hal::{uart_hal_macro, uart_pin_macro}; - /// Serial abstraction pub struct Serial { uart: UART, diff --git a/tm4c123x-hal/src/spi.rs b/tm4c123x-hal/src/spi.rs index de33bf0..1365784 100644 --- a/tm4c123x-hal/src/spi.rs +++ b/tm4c123x-hal/src/spi.rs @@ -2,14 +2,18 @@ pub use crate::hal::spi::{Mode, MODE_0, MODE_1, MODE_2, MODE_3}; -use crate::gpio::gpioa::{PA2, PA4, PA5}; -use crate::gpio::gpiob::{PB4, PB6, PB7}; -use crate::gpio::gpiod::{PD0, PD2, PD3}; -use crate::gpio::{AlternateFunction, OutputMode, AF1, AF2}; -use crate::hal::spi::{FullDuplex, Phase, Polarity}; -use crate::sysctl; -use crate::sysctl::Clocks; -use crate::time::Hertz; +use crate::{ + gpio::{ + gpioa::{PA2, PA4, PA5}, + gpiob::{PB4, PB6, PB7}, + gpiod::{PD0, PD2, PD3}, + AlternateFunction, OutputMode, AF1, AF2, + }, + hal::spi::{FullDuplex, Phase, Polarity}, + sysctl, + sysctl::Clocks, + time::Hertz, +}; use nb; use tm4c123x::{SSI0, SSI1, SSI2, SSI3}; diff --git a/tm4c123x-hal/src/sysctl.rs b/tm4c123x-hal/src/sysctl.rs index d6450e1..f8b3fb3 100644 --- a/tm4c123x-hal/src/sysctl.rs +++ b/tm4c123x-hal/src/sysctl.rs @@ -21,12 +21,14 @@ //! //! See the LM4F120 datasheet, page 228 for a full list. -use crate::bb; -use crate::time::{Hertz, U32Ext}; -use cortex_m::asm::nop; - pub use tm4c_hal::sysctl::*; +use crate::{ + bb, + time::{Hertz, U32Ext}, +}; +use cortex_m::asm::nop; + /// Constrained SYSCTL peripheral. pub struct Sysctl { /// Power control methods will require `&mut this.power_control` to diff --git a/tm4c123x-hal/src/timer.rs b/tm4c123x-hal/src/timer.rs index 38a86ca..36c6d7b 100644 --- a/tm4c123x-hal/src/timer.rs +++ b/tm4c123x-hal/src/timer.rs @@ -1,16 +1,17 @@ //! Timers -extern crate embedded_hal as hal; - -use tm4c_hal::time::Hertz; - -use crate::sysctl; -use hal::timer::{CountDown, Periodic}; +use crate::{ + hal::timer::{CountDown, Periodic}, + sysctl::{self, Clocks}, +}; use nb; -use tm4c123x::{TIMER0, TIMER1, TIMER2, TIMER3, TIMER4, TIMER5}; -use tm4c123x::{WTIMER0, WTIMER1, WTIMER2, WTIMER3, WTIMER4, WTIMER5}; -use crate::sysctl::Clocks; +#[rustfmt::skip] +use tm4c123x::{ + TIMER0, TIMER1, TIMER2, TIMER3, TIMER4, TIMER5, + WTIMER0, WTIMER1, WTIMER2, WTIMER3, WTIMER4, WTIMER5, +}; +use tm4c_hal::time::Hertz; use void::Void; /// Hardware timers diff --git a/tm4c129x-hal/src/gpio.rs b/tm4c129x-hal/src/gpio.rs index 0919a6d..19bee11 100644 --- a/tm4c129x-hal/src/gpio.rs +++ b/tm4c129x-hal/src/gpio.rs @@ -36,9 +36,11 @@ pub use tm4c_hal::gpio::*; -use crate::bb; -use crate::hal::digital::{InputPin, OutputPin, StatefulOutputPin}; -use crate::sysctl; +use crate::{ + bb, + hal::digital::{InputPin, OutputPin, StatefulOutputPin}, + sysctl, +}; use core::marker::PhantomData; use tm4c_hal::gpio_macro; diff --git a/tm4c129x-hal/src/i2c.rs b/tm4c129x-hal/src/i2c.rs index 6b9012b..6a3f6a5 100644 --- a/tm4c129x-hal/src/i2c.rs +++ b/tm4c129x-hal/src/i2c.rs @@ -1,10 +1,11 @@ //! Inter-Integrated Circuit (I2C) bus -use crate::gpio::*; -use crate::gpio::{AlternateFunction, Floating, OpenDrain, OutputMode, AF3}; -use crate::hal::blocking::i2c::{Read, Write, WriteRead}; -use crate::sysctl::{self, Clocks}; -use crate::time::Hertz; +use crate::{ + gpio::*, + hal::blocking::i2c::{Read, Write, WriteRead}, + sysctl::{self, Clocks}, + time::Hertz, +}; use cortex_m::asm::delay; use tm4c129x::{I2C0, I2C1, I2C2, I2C3}; diff --git a/tm4c129x-hal/src/lib.rs b/tm4c129x-hal/src/lib.rs index 0847a65..f887b6a 100644 --- a/tm4c129x-hal/src/lib.rs +++ b/tm4c129x-hal/src/lib.rs @@ -25,9 +25,8 @@ #![deny(warnings)] #![allow(deprecated)] -pub use tm4c_hal::bb; -pub use tm4c_hal::delay; -pub use tm4c_hal::time; +pub use tm4c129x::{self, CorePeripherals, Peripherals}; +pub use tm4c_hal::{bb, delay, time}; pub mod gpio; pub mod i2c; @@ -37,5 +36,3 @@ pub mod serial; pub mod sysctl; use embedded_hal as hal; -pub use tm4c129x; -pub use tm4c129x::{CorePeripherals, Peripherals}; diff --git a/tm4c129x-hal/src/prelude.rs b/tm4c129x-hal/src/prelude.rs index 6a42b23..ef0ec85 100644 --- a/tm4c129x-hal/src/prelude.rs +++ b/tm4c129x-hal/src/prelude.rs @@ -1,6 +1,9 @@ //! Prelude -pub use crate::gpio::GpioExt as _tm4c129x_hal_gpio_GpioExt; -pub use crate::hal::prelude::*; -pub use crate::sysctl::SysctlExt; -pub use crate::time::U32Ext; +#[rustfmt::skip] +pub use crate::{ + gpio::GpioExt as _, + hal::prelude::*, + sysctl::SysctlExt, + time::U32Ext, +}; diff --git a/tm4c129x-hal/src/serial.rs b/tm4c129x-hal/src/serial.rs index 0c3ba9c..2f0df59 100644 --- a/tm4c129x-hal/src/serial.rs +++ b/tm4c129x-hal/src/serial.rs @@ -1,23 +1,18 @@ //! Serial -use core::fmt; -use core::marker::PhantomData; - -use crate::hal::prelude::*; -use crate::hal::serial; +use core::{fmt, marker::PhantomData}; + +use crate::{ + gpio::*, + hal::{prelude::*, serial}, + sysctl::{self, Clocks}, + time::Bps, +}; use nb::{self, block}; -pub use tm4c129x::{UART0, UART1, UART2, UART3, UART4, UART5, UART6, UART7}; use void::Void; -use crate::gpio::*; -use crate::gpio::{AlternateFunction, OutputMode, AF1}; -use crate::sysctl; -use crate::sysctl::Clocks; -use crate::time::Bps; - -pub use tm4c_hal::serial::*; - -pub use tm4c_hal::{uart_hal_macro, uart_pin_macro}; +pub use tm4c129x::{UART0, UART1, UART2, UART3, UART4, UART5, UART6, UART7}; +pub use tm4c_hal::{serial::*, uart_hal_macro, uart_pin_macro}; /// Serial abstraction pub struct Serial { diff --git a/tm4c129x-hal/src/spi.rs b/tm4c129x-hal/src/spi.rs index 4432250..01b6a79 100644 --- a/tm4c129x-hal/src/spi.rs +++ b/tm4c129x-hal/src/spi.rs @@ -2,14 +2,17 @@ pub use crate::hal::spi::{Mode, MODE_0, MODE_1, MODE_2, MODE_3}; -use crate::gpio::gpioa::{PA2, PA4, PA5}; -use crate::gpio::gpiob::{PB4, PB6, PB7}; -use crate::gpio::gpiod::{PD0, PD2, PD3}; -use crate::gpio::{AlternateFunction, OutputMode, AF1, AF2}; -use crate::hal::spi::{FullDuplex, Phase, Polarity}; -use crate::sysctl; -use crate::sysctl::Clocks; -use crate::time::Hertz; +use crate::{ + gpio::{ + gpioa::{PA2, PA4, PA5}, + gpiob::{PB4, PB6, PB7}, + gpiod::{PD0, PD2, PD3}, + AlternateFunction, OutputMode, AF1, AF2, + }, + hal::spi::{FullDuplex, Phase, Polarity}, + sysctl::{self, Clocks}, + time::Hertz, +}; use nb; use tm4c129x::{SSI0, SSI1, SSI2, SSI3}; diff --git a/tm4c129x-hal/src/sysctl.rs b/tm4c129x-hal/src/sysctl.rs index 48efd16..c0e379f 100644 --- a/tm4c129x-hal/src/sysctl.rs +++ b/tm4c129x-hal/src/sysctl.rs @@ -21,12 +21,14 @@ //! //! See the LM4F120 datasheet, page 228 for a full list. -use crate::bb; -use crate::time::{Hertz, U32Ext}; -use cortex_m::asm::nop; - pub use tm4c_hal::sysctl::*; +use crate::{ + bb, + time::{Hertz, U32Ext}, +}; +use cortex_m::asm::nop; + /// Constrained SYSCTL peripheral. pub struct Sysctl { /// Power control methods will require `&mut this.power_control` to