---

yaml
---
r: 93679
b: refs/heads/try
c: 6f40147
h: refs/heads/master
i:
  93677: d82baf8
  93675: d7b4cca
  93671: 32050ba
  93663: 4c99cbc
v: v3

Author: bors

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: e91cb479a448c1afef1387e3abfbbcbd7fec6fea
+refs/heads/try: 6f401478dc9fbd0b34ae4d9500c3f6c29852ce53
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/doc/tutorial-ffi.md

@@ -303,7 +303,7 @@ conventions. Rust provides a way to tell the compiler which convention to use:
 #[cfg(target_os = "win32", target_arch = "x86")]
 #[link_name = "kernel32"]
 extern "stdcall" {
-    fn SetEnvironmentVariableA(n: *u8, v: *u8) -> int;
+    fn SetEnvironmentVariableA(n: *u8, v: *u8) -> std::libc::c_int;
 }
 ~~~~
 

branches/try/src/etc/snapshot.py

@@ -148,8 +148,11 @@ def get_url_to_file(u,f):
         returncode = subprocess.call(["wget", "-O", tmpf, u])
 
     if returncode != 0:
-        os.unlink(tmpf)
-        raise
+        try:
+            os.unlink(tmpf)
+        except OSError as e:
+            pass
+        raise Exception("failed to fetch url")
     os.rename(tmpf, f)
 
 def snap_filename_hash_part(snap):

branches/try/src/librustpkg/lib.rs

@@ -70,7 +70,7 @@ mod search;
 mod sha1;
 mod source_control;
 mod target;
-#[cfg(test)]
+#[cfg(not(windows), test)] // FIXME test failure on windows: #10471
 mod tests;
 mod util;
 pub mod version;

branches/try/src/librustuv/macros.rs

@@ -33,9 +33,9 @@ macro_rules! get_handle_to_current_scheduler(
 )
 
 pub fn dumb_println(args: &fmt::Arguments) {
-    use std::io::native::stdio::stderr;
-    use std::io::Writer;
-
-    let mut out = stderr();
-    fmt::writeln(&mut out as &mut Writer, args);
+    use std::io::native::file::FileDesc;
+    use std::io;
+    use std::libc;
+    let mut out = FileDesc::new(libc::STDERR_FILENO, false);
+    fmt::writeln(&mut out as &mut io::Writer, args);
 }

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

@@ -306,24 +306,7 @@ pub mod timer;
 /// Buffered I/O wrappers
 pub mod buffered;
 
-/// Thread-blocking implementations
-pub mod native {
-    /// Posix file I/O
-    pub mod file;
-    /// Process spawning and child management
-    pub mod process;
-    /// Posix stdio
-    pub mod stdio;
-
-    /// Sockets
-    /// # XXX - implement this
-    pub mod net {
-        pub mod tcp { }
-        pub mod udp { }
-        #[cfg(unix)]
-        pub mod unix { }
-    }
-}
+pub mod native;
 
 /// Signal handling
 pub mod signal;