From 0697914182f88b73ec99f4fed82d7022ff16f2ce Mon Sep 17 00:00:00 2001 From: Astro Date: Thu, 5 Sep 2019 23:30:42 +0200 Subject: [PATCH] upgrade to rust edition 2018 --- firmware/Cargo.toml | 1 + firmware/src/main.rs | 15 ++------------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/firmware/Cargo.toml b/firmware/Cargo.toml index 133a054..c76b4a9 100644 --- a/firmware/Cargo.toml +++ b/firmware/Cargo.toml @@ -2,6 +2,7 @@ name = "ionpak-firmware" version = "1.0.0" authors = ["whitequark "] +edition = "2018" [build-dependencies] walkdir = "1.0" diff --git a/firmware/src/main.rs b/firmware/src/main.rs index b3a638c..95f6d50 100644 --- a/firmware/src/main.rs +++ b/firmware/src/main.rs @@ -2,17 +2,7 @@ #![no_std] #![no_main] -extern crate libm; -extern crate cortex_m; -#[macro_use] -extern crate cortex_m_rt; -extern crate tm4c129x; -extern crate smoltcp; -extern crate crc; -extern crate embedded_hal; -extern crate nb; -extern crate cortex_m_semihosting; - +use cortex_m_rt::entry; use core::fmt::{self, Write}; use embedded_hal::blocking::delay::DelayUs; use smoltcp::time::Instant; @@ -42,9 +32,8 @@ pub fn panic_fmt(info: &core::panic::PanicInfo) -> ! { loop {} } -#[macro_use] mod board; -use board::gpio::Gpio; +use self::board::gpio::Gpio; mod ethmac; mod ad7172;