From 8a52c84f1a3984a1d7e322dee0457de83311a2d5 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Tue, 19 Jun 2018 17:44:51 -0600
Subject: [PATCH] Update to new alloc API

---
 vesad/src/display.rs | 7 +++----
 vesad/src/main.rs    | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/vesad/src/display.rs b/vesad/src/display.rs
index f8795a10b2..bb25dcb841 100644
--- a/vesad/src/display.rs
+++ b/vesad/src/display.rs
@@ -1,8 +1,7 @@
 #[cfg(feature="rusttype")]
 extern crate rusttype;
 
-use alloc::allocator::{Alloc, Layout};
-use alloc::heap::Global;
+use std::alloc::{Alloc, Global, Layout};
 use std::{cmp, slice};
 use std::ptr::NonNull;
 
@@ -108,7 +107,7 @@ impl Display {
             let onscreen = self.onscreen.as_mut_ptr();
             self.onscreen = unsafe { slice::from_raw_parts_mut(onscreen, size) };
 
-            unsafe { Global.dealloc(NonNull::new_unchecked(self.offscreen.as_mut_ptr() as *mut u8).as_opaque(), Layout::from_size_align_unchecked(self.offscreen.len() * 4, 4096)) };
+            unsafe { Global.dealloc(NonNull::new_unchecked(self.offscreen.as_mut_ptr() as *mut u8), Layout::from_size_align_unchecked(self.offscreen.len() * 4, 4096)) };
             self.offscreen = unsafe { slice::from_raw_parts_mut(offscreen as *mut u32, size) };
         } else {
             println!("Display is already {}, {}", width, height);
@@ -277,6 +276,6 @@ impl Display {
 
 impl Drop for Display {
     fn drop(&mut self) {
-        unsafe { Global.dealloc(NonNull::new_unchecked(self.offscreen.as_mut_ptr() as *mut u8).as_opaque(), Layout::from_size_align_unchecked(self.offscreen.len() * 4, 4096)) };
+        unsafe { Global.dealloc(NonNull::new_unchecked(self.offscreen.as_mut_ptr() as *mut u8), Layout::from_size_align_unchecked(self.offscreen.len() * 4, 4096)) };
     }
 }
diff --git a/vesad/src/main.rs b/vesad/src/main.rs
index 1d63798123..008417fc6e 100644
--- a/vesad/src/main.rs
+++ b/vesad/src/main.rs
@@ -1,9 +1,7 @@
 #![deny(warnings)]
-#![feature(alloc)]
 #![feature(allocator_api)]
 #![feature(asm)]
 
-extern crate alloc;
 extern crate orbclient;
 extern crate syscall;