From 12765de45681b7cb7b295a774d7523ffabcc62d6 Mon Sep 17 00:00:00 2001
From: Berkus Decker <berkus+github@metta.systems>
Date: Mon, 21 Jan 2019 02:00:34 +0200
Subject: [PATCH] Enable edition 2018

---
 Cargo.toml              |  1 +
 src/main.rs             |  4 ++--
 src/platform/gpio.rs    |  2 +-
 src/platform/mailbox.rs |  6 +++---
 src/platform/uart.rs    |  4 ++--
 src/platform/vc.rs      | 10 ++++++----
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 3ea278f..7043abc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,6 +10,7 @@ readme = "README.md"
 license = "BSL-1.0"
 categories = ["no-std", "embedded", "os"]
 publish = false
+edition = "2018"
 
 [package.metadata.cargo-xbuild]
 memcpy = true
diff --git a/src/main.rs b/src/main.rs
index f443968..f015587 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -28,10 +28,10 @@ pub use arch::*;
 pub mod platform;
 mod write_to;
 
-use core::fmt::Write;
+// use core::fmt::Write;
 use platform::{
     display::{Color, Size2d},
-    uart::MiniUart,
+    // uart::MiniUart,
     vc::VC,
 };
 
diff --git a/src/platform/gpio.rs b/src/platform/gpio.rs
index 629f771..988d619 100644
--- a/src/platform/gpio.rs
+++ b/src/platform/gpio.rs
@@ -1,4 +1,4 @@
-use platform::rpi3::PERIPHERAL_BASE;
+use crate::platform::rpi3::PERIPHERAL_BASE;
 use register::mmio::*;
 
 const GPIO_BASE: u32 = PERIPHERAL_BASE + 0x20_0000;
diff --git a/src/platform/mailbox.rs b/src/platform/mailbox.rs
index 5ec4db6..a48bce7 100644
--- a/src/platform/mailbox.rs
+++ b/src/platform/mailbox.rs
@@ -1,10 +1,10 @@
-use arch::*;
-use core::{fmt::Write, ops::Deref};
-use platform::{
+use crate::arch::*;
+use crate::platform::{
     display::Size2d,
     rpi3::{phys2bus, PERIPHERAL_BASE},
     // uart::MiniUart,
 };
+use core::ops::Deref;
 use register::mmio::*;
 
 // Public interface to the mailbox
diff --git a/src/platform/uart.rs b/src/platform/uart.rs
index 757ba1c..7812e6c 100644
--- a/src/platform/uart.rs
+++ b/src/platform/uart.rs
@@ -1,6 +1,6 @@
-use arch::*;
+use crate::arch::*;
+use crate::platform::{gpio, rpi3::PERIPHERAL_BASE};
 use core::{fmt, ops};
-use platform::{gpio, rpi3::PERIPHERAL_BASE};
 use register::mmio::*;
 
 // The base address for UART.
diff --git a/src/platform/vc.rs b/src/platform/vc.rs
index 33a91d7..59d913d 100644
--- a/src/platform/vc.rs
+++ b/src/platform/vc.rs
@@ -1,7 +1,9 @@
-use core::fmt::Write;
-use platform::display::{Display, PixelOrder, Size2d, CHARSIZE_X, CHARSIZE_Y};
-use platform::mailbox::{self, channel, response::VAL_LEN_FLAG, tag, GpuFb, Mailbox};
-use platform::rpi3::bus2phys;
+use crate::platform::{
+    display::{Display, PixelOrder, Size2d, CHARSIZE_X, CHARSIZE_Y},
+    mailbox::{self, channel, response::VAL_LEN_FLAG, tag, GpuFb, Mailbox},
+    rpi3::bus2phys,
+};
+// use core::fmt::Write;
 // use platform::uart::MiniUart;
 
 pub struct VC;