Skip to content

Commit 709fae5

Browse files
committed
---
yaml --- r: 185926 b: refs/heads/auto c: 9f8a1cb h: refs/heads/master v: v3
1 parent c12cf32 commit 709fae5

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: f8e4fcb38c2ab0b5180c8fff35ad0454eb0667d7
13+
refs/heads/auto: 9f8a1cb38d4d6dd16291aa0fd9f19e93e5263028
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/rustbook/build.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
//! Implementation of the `build` subcommand, used to compile a book.
1212
1313
use std::env;
14+
use std::os;
1415
use std::old_io;
1516
use std::old_io::{fs, File, BufferedWriter, TempDir, IoResult};
1617

@@ -81,7 +82,7 @@ fn render(book: &Book, tgt: &Path) -> CliResult<()> {
8182

8283
let src;
8384
if env::args().len() < 3 {
84-
src = env::current_dir().unwrap().clone();
85+
src = os::getcwd().unwrap().clone();
8586
} else {
8687
src = Path::new(env::args().nth(2).unwrap().clone());
8788
}
@@ -149,7 +150,7 @@ impl Subcommand for Build {
149150
}
150151
fn usage(&self) {}
151152
fn execute(&mut self, term: &mut Term) -> CommandResult<()> {
152-
let cwd = env::current_dir().unwrap();
153+
let cwd = os::getcwd().unwrap();
153154
let src;
154155
let tgt;
155156

branches/auto/src/rustbook/main.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#![feature(core)]
1414
#![feature(old_io)]
1515
#![feature(env)]
16+
#![feature(os)]
1617
#![feature(old_path)]
1718
#![feature(rustdoc)]
1819

branches/auto/src/rustbook/test.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use error::Error;
1717
use term::Term;
1818
use book;
1919
use std::old_io::{Command, File};
20-
use std::env;
20+
use std::os;
2121

2222
struct Test;
2323

@@ -35,7 +35,7 @@ impl Subcommand for Test {
3535
}
3636
fn usage(&self) {}
3737
fn execute(&mut self, term: &mut Term) -> CommandResult<()> {
38-
let cwd = env::current_dir().unwrap();
38+
let cwd = os::getcwd().unwrap();
3939
let src = cwd.clone();
4040

4141
let summary = File::open(&src.join("SUMMARY.md"));

0 commit comments

Comments
 (0)