about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-09-11 23:11:04 -0700
committerbors <bors@rust-lang.org>2013-09-11 23:11:04 -0700
commit03ca1befb31e711fa6ed74e1dd454c5be55694c4 (patch)
tree6ee79499681bf693ad192f371ed5d7fa14ca002e /src/libstd
parent62166611e7510b86f395dbf19973e442fd43c403 (diff)
parent412ab495572f9ae484638198d6938ed144c52cff (diff)
downloadrust-03ca1befb31e711fa6ed74e1dd454c5be55694c4.tar.gz
rust-03ca1befb31e711fa6ed74e1dd454c5be55694c4.zip
auto merge of #9114 : sfackler/rust/flush-fix, r=brson
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/rt/io/net/tcp.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/rt/io/net/tcp.rs b/src/libstd/rt/io/net/tcp.rs
index 9f8b680b83f..be8a051a066 100644
--- 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);