---

yaml
---
r: 146871
b: refs/heads/try2
c: e9a1869
h: refs/heads/master
i:
  146869: c5612ee
  146867: 64f92c9
  146863: 3e458d7
v: v3

Author: bors

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 9521551b4710805674ad6c1755bef4e76784db02
+refs/heads/try2: e9a1869a5f4164d5311963b1b25b05f003d43699
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -5,25 +5,28 @@
 # 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, os, re, codecs
+import sys
+import os
+import 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
@@ -41,10 +44,11 @@ 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()
@@ -56,10 +60,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/try2/src/librustuv/addrinfo.rs

@@ -184,14 +184,14 @@ pub fn accum_addrinfo(addr: &Addrinfo) -> ~[ai::Info] {
     }
 }
 
-#[cfg(test)]
+// cannot give tcp/ip permission without help of apk
+#[cfg(test, not(target_os="android"))]
 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,4 +208,12 @@ 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/try2/src/librustuv/net.rs

@@ -59,12 +59,17 @@ 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);
-            if uvll::rust_is_ipv4_sockaddr(addr) == 1 {
-                uvll::uv_ip4_name(addr, buf_ptr as *c_char, ip_size as size_t);
+            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)
             } else {
-                uvll::uv_ip6_name(addr, buf_ptr as *c_char, ip_size as size_t);
+                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());
             }
             buf
         };