---

yaml
---
r: 102211
b: refs/heads/master
c: 40ab198
h: refs/heads/master
i:
  102209: 4bc9486
  102207: ab3d9f6
v: v3

Author: alexcrichton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: cd9010c77e764e9348ecd92dc4a285f6514505dc
+refs/heads/master: 40ab198356bbec05b308b2e61ebc6fe9e23ade9d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
 refs/heads/try: a97642026c18a624ff6ea01075dd9550f8ed07ff

trunk/mk/crates.mk

@@ -81,8 +81,8 @@ DEPS_test := std extra collections getopts serialize term
 DEPS_time := std serialize
 
 TOOL_DEPS_compiletest := test green rustuv getopts
-TOOL_DEPS_rustdoc := rustdoc green rustuv
-TOOL_DEPS_rustc := rustc green rustuv
+TOOL_DEPS_rustdoc := rustdoc native
+TOOL_DEPS_rustc := rustc native
 TOOL_SOURCE_compiletest := $(S)src/compiletest/compiletest.rs
 TOOL_SOURCE_rustdoc := $(S)src/driver/driver.rs
 TOOL_SOURCE_rustc := $(S)src/driver/driver.rs

trunk/src/driver/driver.rs

@@ -8,10 +8,15 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[no_uv];
+
 #[cfg(rustdoc)]
 extern crate this = "rustdoc";
 
 #[cfg(rustc)]
 extern crate this = "rustc";
 
-fn main() { this::main() }
+extern crate native;
+
+#[start]
+fn start(argc: int, argv: **u8) -> int { native::start(argc, argv, this::main) }

trunk/src/libnative/io/file_win32.rs

@@ -433,6 +433,7 @@ pub fn readlink(p: &CString) -> IoResult<Path> {
                                         libc::VOLUME_NAME_DOS)
     });
     let ret = match ret {
+        Some(ref s) if s.starts_with(r"\\?\") => Ok(Path::new(s.slice_from(4))),
         Some(s) => Ok(Path::new(s)),
         None => Err(super::last_error()),
     };

trunk/src/libstd/io/fs.rs

@@ -1217,6 +1217,6 @@ mod test {
 
         check!(File::create(&tmpdir.join("test")).write(bytes));
         let actual = check!(File::open(&tmpdir.join("test")).read_to_end());
-        assert!(actual.as_slice == bytes);
+        assert!(actual.as_slice() == bytes);
     })
 }