Skip to content

Commit a808bce

Browse files
committed
---
yaml --- r: 106457 b: refs/heads/try c: 40ab198 h: refs/heads/master i: 106455: 7a165d2 v: v3
1 parent c315844 commit a808bce

File tree

5 files changed

+11
-5
lines changed

5 files changed

+11
-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: b8ef9fd9c9f642ce7b8aed82782a1ed745d08d64
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: b8601a3d8b91ad3b653d143307611f2f5c75617e
5-
refs/heads/try: cd9010c77e764e9348ecd92dc4a285f6514505dc
5+
refs/heads/try: 40ab198356bbec05b308b2e61ebc6fe9e23ade9d
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/mk/crates.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ DEPS_test := std extra collections getopts serialize term
8181
DEPS_time := std serialize
8282

8383
TOOL_DEPS_compiletest := test green rustuv getopts
84-
TOOL_DEPS_rustdoc := rustdoc green rustuv
85-
TOOL_DEPS_rustc := rustc green rustuv
84+
TOOL_DEPS_rustdoc := rustdoc native
85+
TOOL_DEPS_rustc := rustc native
8686
TOOL_SOURCE_compiletest := $(S)src/compiletest/compiletest.rs
8787
TOOL_SOURCE_rustdoc := $(S)src/driver/driver.rs
8888
TOOL_SOURCE_rustc := $(S)src/driver/driver.rs

branches/try/src/driver/driver.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,15 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
#[no_uv];
12+
1113
#[cfg(rustdoc)]
1214
extern crate this = "rustdoc";
1315

1416
#[cfg(rustc)]
1517
extern crate this = "rustc";
1618

17-
fn main() { this::main() }
19+
extern crate native;
20+
21+
#[start]
22+
fn start(argc: int, argv: **u8) -> int { native::start(argc, argv, this::main) }

branches/try/src/libnative/io/file_win32.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,7 @@ pub fn readlink(p: &CString) -> IoResult<Path> {
433433
libc::VOLUME_NAME_DOS)
434434
});
435435
let ret = match ret {
436+
Some(ref s) if s.starts_with(r"\\?\") => Ok(Path::new(s.slice_from(4))),
436437
Some(s) => Ok(Path::new(s)),
437438
None => Err(super::last_error()),
438439
};

branches/try/src/libstd/io/fs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1217,6 +1217,6 @@ mod test {
12171217

12181218
check!(File::create(&tmpdir.join("test")).write(bytes));
12191219
let actual = check!(File::open(&tmpdir.join("test")).read_to_end());
1220-
assert!(actual.as_slice == bytes);
1220+
assert!(actual.as_slice() == bytes);
12211221
})
12221222
}

0 commit comments

Comments
 (0)