From df993cc26e66908fb1c8be5fa9cd36f6012454d6 Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Wed, 24 Jul 2019 11:02:56 +0200
Subject: [PATCH] Switch to 2018 edition

---
 Cargo.toml                     |  1 +
 src/io/dma.rs                  | 12 ++++++------
 src/io/mmio.rs                 | 10 +++++-----
 src/lib.rs                     |  1 +
 src/scheme/scheme.rs           |  6 +++---
 src/scheme/scheme_block.rs     |  6 +++---
 src/scheme/scheme_block_mut.rs |  6 +++---
 src/scheme/scheme_mut.rs       |  6 +++---
 8 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 530252a..67d5dcc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,6 +6,7 @@ license = "MIT"
 authors = ["Jeremy Soller <jackpot51@gmail.com>"]
 repository = "https://gitlab.redox-os.org/redox-os/syscall"
 documentation = "https://docs.rs/redox_syscall"
+edition = "2018"
 
 [lib]
 name = "syscall"
diff --git a/src/io/dma.rs b/src/io/dma.rs
index d5334b8..f2a9a12 100644
--- a/src/io/dma.rs
+++ b/src/io/dma.rs
@@ -1,7 +1,7 @@
 use core::{mem, ptr};
 use core::ops::{Deref, DerefMut};
 
-use Result;
+use crate::Result;
 
 struct PhysBox {
     address: usize,
@@ -10,7 +10,7 @@ struct PhysBox {
 
 impl PhysBox {
     fn new(size: usize) -> Result<PhysBox> {
-        let address = unsafe { ::physalloc(size)? };
+        let address = unsafe { crate::physalloc(size)? };
         Ok(PhysBox {
             address: address,
             size: size
@@ -20,7 +20,7 @@ impl PhysBox {
 
 impl Drop for PhysBox {
     fn drop(&mut self) {
-        let _ = unsafe { ::physfree(self.address, self.size) };
+        let _ = unsafe { crate::physfree(self.address, self.size) };
     }
 }
 
@@ -32,7 +32,7 @@ pub struct Dma<T> {
 impl<T> Dma<T> {
     pub fn new(value: T) -> Result<Dma<T>> {
         let phys = PhysBox::new(mem::size_of::<T>())?;
-        let virt = unsafe { ::physmap(phys.address, phys.size, ::PHYSMAP_WRITE)? } as *mut T;
+        let virt = unsafe { crate::physmap(phys.address, phys.size, crate::PHYSMAP_WRITE)? } as *mut T;
         unsafe { ptr::write(virt, value); }
         Ok(Dma {
             phys: phys,
@@ -42,7 +42,7 @@ impl<T> Dma<T> {
 
     pub fn zeroed() -> Result<Dma<T>> {
         let phys = PhysBox::new(mem::size_of::<T>())?;
-        let virt = unsafe { ::physmap(phys.address, phys.size, ::PHYSMAP_WRITE)? } as *mut T;
+        let virt = unsafe { crate::physmap(phys.address, phys.size, crate::PHYSMAP_WRITE)? } as *mut T;
         unsafe { ptr::write_bytes(virt as *mut u8, 0, phys.size); }
         Ok(Dma {
             phys: phys,
@@ -71,6 +71,6 @@ impl<T> DerefMut for Dma<T> {
 impl<T> Drop for Dma<T> {
     fn drop(&mut self) {
         unsafe { drop(ptr::read(self.virt)); }
-        let _ = unsafe { ::physunmap(self.virt as usize) };
+        let _ = unsafe { crate::physunmap(self.virt as usize) };
     }
 }
diff --git a/src/io/mmio.rs b/src/io/mmio.rs
index b8e7727..f212636 100644
--- a/src/io/mmio.rs
+++ b/src/io/mmio.rs
@@ -1,19 +1,19 @@
 use core::ptr::{read_volatile, write_volatile};
-use core::mem::uninitialized;
+use core::mem::MaybeUninit;
 use core::ops::{BitAnd, BitOr, Not};
 
 use super::io::Io;
 
 #[repr(packed)]
 pub struct Mmio<T> {
-    value: T,
+    value: MaybeUninit<T>,
 }
 
 impl<T> Mmio<T> {
     /// Create a new Mmio without initializing
     pub fn new() -> Self {
         Mmio {
-            value: unsafe { uninitialized() }
+            value: MaybeUninit::uninit()
         }
     }
 }
@@ -22,10 +22,10 @@ impl<T> Io for Mmio<T> where T: Copy + PartialEq + BitAnd<Output = T> + BitOr<Ou
     type Value = T;
 
     fn read(&self) -> T {
-        unsafe { read_volatile(&self.value) }
+        unsafe { read_volatile(self.value.as_ptr()) }
     }
 
     fn write(&mut self, value: T) {
-        unsafe { write_volatile(&mut self.value, value) };
+        unsafe { write_volatile(self.value.as_mut_ptr(), value) };
     }
 }
diff --git a/src/lib.rs b/src/lib.rs
index 6b8d130..92b30f5 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,5 +1,6 @@
 #![feature(asm)]
 #![feature(const_fn)]
+#![feature(maybe_uninit)] // remove when Redox updates their rust version
 #![cfg_attr(not(test), no_std)]
 
 #[cfg(test)]
diff --git a/src/scheme/scheme.rs b/src/scheme/scheme.rs
index c047e96..9777342 100644
--- a/src/scheme/scheme.rs
+++ b/src/scheme/scheme.rs
@@ -1,8 +1,8 @@
 use core::{mem, slice};
 
-use data::*;
-use error::*;
-use number::*;
+use crate::data::*;
+use crate::error::*;
+use crate::number::*;
 
 pub trait Scheme {
     fn handle(&self, packet: &mut Packet) {
diff --git a/src/scheme/scheme_block.rs b/src/scheme/scheme_block.rs
index 0407dde..883fbef 100644
--- a/src/scheme/scheme_block.rs
+++ b/src/scheme/scheme_block.rs
@@ -1,8 +1,8 @@
 use core::{mem, slice};
 
-use data::*;
-use error::*;
-use number::*;
+use crate::data::*;
+use crate::error::*;
+use crate::number::*;
 
 pub trait SchemeBlock {
     fn handle(&self, packet: &Packet) -> Option<usize> {
diff --git a/src/scheme/scheme_block_mut.rs b/src/scheme/scheme_block_mut.rs
index 411035f..f4fa8c4 100644
--- a/src/scheme/scheme_block_mut.rs
+++ b/src/scheme/scheme_block_mut.rs
@@ -1,8 +1,8 @@
 use core::{mem, slice};
 
-use data::*;
-use error::*;
-use number::*;
+use crate::data::*;
+use crate::error::*;
+use crate::number::*;
 
 pub trait SchemeBlockMut {
     fn handle(&mut self, packet: &Packet) -> Option<usize> {
diff --git a/src/scheme/scheme_mut.rs b/src/scheme/scheme_mut.rs
index abd2e88..fd52592 100644
--- a/src/scheme/scheme_mut.rs
+++ b/src/scheme/scheme_mut.rs
@@ -1,8 +1,8 @@
 use core::{mem, slice};
 
-use data::*;
-use error::*;
-use number::*;
+use crate::data::*;
+use crate::error::*;
+use crate::number::*;
 
 pub trait SchemeMut {
     fn handle(&mut self, packet: &mut Packet) {