---

yaml
---
r: 120423
b: refs/heads/dist-snap
c: ce11f19
h: refs/heads/master
i:
  120421: e54154f
  120419: 955c065
  120415: a92bada
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 1813e5aa1a03b0596b8de7abd1af31edf5d6098f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 78bc758c94ae9c99b8e4e82f7d18b6733c8eb949
+refs/heads/dist-snap: ce11f19695f0615bdb9de3702519920584c6102d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustuv/lib.rs

@@ -353,21 +353,21 @@ impl Loop {
 pub struct UvError(c_int);
 
 impl UvError {
-    pub fn name(&self) -> ~str {
+    pub fn name(&self) -> StrBuf {
         unsafe {
             let inner = match self { &UvError(a) => a };
             let name_str = uvll::uv_err_name(inner);
             assert!(name_str.is_not_null());
-            from_c_str(name_str)
+            from_c_str(name_str).to_strbuf()
         }
     }
 
-    pub fn desc(&self) -> ~str {
+    pub fn desc(&self) -> StrBuf {
         unsafe {
             let inner = match self { &UvError(a) => a };
             let desc_str = uvll::uv_strerror(inner);
             assert!(desc_str.is_not_null());
-            from_c_str(desc_str)
+            from_c_str(desc_str).to_strbuf()
         }
     }
 

branches/dist-snap/src/librustuv/net.rs

@@ -851,15 +851,15 @@ mod test {
     fn connect_close_ip4() {
         match TcpWatcher::connect(local_loop(), next_test_ip4(), None) {
             Ok(..) => fail!(),
-            Err(e) => assert_eq!(e.name(), "ECONNREFUSED".to_owned()),
+            Err(e) => assert_eq!(e.name(), "ECONNREFUSED".to_strbuf()),
         }
     }
 
     #[test]
     fn connect_close_ip6() {
         match TcpWatcher::connect(local_loop(), next_test_ip6(), None) {
             Ok(..) => fail!(),
-            Err(e) => assert_eq!(e.name(), "ECONNREFUSED".to_owned()),
+            Err(e) => assert_eq!(e.name(), "ECONNREFUSED".to_strbuf()),
         }
     }
 

branches/dist-snap/src/librustuv/pipe.rs

@@ -338,7 +338,7 @@ mod tests {
     fn bind_err() {
         match PipeListener::bind(local_loop(), &"path/to/nowhere".to_c_str()) {
             Ok(..) => fail!(),
-            Err(e) => assert_eq!(e.name(), "EACCES".to_owned()),
+            Err(e) => assert_eq!(e.name(), "EACCES".to_strbuf()),
         }
     }