---

yaml
---
r: 93907
b: refs/heads/try
c: 4068139
h: refs/heads/master
i:
  93905: 298edbf
  93903: 1b4e222
v: v3

Author: pcwalton

[refs]

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

branches/try/src/etc/combine-tests.py

@@ -5,28 +5,25 @@
 # can run it "fast": spawning zillions of windows processes is our major build
 # bottleneck (and it doesn't hurt to run faster on other platforms as well).
 
-import sys
-import os
-import codecs
-
+import sys, os, re, codecs
 
 def scrub(b):
-    if sys.version_info >= (3,) and type(b) == bytes:
-        return b.decode('ascii')
-    else:
-        return b
+  if sys.version_info >= (3,) and type(b) == bytes:
+    return b.decode('ascii')
+  else:
+    return b
 
 src_dir = scrub(os.getenv("CFG_SRC_DIR"))
 if not src_dir:
-    raise Exception("missing env var CFG_SRC_DIR")
+  raise Exception("missing env var CFG_SRC_DIR")
 
 run_pass = os.path.join(src_dir, "src", "test", "run-pass")
 run_pass = os.path.abspath(run_pass)
 stage2_tests = []
 
 for t in os.listdir(run_pass):
     if t.endswith(".rs") and not (
-            t.startswith(".") or t.startswith("#") or t.startswith("~")):
+      t.startswith(".") or t.startswith("#") or t.startswith("~")):
         f = codecs.open(os.path.join(run_pass, t), "r", "utf8")
         s = f.read()
         if not ("xfail-test" in s or
@@ -44,11 +41,10 @@ def scrub(b):
 c.write("// AUTO-GENERATED FILE: DO NOT EDIT\n")
 c.write("#[link(name=\"run_pass_stage2\", vers=\"0.1\")];\n")
 c.write("#[feature(globs, macro_rules, struct_variant, managed_boxes)];\n")
-c.write("#[allow(attribute_usage)];\n")
 for t in stage2_tests:
     p = os.path.join(run_pass, t)
     p = p.replace("\\", "\\\\")
-    c.write("#[path = \"%s\"]" % p)
+    c.write("#[path = \"%s\"]" % p);
     c.write("pub mod t_%d;\n" % i)
     i += 1
 c.close()
@@ -60,10 +56,10 @@ def scrub(b):
 d.write("extern mod extra;\n")
 d.write("extern mod run_pass_stage2;\n")
 d.write("use run_pass_stage2::*;\n")
-d.write("use std::io;\n")
-d.write("use std::io::Writer;\n")
-d.write("fn main() {\n")
-d.write("    let mut out = io::stdout();\n")
+d.write("use std::io;\n");
+d.write("use std::io::Writer;\n");
+d.write("fn main() {\n");
+d.write("    let mut out = io::stdout();\n");
 i = 0
 for t in stage2_tests:
     p = os.path.join("test", "run-pass", t)

branches/try/src/librustuv/addrinfo.rs

@@ -184,14 +184,14 @@ pub fn accum_addrinfo(addr: &Addrinfo) -> ~[ai::Info] {
     }
 }
 
