---

yaml
---
r: 64605
b: refs/heads/snap-stage3
c: 4639475
h: refs/heads/master
i:
  64603: a3d7e31
v: v3

Author: crnobog

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 407bffb33e59db9c2ed0c0c5a6533f2ab88743e0
+refs/heads/snap-stage3: 46394758aa7cc9a2532662cb29d3acfc382e4e18
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/compiletest/compiletest.rs

@@ -242,13 +242,13 @@ pub fn make_tests(config: &config) -> ~[test::TestDescAndFn] {
     let mut tests = ~[];
     let dirs = os::list_dir_path(&config.src_base);
     for dirs.iter().advance |file| {
-        let file = file.clone();
+        let file = (*file).clone();
         debug!("inspecting file %s", file.to_str());
-        if is_test(config, &file) {
-            let t = do make_test(config, &file) {
+        if is_test(config, file) {
+            let t = do make_test(config, file) {
                 match config.mode {
-                    mode_codegen => make_metrics_test_closure(config, &file),
-                    _ => make_test_closure(config, &file)
+                    mode_codegen => make_metrics_test_closure(config, file),
+                    _ => make_test_closure(config, file)
                 }
             };
             tests.push(t)

branches/snap-stage3/src/compiletest/runtest.rs

@@ -681,7 +681,7 @@ fn make_out_name(config: &config, testfile: &Path, extension: &str) -> Path {
 }
 
 fn aux_output_dir_name(config: &config, testfile: &Path) -> Path {
-    output_base_name(config, testfile).with_filetype("libaux")
+    Path(output_base_name(config, testfile).to_str() + ".libaux")
 }
 
 fn output_testname(testfile: &Path) -> Path {

branches/snap-stage3/src/libextra/extra.rs

@@ -36,9 +36,23 @@ use std::str::{StrSlice, OwnedStr};
 
 pub use std::os;
 
+pub mod uv_ll;
+
+// General io and system-services modules
+
+#[path = "net/mod.rs"]
+pub mod net;
+
+// libuv modules
+pub mod uv;
+pub mod uv_iotask;
+pub mod uv_global_loop;
+
+
 // Utility modules
 
 pub mod c_vec;
+pub mod timer;
 pub mod io_util;
 pub mod rc;
 
@@ -76,7 +90,6 @@ pub mod sha2;
 
 // And ... other stuff
 
-pub mod url;
 pub mod ebml;
 pub mod dbg;
 pub mod getopts;

branches/snap-stage3/src/libextra/flatpipes.rs

@@ -639,6 +639,7 @@ mod test {
     use flatpipes::serial;
     use io_util::BufReader;
     use flatpipes::{BytePort, FlatChan, FlatPort};
+    use net::tcp::TcpSocketBuf;
 
     use std::comm;
     use std::int;
@@ -727,8 +728,7 @@ mod test {
     }
 
     // FIXME #2064: Networking doesn't work on x86
-    // XXX Broken until networking support is added back
-    /*#[test]
+    #[test]
     #[cfg(target_arch = "x86_64")]
     fn test_pod_tcp_stream() {
         fn reader_port(buf: TcpSocketBuf
@@ -745,7 +745,6 @@ mod test {
     #[test]
     #[cfg(target_arch = "x86_64")]
     fn test_serializing_tcp_stream() {
-        // XXX Broken until networking support is added back
         fn reader_port(buf: TcpSocketBuf
                       ) -> serial::ReaderPort<int, TcpSocketBuf> {
             serial::reader_port(buf)
@@ -861,7 +860,7 @@ mod test {
         }
 
         finish_port.recv();
-    }*/
+    }
 
     // Tests that the different backends behave the same when the
     // binary streaming protocol is broken