auto merge of #9114 : sfackler/rust/flush-fix, r=brson

bors · bors · commit 03ca1befb31e · 2013-09-11T23:11:04.000-07:00
diff --git a/src/libstd/rt/io/net/tcp.rs b/src/libstd/rt/io/net/tcp.rs
@@ -93,7 +93,7 @@ impl Writer for TcpStream {
         }
     }
 
-    fn flush(&mut self) { fail!() }
+    fn flush(&mut self) { /* no-op */ }
 }
 
 pub struct TcpListener(~RtioTcpListenerObject);

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ impl Writer for TcpStream {`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
`96`		`- fn flush(&mut self) { fail!() }`
	`96`	`+ fn flush(&mut self) { /* no-op */ }`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`pub struct TcpListener(~RtioTcpListenerObject);`