---

olsonjeffery · olsonjeffery · commit f1a4db3278fb · 2013-09-17T08:01:44.000-07:00
yaml --- r: 145214 b: refs/heads/try2 c: 3067ee6 h: refs/heads/master v: v3
diff --git a/[refs] b/[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: c0ec40f74bd33317fb0af76a68d29bfbaf211b58
+refs/heads/try2: 3067ee6373fd956c8659cba51c69a474f8e71219
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/libstd/rt/rtio.rs b/branches/try2/src/libstd/rt/rtio.rs
@@ -81,11 +81,6 @@ pub trait IoFactory {
         Result<~[Path], IoError>;
 }
 
-pub trait RtioStream {
-    fn read(&mut self, buf: &mut [u8]) -> Result<uint, IoError>;
-    fn write(&mut self, buf: &[u8]) -> Result<(), IoError>;
-}
-
 pub trait RtioTcpListener : RtioSocket {
     fn listen(self) -> Result<~RtioTcpAcceptorObject, IoError>;
 }

Original file line number	Diff line number	Diff line change
`@@ -81,11 +81,6 @@ pub trait IoFactory {`
`81`	`81`	`Result<~[Path], IoError>;`
`82`	`82`	`}`
`83`	`83`
`84`		`-pub trait RtioStream {`
`85`		`- fn read(&mut self, buf: &mut [u8]) -> Result<uint, IoError>;`
`86`		`- fn write(&mut self, buf: &[u8]) -> Result<(), IoError>;`
`87`		`-}`
`88`		`-`
`89`	`84`	`pub trait RtioTcpListener : RtioSocket {`
`90`	`85`	`fn listen(self) -> Result<~RtioTcpAcceptorObject, IoError>;`
`91`	`86`	`}`