Commit cf612d98 authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Merge branch 'nightly' into 'master'

Fix building on nightly

See merge request !3
parents 6fe908e6 fa186750
......@@ -11,5 +11,5 @@ repository = "https://gitlab.redox-os.org/redox-os/uefi_std"
name = "uefi_std"
[dependencies]
redox_uefi = "0.1.0"
redox_uefi_alloc = "0.1.0"
redox_uefi = "0.1.2"
redox_uefi_alloc = "0.1.1"
......@@ -8,7 +8,6 @@
#![feature(lang_items)]
#![feature(log_syntax)]
#![feature(prelude_import)]
#![feature(raw)]
#![feature(slice_concat_ext)]
#![feature(test)]
#![feature(trace_macros)]
......@@ -50,7 +49,6 @@ pub use core::marker;
pub use core::mem;
pub use core::ops;
pub use core::ptr;
pub use core::raw;
pub use core::result;
pub use core::option;
pub use core::isize;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment