diff --git a/src/context.rs b/src/context.rs index 789f392..9092ae0 100644 --- a/src/context.rs +++ b/src/context.rs @@ -6,7 +6,7 @@ use alloc::boxed::Box; use fn_box::FnBox; use stack::Stack; -use arch::{mod, Registers}; +use arch::{self, Registers}; pub struct Context { regs: Registers, diff --git a/src/lib.rs b/src/lib.rs index 270ce20..2c0843a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,7 +1,7 @@ -#![feature(default_type_params, macro_rules, phase, globs, asm)] +#![feature(phase, asm)] #![no_std] -#[phase(plugin, link)] +#[macro_use] extern crate core; extern crate alloc; extern crate fn_box; @@ -10,7 +10,7 @@ pub use context::Context; mod std { pub use core::fmt; } -#[macro_escape] +#[macro_use] mod macros; mod context; diff --git a/src/main.rs b/src/main.rs index 0a6d1a6..20d0a9d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,3 @@ -#![feature(unboxed_closures, default_type_params)] extern crate lwkt; extern crate fn_box; @@ -14,7 +13,7 @@ fn main() { let mut native = unsafe { Context::native() }; - fn init(ctx: *mut (*mut Context, *mut Context), f: Box) -> ! { + fn init(ctx: *mut (*mut Context, *mut Context), f: Box>) -> ! { unsafe { let (native, green) = *ctx; diff --git a/src/platform.rs b/src/platform.rs index 76a71ba..48525c1 100644 --- a/src/platform.rs +++ b/src/platform.rs @@ -1,6 +1,6 @@ extern crate libc; extern crate std; -use self::std::prelude::*; +use self::std::prelude::v1::*; use self::std::os::{errno, page_size, MemoryMap}; use self::std::os::MapOption::{MapReadable, MapWritable, MapNonStandardFlags};