---

yaml
---
r: 96092
b: refs/heads/dist-snap
c: 8a041e6
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 6f401478dc9fbd0b34ae4d9500c3f6c29852ce53
+refs/heads/dist-snap: 8a041e63a56f4ee4976e6b0eeb8e79874564fb4c
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/.gitignore

@@ -89,4 +89,3 @@ config.stamp
 src/etc/dl
 .settings/
 build/
-i686-pc-mingw32/

branches/dist-snap/doc/rustpkg.md

@@ -120,7 +120,7 @@ Thus, there should be no need to pass a `-L` flag to rustpkg to tell it where to
 
 # Custom build scripts
 
-A file called `pkg.rs` at the root level in a workspace is called a *package script*.
+A file called `pkg.rs` at the root level in a package directory is called a *package script*.
 If a package script exists, rustpkg executes it to build the package
 rather than inferring crates as described previously.
 

branches/dist-snap/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) -> std::libc::c_int;
+    fn SetEnvironmentVariableA(n: *u8, v: *u8) -> int;
 }
 ~~~~
 

branches/dist-snap/src/librustpkg/lib.rs

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

branches/dist-snap/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::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);
+    use std::io::native::stdio::stderr;
+    use std::io::Writer;
+
+    let mut out = stderr();
+    fmt::writeln(&mut out as &mut Writer, args);
 }

branches/dist-snap/src/libstd/io/mod.rs

@@ -306,7 +306,24 @@ pub mod timer;
 /// Buffered I/O wrappers
 pub mod buffered;
 
-pub mod native;
+/// 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 { }
+    }
+}
 
 /// Signal handling
 pub mod signal;