---

alexcrichton · alexcrichton · commit e8ff0fec7403 · 2014-02-03T09:32:34.000-08:00
yaml --- r: 102607 b: refs/heads/auto c: 5878b1b h: refs/heads/master i: 102605: 5aff409 102603: 2587788 102599: c670bff 102591: fdf3c7c v: v3
diff --git a/[refs] b/[refs]
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 2053b695953e530ebddeba2b8c7547858bc2e43d
+refs/heads/auto: 5878b1b76bee774b6d2f2f368ce216d9084d731c
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
diff --git a/branches/auto/src/libnative/io/file.rs b/branches/auto/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`