Use os::getcwd instead of env in rustbook (fixup #22727)

diff --git a/src/rustbook/build.rs b/src/rustbook/build.rs
index 9f35bdaa367e5ee5d6d31d4f517cbfecdbc31cbe..f36d97d6d120d50ef2f42aaa2f47f3de788e49c7 100644 (file)
--- a/src/rustbook/build.rs
+++ b/src/rustbook/build.rs
@@ -11,6 +11,7 @@
 //! Implementation of the `build` subcommand, used to compile a book.
 
 use std::env;
+use std::os;
 use std::old_io;
 use std::old_io::{fs, File, BufferedWriter, TempDir, IoResult};
 
@@ -81,7 +82,7 @@ fn render(book: &Book, tgt: &Path) -> CliResult<()> {
 
         let src;
         if env::args().len() < 3 {
-            src = env::current_dir().unwrap().clone();
+            src = os::getcwd().unwrap().clone();
         } else {
             src = Path::new(env::args().nth(2).unwrap().clone());
         }
@@ -149,7 +150,7 @@ fn parse_args(&mut self, _: &[String]) -> CliResult<()> {
     }
     fn usage(&self) {}
     fn execute(&mut self, term: &mut Term) -> CommandResult<()> {
-        let cwd = env::current_dir().unwrap();
+        let cwd = os::getcwd().unwrap();
         let src;
         let tgt;
 

diff --git a/src/rustbook/main.rs b/src/rustbook/main.rs
index 68e4ba54d94c168fdf5c22305288056dd2a93c48..b9fc011e8b9a584edf198247e2eb1d0de9f67399 100644 (file)
--- a/src/rustbook/main.rs
+++ b/src/rustbook/main.rs
@@ -13,6 +13,7 @@
 #![feature(core)]
 #![feature(old_io)]
 #![feature(env)]
+#![feature(os)]
 #![feature(old_path)]
 #![feature(rustdoc)]
 

diff --git a/src/rustbook/test.rs b/src/rustbook/test.rs
index bff366163dc2f974f6c95792a1a7e5e534ac80c9..727a385a8f02811e19eb7a43d87b6500cd369e63 100644 (file)
--- a/src/rustbook/test.rs
+++ b/src/rustbook/test.rs
@@ -17,7 +17,7 @@
 use term::Term;
 use book;
 use std::old_io::{Command, File};
-use std::env;
+use std::os;
 
 struct Test;
 
@@ -35,7 +35,7 @@ fn parse_args(&mut self, _: &[String]) -> CliResult<()> {
     }
     fn usage(&self) {}
     fn execute(&mut self, term: &mut Term) -> CommandResult<()> {
-        let cwd = env::current_dir().unwrap();
+        let cwd = os::getcwd().unwrap();
         let src = cwd.clone();
 
         let summary = File::open(&src.join("SUMMARY.md"));