---

alexcrichton · alexcrichton · commit 8868ad9383ac · 2014-02-03T09:32:34.000-08:00
yaml --- r: 148853 b: refs/heads/try2 c: 5878b1b h: refs/heads/master i: 148851: 1d4f3b6 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: 2053b695953e530ebddeba2b8c7547858bc2e43d
+refs/heads/try2: 5878b1b76bee774b6d2f2f368ce216d9084d731c
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/libnative/io/file.rs b/branches/try2/src/libnative/io/file.rs
@@ -111,17 +111,14 @@ impl FileDesc {
 }
 
 impl io::Reader for FileDesc {
-    fn read(&mut self, buf: &mut [u8]) -> Option<uint> {
-        match self.inner_read(buf) { Ok(n) => Some(n), Err(..) => None }
+    fn read(&mut self, buf: &mut [u8]) -> io::IoResult<uint> {
+        self.inner_read(buf)
     }
 }
 
 impl io::Writer for FileDesc {
-    fn write(&mut self, buf: &[u8]) {
-        match self.inner_write(buf) {
-            Ok(()) => {}
-            Err(e) => { io::io_error::cond.raise(e); }
-        }
+    fn write(&mut self, buf: &[u8]) -> io::IoResult<()> {
+        self.inner_write(buf)
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -111,17 +111,14 @@ impl FileDesc {`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`impl io::Reader for FileDesc {`
`114`		`- fn read(&mut self, buf: &mut [u8]) -> Option<uint> {`
`115`		`- match self.inner_read(buf) { Ok(n) => Some(n), Err(..) => None }`
	`114`	`+ fn read(&mut self, buf: &mut [u8]) -> io::IoResult<uint> {`
	`115`	`+ self.inner_read(buf)`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`impl io::Writer for FileDesc {`
`120`		`- fn write(&mut self, buf: &[u8]) {`
`121`		`- match self.inner_write(buf) {`
`122`		`- Ok(()) => {}`
`123`		`- Err(e) => { io::io_error::cond.raise(e); }`
`124`		`- }`
	`120`	`+ fn write(&mut self, buf: &[u8]) -> io::IoResult<()> {`
	`121`	`+ self.inner_write(buf)`
`125`	`122`	`}`
`126`	`123`	`}`
`127`	`124`