Skip to content

Commit

Permalink
rework all super imports to crate-root imports
Browse files Browse the repository at this point in the history
  • Loading branch information
hdhoang committed Mar 16, 2019
1 parent 4f98306 commit ff413b3
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
12 changes: 6 additions & 6 deletions src/bluetooth.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use super::hidreport::HidReport;
use super::keyboard::Keyboard;
use super::led::Led;
use super::protocol::{BleOp, KeyboardOp, LedOp, MacroOp, Message, MsgType, SystemOp};
use super::serial::bluetooth_usart::BluetoothUsart;
use super::serial::{DmaUsart, Serial, Transfer};
use crate::debug::UnwrapLog;
use crate::hidreport::HidReport;
use crate::keyboard::Keyboard;
use crate::led::Led;
use crate::protocol::{BleOp, KeyboardOp, LedOp, MacroOp, Message, MsgType, SystemOp};
use crate::serial::bluetooth_usart::BluetoothUsart;
use crate::serial::{DmaUsart, Serial, Transfer};
use crate::Threshold;

use core::marker::Unsize;
Expand Down
8 changes: 4 additions & 4 deletions src/led.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
use super::keymatrix::KeyState;
use super::protocol::{LedOp, Message, MsgType};
use super::serial::led_usart::LedUsart;
use super::serial::{Serial, Transfer};
use crate::bluetooth::BluetoothMode;
use crate::keycodes::KeyIndex;
use crate::keymatrix::KeyState;
use crate::protocol::{LedOp, Message, MsgType};
use crate::serial::led_usart::LedUsart;
use crate::serial::{Serial, Transfer};
use crate::Threshold;

use core::marker::Unsize;
Expand Down
2 changes: 1 addition & 1 deletion src/serial/bluetooth_usart.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use hal::gpio::gpioa::{PA1, PA2, PA3};
use hal::gpio::{Alternate, Input, Output};
use stm32l1::stm32l151::{RCC, USART2};

use super::DmaUsart;
use crate::serial::DmaUsart;

pub struct BluetoothUsart {
pa1: PA1<Output>,
Expand Down
2 changes: 1 addition & 1 deletion src/serial/led_usart.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use super::DmaUsart;
use crate::serial::DmaUsart;
use hal::dma::dma1::{C2, C3};
use hal::gpio::gpiob::{PB10, PB11};
use hal::gpio::{Alternate, Input};
Expand Down
2 changes: 1 addition & 1 deletion src/serial/mod.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pub mod bluetooth_usart;
pub mod led_usart;

use super::protocol::MsgType;
use crate::protocol::MsgType;
use core::marker::Unsize;
use nb;

Expand Down
2 changes: 1 addition & 1 deletion src/usb/hid.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use super::pma::PMA;
use crate::usb::pma::PMA;
use crate::usb::usb_ext::UsbEpExt;
use stm32l1::stm32l151::USB;

Expand Down

0 comments on commit ff413b3

Please sign in to comment.