---

alexcrichton · alexcrichton · commit 5cd96d3035d2 · 2014-02-03T09:32:34.000-08:00
yaml --- r: 107935 b: refs/heads/dist-snap c: e0f0a2f h: refs/heads/master i: 107933: ae0a1fd 107931: a793674 107927: e275352 107919: 7423f43 107903: 49283b9 v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 5878b1b76bee774b6d2f2f368ce216d9084d731c
+refs/heads/dist-snap: e0f0a2f67f6bb66626bb3b7624e7bdb0198a1c47
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
diff --git a/branches/dist-snap/src/librustuv/macros.rs b/branches/dist-snap/src/librustuv/macros.rs
@@ -33,14 +33,15 @@ pub fn dumb_println(args: &fmt::Arguments) {
 
     struct Stderr;
     impl io::Writer for Stderr {
-        fn write(&mut self, data: &[u8]) {
+        fn write(&mut self, data: &[u8]) -> io::IoResult<()> {
             unsafe {
                 libc::write(libc::STDERR_FILENO,
                             data.as_ptr() as *libc::c_void,
                             data.len() as libc::size_t);
             }
+            Ok(()) // just ignore the errors
         }
     }
     let mut w = Stderr;
-    fmt::writeln(&mut w as &mut io::Writer, args);
+    let _ = fmt::writeln(&mut w as &mut io::Writer, args);
 }

Original file line number	Diff line number	Diff line change
`@@ -33,14 +33,15 @@ pub fn dumb_println(args: &fmt::Arguments) {`
`33`	`33`
`34`	`34`	`struct Stderr;`
`35`	`35`	`impl io::Writer for Stderr {`
`36`		`- fn write(&mut self, data: &[u8]) {`
	`36`	`+ fn write(&mut self, data: &[u8]) -> io::IoResult<()> {`
`37`	`37`	`unsafe {`
`38`	`38`	`libc::write(libc::STDERR_FILENO,`
`39`	`39`	`data.as_ptr() as *libc::c_void,`
`40`	`40`	`data.len() as libc::size_t);`
`41`	`41`	`}`
	`42`	`+ Ok(()) // just ignore the errors`
`42`	`43`	`}`
`43`	`44`	`}`
`44`	`45`	`let mut w = Stderr;`
`45`		`- fmt::writeln(&mut w as &mut io::Writer, args);`
	`46`	`+ let _ = fmt::writeln(&mut w as &mut io::Writer, args);`
`46`	`47`	`}`