Rust updates

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,

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;

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<FnBox()>) -> ! {
+  fn init(ctx: *mut (*mut Context, *mut Context), f: Box<FnBox<(), ()>>) -> ! {
     unsafe {
       let (native, green) = *ctx;
 

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};