Update crate to work with latest nightlies

Author: GabrielMajeri

BUILDING.md

@@ -16,14 +16,16 @@ The following steps allow you to build a simple UEFI app.
 
 - Create a new `#![no_std]` binary, add `#![no_main]` to use a custom entry point,
   and make sure you have an entry point function which matches the one below:
-
-```rust
-#![feature(abi_efiapi)]
-use uefi::prelude::*;
-
-#[entry]
-fn efi_main(handle: Handle, system_table: SystemTable<Boot>) -> Status;
-```
+  ```rust
+  #![feature(abi_efiapi)]
+  use uefi::prelude::*;
+
+  #[entry]
+  fn efi_main(handle: Handle, system_table: SystemTable<Boot>) -> Status;
+  ```
+  You will also want to add a dependency to the
+  [`compiler-builtins`](https://github.com/rust-lang/compiler-builtins) crate,
+  to avoid linking errors.
 
 - Build using `cargo xbuild --target x86_64-unknown-uefi`.
 

src/exts.rs

@@ -1,7 +1,7 @@
 //! Utility functions for the most common UEFI patterns.
 
 use alloc_api::{
-    alloc::{handle_alloc_error, AllocRef, Global},
+    alloc::{handle_alloc_error, AllocInit, AllocRef, Global, MemoryBlock},
     boxed::Box,
 };
 use core::{alloc::Layout, slice};
@@ -16,9 +16,10 @@ pub fn allocate_buffer(layout: Layout) -> Box<[u8]> {
         handle_alloc_error(layout);
     }
     unsafe {
-        match Global.alloc(layout) {
-            Ok((mem, len)) => Box::from_raw(slice::from_raw_parts_mut(mem.as_ptr(), len)),
+        let MemoryBlock { ptr, size } = match Global.alloc(layout, AllocInit::Uninitialized) {
+            Ok(block) => block,
             Err(_) => handle_alloc_error(layout),
-        }
+        };
+        Box::from_raw(slice::from_raw_parts_mut(ptr.as_ptr(), size))
     }
 }

uefi-services/Cargo.toml

@@ -15,7 +15,6 @@ is-it-maintained-issue-resolution = { repository = "rust-osdev/uefi-rs" }
 is-it-maintained-open-issues = { repository = "rust-osdev/uefi-rs" }
 
 [dependencies]
-rlibc = "1.0.0"
 x86_64 = "0.8.3"
 
 uefi = { version = "0.4.4", features = ["alloc", "logger"] }

uefi-services/src/lib.rs

@@ -11,13 +11,10 @@
 
 #![no_std]
 #![feature(alloc_error_handler)]
-#![feature(asm)]
+#![feature(llvm_asm)]
 #![feature(lang_items)]
 #![feature(panic_info_message)]
 
-// These crates are required.
-extern crate rlibc;
-
 // Core types.
 extern crate uefi;
 
@@ -177,7 +174,7 @@ fn panic_handler(info: &core::panic::PanicInfo) -> ! {
     loop {
         unsafe {
             // Try to at least keep CPU from running at 100%
-            asm!("hlt" :::: "volatile");
+            llvm_asm!("hlt" :::: "volatile");
         }
     }
 }

uefi-test-runner/Cargo.toml

@@ -11,5 +11,7 @@ uefi-services = { path = "../uefi-services" }
 
 log = { version = "0.4.8", default-features = false }
 
+compiler_builtins = { git = "https://github.com/rust-lang/compiler-builtins" }
+
 [features]
 qemu = ["uefi-services/qemu"]

uefi-test-runner/src/main.rs

@@ -3,6 +3,8 @@
 #![feature(asm)]
 #![feature(abi_efiapi)]
 
+extern crate compiler_builtins;
+
 #[macro_use]
 extern crate log;
 #[macro_use]