Skip to content

Commit 5f92cf4

Browse files
committed
---
yaml --- r: 187392 b: refs/heads/try c: 9f8a1cb h: refs/heads/master v: v3
1 parent 56b3b57 commit 5f92cf4

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
@@ -2,7 +2,7 @@
22
refs/heads/master: b4c965ee803a4521d8b4575f634e036f93e408f3
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 3a96d6a9818fe2affc98a187fb1065120458cee9
5-
refs/heads/try: f8e4fcb38c2ab0b5180c8fff35ad0454eb0667d7
5+
refs/heads/try: 9f8a1cb38d4d6dd16291aa0fd9f19e93e5263028
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/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/try/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/try/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)