---

yaml
---
r: 141005
b: refs/heads/try2
c: d951da8
h: refs/heads/master
i:
  141003: 3b1ff36
v: v3

Author: brson

[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: 2bc1e6ba606e3f08a49bbadc556558cb42b7ea32
+refs/heads/try2: d951da82768685cacba7444dae10ede2a71efedb
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libcore/rt/io/mod.rs

@@ -348,7 +348,8 @@ pub enum IoErrorKind {
     ConnectionFailed,
     Closed,
     ConnectionRefused,
-    ConnectionReset
+    ConnectionReset,
+    BrokenPipe
 }
 
 // XXX: Can't put doc comments on macros

branches/try2/src/libcore/rt/io/net/tcp.rs

@@ -233,7 +233,8 @@ mod test {
                 loop {
                     let mut stop = false;
                     do io_error::cond.trap(|e| {
-                        assert!(e.kind == ConnectionReset);
+                        // NB: ECONNRESET on linux, EPIPE on mac
+                        assert!(e.kind == ConnectionReset || e.kind == BrokenPipe);
                         stop = true;
                     }).in {
                         stream.write(buf);

branches/try2/src/libcore/rt/uv/mod.rs

@@ -272,7 +272,9 @@ pub fn uv_error_to_io_error(uverr: UvError) -> IoError {
             EACCES => PermissionDenied,
             ECONNREFUSED => ConnectionRefused,
             ECONNRESET => ConnectionReset,
-            _ => {
+            EPIPE => BrokenPipe,
+            e => {
+                rtdebug!("e %u", e as uint);
                 // XXX: Need to map remaining uv error types
                 OtherIoError
             }

branches/try2/src/libcore/rt/uv/uvll.rs

@@ -40,6 +40,7 @@ pub static EADDRINFO: c_int = 2;
 pub static EACCES: c_int = 3;
 pub static ECONNREFUSED: c_int = 12;
 pub static ECONNRESET: c_int = 13;
+pub static EPIPE: c_int = 36;
 
 pub struct uv_err_t {
     code: c_int,