From 1d5f05b9120667876b8d2e9b11e0e650517270f5 Mon Sep 17 00:00:00 2001
From: Daniel Kolsoi <ThaDan64@gmail.com>
Date: Thu, 31 Jan 2019 11:05:36 -0800
Subject: [PATCH] Updated to work with recent nightly

---
 hello-world/src/lib.rs | 2 +-
 src/allocator.rs       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hello-world/src/lib.rs b/hello-world/src/lib.rs
index e56de246..1799c1ff 100644
--- a/hello-world/src/lib.rs
+++ b/hello-world/src/lib.rs
@@ -3,7 +3,7 @@
 
 extern crate alloc;
 use alloc::borrow::ToOwned;
-use alloc::String;
+use alloc::string::String;
 
 #[macro_use]
 extern crate linux_kernel_module;
diff --git a/src/allocator.rs b/src/allocator.rs
index ee17f353..45efb943 100644
--- a/src/allocator.rs
+++ b/src/allocator.rs
@@ -22,6 +22,6 @@ unsafe impl GlobalAlloc for KernelAllocator {
 }
 
 #[alloc_error_handler]
-extern "C" fn oom(_layout: Layout) -> ! {
+fn oom(_layout: Layout) -> ! {
     panic!("Out of memory!");
 }