-// cannot give tcp/ip permission without help of apk
-#[cfg(test, not(target_os="android"))]
+#[cfg(test)]
 mod test {
     use std::io::net::ip::{SocketAddr, Ipv4Addr};
     use super::*;
     use super::super::local_loop;
 
     #[test]
+    #[ignore(cfg(target_os="android"))] // cannot give tcp/ip permission without help of apk
     fn getaddrinfo_test() {
         match GetAddrInfoRequest::run(local_loop(), Some("localhost"), None, None) {
             Ok(infos) => {
@@ -208,12 +208,4 @@ mod test {
             Err(e) => fail!("{:?}", e),
         }
     }
-
-    #[test]
-    fn issue_10663() {
-        // Something should happen here, but this certainly shouldn't cause
-        // everything to die. The actual outcome we don't care too much about.
-        GetAddrInfoRequest::run(local_loop(), Some("irc.n0v4.com"), None,
-                                None);
-    }
 }

branches/try/src/librustuv/net.rs

@@ -59,17 +59,12 @@ pub fn sockaddr_to_socket_addr(addr: *sockaddr) -> SocketAddr {
             fail!("unknown address?");
         };
         let ip_name = {
-            // apparently there's an off-by-one in libuv?
-            let ip_size = ip_size + 1;
             let buf = vec::from_elem(ip_size + 1 /*null terminated*/, 0u8);
             let buf_ptr = vec::raw::to_ptr(buf);
-            let ret = if uvll::rust_is_ipv4_sockaddr(addr) == 1 {
-                uvll::uv_ip4_name(addr, buf_ptr as *c_char, ip_size as size_t)
+            if uvll::rust_is_ipv4_sockaddr(addr) == 1 {
+                uvll::uv_ip4_name(addr, buf_ptr as *c_char, ip_size as size_t);
             } else {
-                uvll::uv_ip6_name(addr, buf_ptr as *c_char, ip_size as size_t)
-            };
-            if ret != 0 {
-                fail!("error parsing sockaddr: {}", UvError(ret).desc());
+                uvll::uv_ip6_name(addr, buf_ptr as *c_char, ip_size as size_t);
             }
             buf
         };

branches/try/src/test/auxiliary/cci_impl_lib.rs

@@ -11,12 +11,12 @@
 #[link(name="cci_impl_lib", vers="0.0")];
 
 trait uint_helpers {
-    fn to(&self, v: uint, f: &fn(uint));
+    fn to(&self, v: uint, f: |uint|);
 }
 
 impl uint_helpers for uint {
     #[inline]
-    fn to(&self, v: uint, f: &fn(uint)) {
+    fn to(&self, v: uint, f: |uint|) {
         let mut i = *self;
         while i < v {
             f(i);

branches/try/src/test/auxiliary/cci_iter_lib.rs

@@ -11,7 +11,7 @@
 #[link(name="cci_iter_lib", vers="0.0")];
 
 #[inline]
-pub fn iter<T>(v: &[T], f: &fn(&T)) {
+pub fn iter<T>(v: &[T], f: |&T|) {
     let mut i = 0u;
     let n = v.len();
     while i < n {

branches/try/src/test/auxiliary/cci_no_inline_lib.rs

@@ -11,7 +11,7 @@
 #[link(name="cci_no_inline_lib", vers="0.0")];
 
 // same as cci_iter_lib, more-or-less, but not marked inline
-pub fn iter(v: ~[uint], f: &fn(uint)) {
+pub fn iter(v: ~[uint], f: |uint|) {
     let mut i = 0u;
     let n = v.len();
     while i < n {

branches/try/src/test/bench/core-map.rs

@@ -19,7 +19,7 @@ use std::trie::TrieMap;
 use std::uint;
 use std::vec;
 
-fn timed(label: &str, f: &fn()) {
+fn timed(label: &str, f: ||) {
     let start = time::precise_time_s();
     f();
     let end = time::precise_time_s();

branches/try/src/test/bench/core-set.rs

@@ -27,7 +27,7 @@ struct Results {
     delete_strings: f64
 }
 
-fn timed(result: &mut f64, op: &fn()) {
+fn timed(result: &mut f64, op: ||) {
     let start = extra::time::precise_time_s();
     op();
     let end = extra::time::precise_time_s();
@@ -36,13 +36,12 @@ fn timed(result: &mut f64, op: &fn()) {
 
 impl Results {
     pub fn bench_int<T:MutableSet<uint>,
-                 R: rand::Rng>(
-                 &mut self,
-                 rng: &mut R,
-                 num_keys: uint,
-                 rand_cap: uint,
-                 f: &fn() -> T) {
-        {
+                     R: rand::Rng>(
+                     &mut self,
+                     rng: &mut R,
+                     num_keys: uint,
+                     rand_cap: uint,
+                     f: || -> T) { {
             let mut set = f();
             do timed(&mut self.sequential_ints) {
                 for i in range(0u, num_keys) {
@@ -79,11 +78,11 @@ impl Results {
     }
 
     pub fn bench_str<T:MutableSet<~str>,
-                 R:rand::Rng>(
-                 &mut self,
-                 rng: &mut R,
-                 num_keys: uint,
-                 f: &fn() -> T) {
+                     R:rand::Rng>(
+                     &mut self,
+                     rng: &mut R,
+                     num_keys: uint,
+                     f: || -> T) {
         {
             let mut set = f();
             do timed(&mut self.sequential_strings) {

branches/try/src/test/bench/core-std.rs

@@ -40,7 +40,7 @@ fn main() {
     bench!(argv, is_utf8_multibyte);
 }
 
-fn maybe_run_test(argv: &[~str], name: ~str, test: &fn()) {
+fn maybe_run_test(argv: &[~str], name: ~str, test: ||) {
     let mut run_test = false;
 
     if os::getenv("RUST_BENCH").is_some() {

branches/try/src/test/bench/shootout-k-nucleotide-pipes.rs

@@ -104,8 +104,7 @@ fn update_freq(mm: &mut HashMap<~[u8], uint>, key: &[u8]) {
 // given a ~[u8], for each window call a function
 // i.e., for "hello" and windows of size four,
 // run it("hell") and it("ello"), then return "llo"
-fn windows_with_carry(bb: &[u8], nn: uint,
-                      it: &fn(window: &[u8])) -> ~[u8] {
+fn windows_with_carry(bb: &[u8], nn: uint, it: |window: &[u8]|) -> ~[u8] {
    let mut ii = 0u;
 
    let len = bb.len();

branches/try/src/test/bench/shootout-k-nucleotide.rs

@@ -154,7 +154,7 @@ impl Table {
         }
     }
 
-    fn each(&self, f: &fn(entry: &Entry) -> bool) {
+    fn each(&self, f: |entry: &Entry| -> bool) {
         for self.items.each |item| {
             match *item {
                 None => {}

branches/try/src/test/compile-fail/access-mode-in-closures.rs

@@ -11,7 +11,7 @@
 
 struct sty(~[int]);
 
-fn unpack(_unpack: &fn(v: &sty) -> ~[int]) {}
+fn unpack(_unpack: |v: &sty| -> ~[int]) {}
 
 fn main() {
     let _foo = unpack(|s| {

branches/try/src/test/compile-fail/block-coerce-no-2.rs

@@ -15,7 +15,7 @@ fn main() {
     fn f(f: extern fn(extern fn(extern fn()))) {
     }
 
-    fn g(f: extern fn(&fn())) {
+    fn g(f: extern fn(||)) {
     }
 
     f(g);

branches/try/src/test/compile-fail/block-coerce-no.rs

@@ -11,9 +11,9 @@
 // Make sure that fn-to-block coercion isn't incorrectly lifted over
 // other tycons.
 
-fn coerce(b: &fn()) -> extern fn() {
-    fn lol(f: extern fn(v: &fn()) -> extern fn(),
-           g: &fn()) -> extern fn() { return f(g); }
+fn coerce(b: ||) -> extern fn() {
+    fn lol(f: extern fn(v: ||) -> extern fn(),
+           g: ||) -> extern fn() { return f(g); }
     fn fn_id(f: extern fn()) -> extern fn() { return f }
     return lol(fn_id, b);
     //~^ ERROR mismatched types

branches/try/src/test/compile-fail/borrowck-assign-comp-idx.rs

@@ -24,7 +24,7 @@ fn a() {
     info!("{}", *q);
 }
 
-fn borrow(_x: &[int], _f: &fn()) {}
+fn borrow(_x: &[int], _f: ||) {}
 
 fn b() {
     // here we alias the mutable vector into an imm slice and try to

branches/try/src/test/compile-fail/borrowck-autoref-3261.rs

@@ -11,7 +11,7 @@
 struct X(Either<(uint,uint),extern fn()>);
 
 impl X {
-    pub fn with(&self, blk: &fn(x: &Either<(uint,uint),extern fn()>)) {
+    pub fn with(&self, blk: |x: &Either<(uint,uint),extern fn()>|) {
         blk(&**self)
     }
 }

branches/try/src/test/compile-fail/borrowck-insert-during-each.rs

@@ -15,7 +15,7 @@ struct Foo {
 }
 
 impl Foo {
-    pub fn foo(&mut self, fun: &fn(&int)) {
+    pub fn foo(&mut self, fun: |&int|) {
         for f in self.n.iter() {
             fun(f);
         }

branches/try/src/test/compile-fail/borrowck-lend-flow-if.rs

@@ -17,7 +17,7 @@
 fn borrow(_v: &int) {}
 fn borrow_mut(_v: &mut int) {}
 fn cond() -> bool { fail!() }
-fn for_func(_f: &fn() -> bool) { fail!() }
+fn for_func(_f: || -> bool) { fail!() }
 fn produce<T>() -> T { fail!(); }
 
 fn inc(v: &mut ~int) {

branches/try/src/test/compile-fail/borrowck-lend-flow-loop.rs

@@ -111,7 +111,7 @@ fn while_aliased_mut_cond(cond: bool, cond2: bool) {
     }
 }
 
-fn loop_break_pops_scopes<'r>(_v: &'r mut [uint], f: &fn(&'r mut uint) -> bool) {
+fn loop_break_pops_scopes<'r>(_v: &'r mut [uint], f: |&'r mut uint| -> bool) {
     // Here we check that when you break out of an inner loop, the
     // borrows that go out of scope as you exit the inner loop are
     // removed from the bitset.
@@ -127,7 +127,7 @@ fn loop_break_pops_scopes<'r>(_v: &'r mut [uint], f: &fn(&'r mut uint) -> bool)
     }
 }
 
-fn loop_loop_pops_scopes<'r>(_v: &'r mut [uint], f: &fn(&'r mut uint) -> bool) {
+fn loop_loop_pops_scopes<'r>(_v: &'r mut [uint], f: |&'r mut uint| -> bool) {
     // Similar to `loop_break_pops_scopes` but for the `loop` keyword
 
     while cond() {

branches/try/src/test/compile-fail/borrowck-lend-flow.rs

@@ -17,7 +17,7 @@
 fn borrow(_v: &int) {}
 fn borrow_mut(_v: &mut int) {}
 fn cond() -> bool { fail!() }
-fn for_func(_f: &fn() -> bool) { fail!() }
+fn for_func(_f: || -> bool) { fail!() }
 fn produce<T>() -> T { fail!(); }
 
 fn inc(v: &mut ~int) {

branches/try/src/test/compile-fail/borrowck-loan-blocks-move-cc.rs

@@ -10,7 +10,7 @@
 
 use std::task;
 
-fn borrow(v: &int, f: &fn(x: &int)) {
+fn borrow(v: &int, f: |x: &int|) {
     f(v);
 }
 

branches/try/src/test/compile-fail/borrowck-loan-blocks-mut-uniq.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn borrow(v: &int, f: &fn(x: &int)) {
+fn borrow(v: &int, f: |x: &int|) {
     f(v);
 }
 

branches/try/src/test/compile-fail/borrowck-loan-rcvr.rs

@@ -12,14 +12,14 @@ struct point { x: int, y: int }
 
 trait methods {
     fn impurem(&self);
-    fn blockm(&self, f: &fn());
+    fn blockm(&self, f: ||);
 }
 
 impl methods for point {
     fn impurem(&self) {
     }
 
-    fn blockm(&self, f: &fn()) { f() }
+    fn blockm(&self, f: ||) { f() }
 }
 
 fn a() {

branches/try/src/test/compile-fail/borrowck-loan-vec-content.rs

@@ -12,7 +12,7 @@
 // (locally rooted) mutable, unique vector, and that we then prevent
 // modifications to the contents.
 
-fn takes_imm_elt(_v: &int, f: &fn()) {
+fn takes_imm_elt(_v: &int, f: ||) {
     f();
 }
 

branches/try/src/test/compile-fail/borrowck-move-in-irrefut-pat.rs

@@ -1,4 +1,4 @@
-fn with(f: &fn(&~str)) {}
+fn with(f: |&~str|) {}
 
 fn arg_item(&_x: &~str) {}
     //~^ ERROR cannot move out of dereference of & pointer

branches/try/src/test/compile-fail/closure-bounds-not-builtin.rs

@@ -1,7 +1,7 @@
 
 trait Foo {}
 
-fn take(f: &fn:Foo()) {
+fn take(f: ||:Foo) {
     //~^ ERROR only the builtin traits can be used as closure or object bounds
 }