Merge pull request #81 from hdhoang/edition-2018

use rust-2018

Cargo.toml

@@ -1,4 +1,5 @@
 [package]
+edition = "2018"
 name = "anne-key"
 description = "Firmware for Anne Pro Keyboard"
 repository = "https://github.com/ah-/anne-key"
@@ -14,10 +15,17 @@ bit_field = "0.9.0"
 cortex-m = "0.5.8"
 cortex-m-rt = "0.6.5"
 cortex-m-semihosting = "0.3.1"
-cortex-m-rtfm = { git = "https://github.com/hdhoang/cortex-m-rtfm", branch = "v0.3-with-cortex-m-v0.5" }
 nb = "0.1.1"
 vcell = "0.1.0"
-stm32l151-hal = "0.5.0"
+
+[dependencies.rtfm]
+package = "cortex-m-rtfm"
+git = "https://github.com/hdhoang/cortex-m-rtfm"
+branch = "v0.3-with-cortex-m-v0.5"
+
+[dependencies.hal]
+package = "stm32l151-hal"
+version = "0.5.0"
 
 [dependencies.embedded-hal]
 features = ["unproven"]

rust-toolchain

@@ -1 +1 @@
-nightly-2018-12-06
+nightly-2019-01-01

src/action.rs

@@ -1,4 +1,4 @@
-use keycodes::KeyCode;
+use crate::keycodes::KeyCode;
 
 #[allow(dead_code)]
 #[derive(Copy, Clone, PartialEq)]

src/bluetooth.rs

@@ -4,8 +4,8 @@ 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 core::marker::Unsize;
-use debug::UnwrapLog;
 use nb;
 use rtfm::Threshold;
 
@@ -104,7 +104,7 @@ where
 
     pub fn handle_message(
         &mut self,
-        message: &Message,
+        message: &Message<'_>,
         led: &mut Led<BUFFER>,
         keyboard: &mut Keyboard,
     ) {

src/clock.rs

@@ -1,5 +1,5 @@
 use cortex_m;
-use stm32l151;
+use stm32l1::stm32l151;
 
 pub fn init_clock(p: &stm32l151::Peripherals) {
     p.USB.usb_cntr.modify(|_, w| w.pdwn().clear_bit());

src/keyboard.rs

@@ -1,16 +1,16 @@
-use action::Action;
+use crate::action::Action;
+use crate::bluetooth::Bluetooth;
+use crate::debug::UnwrapLog;
+use crate::hidreport::HidReport;
+use crate::keycodes::KeyCode;
+use crate::keymatrix::{KeyState, COLUMNS, ROWS};
+use crate::layout::LAYERS;
+use crate::layout::LAYER_BT;
+use crate::led::Led;
+use crate::usb::Usb;
 use bit_field::{BitArray, BitField};
-use bluetooth::Bluetooth;
 use core::marker::Unsize;
-use debug::UnwrapLog;
-use hidreport::HidReport;
-use keycodes::KeyCode;
-use keymatrix::{KeyState, COLUMNS, ROWS};
-use layout::LAYERS;
-use layout::LAYER_BT;
-use led::Led;
-use stm32l151::SCB;
-use usb::Usb;
+use stm32l1::stm32l151::SCB;
 
 pub struct Keyboard {
     layers: Layers,

src/keymatrix.rs

@@ -3,7 +3,7 @@ use embedded_hal::digital::{InputPin, OutputPin};
 use hal::gpio::gpioa::*;
 use hal::gpio::gpiob::*;
 use hal::gpio::{Input, Output};
-use stm32l151::SYST;
+use stm32l1::stm32l151::SYST;
 
 pub const ROWS: usize = 5;
 pub const COLUMNS: usize = 14;

src/layout.rs

@@ -1,7 +1,7 @@
-use action::Action;
-use action::Action::*;
-use keycodes::KeyCode::*;
-use keymatrix::{COLUMNS, ROWS};
+use crate::action::Action;
+use crate::action::Action::*;
+use crate::keycodes::KeyCode::*;
+use crate::keymatrix::{COLUMNS, ROWS};
 
 /*
   ,-----------------------------------------------------------------------------.

src/led.rs

@@ -2,15 +2,15 @@ use super::keymatrix::KeyState;
 use super::protocol::{LedOp, Message, MsgType};
 use super::serial::led_usart::LedUsart;
 use super::serial::{Serial, Transfer};
-use bluetooth::BluetoothMode;
+use crate::bluetooth::BluetoothMode;
+use crate::keycodes::KeyIndex;
 use core::marker::Unsize;
 use embedded_hal::digital::OutputPin;
 use hal::gpio::gpioc::PC15;
 use hal::gpio::{Input, Output};
-use keycodes::KeyIndex;
 use nb;
 use rtfm::Threshold;
-use stm32l151::SYST;
+use stm32l1::stm32l151::SYST;
 
 pub enum LedMode {
     _Off,
@@ -204,7 +204,7 @@ where
         self.set_keys(payload)
     }
 
-    pub fn handle_message(&mut self, message: &Message) {
+    pub fn handle_message(&mut self, message: &Message<'_>) {
         match message.msg_type {
             MsgType::Led => {
                 match LedOp::from(message.operation) {