---

yaml
---
r: 67199
b: refs/heads/master
c: 8fb77c7
h: refs/heads/master
i:
  67197: 5bd8ab4
  67195: e015495
  67191: 727f244
  67183: cecaea1
  67167: 549a183
  67135: 2092ec3
  67071: d497015
v: v3

Author: gifnksm

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: ff34064aa3b49eb649d411b733201c512e9c5eed
+refs/heads/master: 8fb77c70993b8f020a9398a458e9a6aea02eb70b
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/doc/tutorial.md

@@ -309,7 +309,7 @@ was taken.
 
 In short, everything that's not a declaration (declarations are `let` for
 variables; `fn` for functions; and any top-level named items such as
-[traits](#traits), [enum types](#enums), and [constants](#constants)) is an
+[traits](#traits), [enum types](#enums), and static items) is an
 expression, including function bodies.
 
 ~~~~
@@ -1374,7 +1374,7 @@ let exchange_crayons: ~str = ~"Black, BlizzardBlue, Blue";
 ~~~
 
 Both vectors and strings support a number of useful
-[methods](#functions-and-methods), defined in [`std::vec`]
+[methods](#methods), defined in [`std::vec`]
 and [`std::str`]. Here are some examples.
 
 [`std::vec`]: std/vec.html
@@ -1928,7 +1928,7 @@ that implements a trait includes the name of the trait at the start of
 the definition, as in the following impls of `Printable` for `int`
 and `~str`.
 
-[impls]: #functions-and-methods
+[impls]: #methods
 
 ~~~~
 # trait Printable { fn print(&self); }

trunk/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)

trunk/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;

trunk/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