diff --git a/src/rustbook/build.rs b/src/rustbook/build.rs index 6f5fc5c1969f0..f2ab68ddee0f0 100644 --- a/src/rustbook/build.rs +++ b/src/rustbook/build.rs @@ -10,7 +10,6 @@ //! Implementation of the `build` subcommand, used to compile a book. -use std::os; use std::env; use std::old_io; use std::old_io::{fs, File, BufferedWriter, TempDir, IoResult}; @@ -82,7 +81,7 @@ fn render(book: &Book, tgt: &Path) -> CliResult<()> { let src; if env::args().len() < 3 { - src = os::getcwd().unwrap().clone(); + src = env::current_dir().unwrap().clone(); } else { src = Path::new(env::args().nth(2).unwrap().clone()); } @@ -150,7 +149,7 @@ impl Subcommand for Build { } fn usage(&self) {} fn execute(&mut self, term: &mut Term) -> CommandResult<()> { - let cwd = os::getcwd().unwrap(); + let cwd = env::current_dir().unwrap(); let src; let tgt; diff --git a/src/rustbook/main.rs b/src/rustbook/main.rs index ace57f0ac2c0b..9bcfc7f45d341 100644 --- a/src/rustbook/main.rs +++ b/src/rustbook/main.rs @@ -12,7 +12,6 @@ #![feature(collections)] #![feature(core)] #![feature(old_io)] -#![feature(os)] #![feature(env)] #![feature(old_path)] #![feature(rustdoc)] diff --git a/src/rustbook/test.rs b/src/rustbook/test.rs index d3cb8a7316e86..18a746f10aad7 100644 --- a/src/rustbook/test.rs +++ b/src/rustbook/test.rs @@ -17,7 +17,7 @@ use error::Error; use term::Term; use book; use std::old_io::{Command, File}; -use std::os; +use std::env; struct Test; @@ -35,7 +35,7 @@ impl Subcommand for Test { } fn usage(&self) {} fn execute(&mut self, term: &mut Term) -> CommandResult<()> { - let cwd = os::getcwd().unwrap(); + let cwd = env::current_dir().unwrap(); let src = cwd.clone(); let summary = File::open(&src.join("SUMMARY.md"));