From b0dcc653048a595f2ce9f23698ae9968179d3e8c Mon Sep 17 00:00:00 2001 From: edef Date: Tue, 3 Mar 2015 01:51:45 -0500 Subject: [PATCH] Rust updates --- build.rs | 6 +++--- src/lib.rs | 2 +- src/platform.rs | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build.rs b/build.rs index 2513ee4..497b118 100644 --- a/build.rs +++ b/build.rs @@ -1,11 +1,11 @@ -#![feature(io, path, os)] +#![feature(old_io, old_path)] use std::old_io::Command; use std::old_io::fs::PathExtensions; use std::old_io::fs; -use std::os; +use std::env; fn main() { - let out_dir = os::getenv("OUT_DIR").unwrap(); + let out_dir = env::var("OUT_DIR").unwrap(); let mut objects = Vec::new(); let files = fs::readdir(&Path::new("src")).unwrap(); diff --git a/src/lib.rs b/src/lib.rs index 8b9028f..53559d1 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,6 +1,6 @@ #![feature(no_std)] #![feature(asm, core)] -#![feature(os, libc)] +#![feature(os, libc, page_size)] #![no_std] #[macro_use] diff --git a/src/platform.rs b/src/platform.rs index 5eb38d7..95acdbf 100644 --- a/src/platform.rs +++ b/src/platform.rs @@ -1,7 +1,8 @@ extern crate libc; extern crate std; use self::std::prelude::v1::*; -use self::std::os::{errno, page_size, MemoryMap}; +use self::std::os::{errno, MemoryMap}; +use self::std::env::page_size; use self::std::os::MapOption::{MapReadable, MapWritable, MapNonStandardFlags}; use stack;