---

catamorphism · catamorphism · commit 514bfa963c38 · 2012-07-26T17:06:09.000-07:00
yaml --- r: 20682 b: refs/heads/snap-stage3 c: c60a6b9 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 74d60a619a21e7992e58d7544d69c4e1219dd6b1
+refs/heads/snap-stage3: c60a6b93fbb11751dfb411ee2909fa85644fe76f
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
diff --git a/branches/snap-stage3/src/libcore/io.rs b/branches/snap-stage3/src/libcore/io.rs
@@ -371,10 +371,8 @@ impl of writer for *libc::FILE {
     fn flush() -> int { libc::fflush(self) as int }
     fn get_type() -> writer_type {
         let fd = libc::fileno(self);
-        if libc::isatty(fd) == 0 {
-            ret file;
-        }
-        ret screen;
+        if libc::isatty(fd) == 0 { file   }
+        else                     { screen }
     }
 }
 
@@ -661,7 +659,7 @@ impl of writer for mem_buffer {
     }
     fn tell() -> uint { self.pos }
     fn flush() -> int { 0 }
-    fn get_type() -> writer_type { ret file }
+    fn get_type() -> writer_type { file }
 }
 
 fn mem_buffer() -> mem_buffer {

Original file line number	Diff line number	Diff line change
`@@ -371,10 +371,8 @@ impl of writer for *libc::FILE {`
`371`	`371`	`fn flush() -> int { libc::fflush(self) as int }`
`372`	`372`	`fn get_type() -> writer_type {`
`373`	`373`	`let fd = libc::fileno(self);`
`374`		`- if libc::isatty(fd) == 0 {`
`375`		`- ret file;`
`376`		`- }`
`377`		`- ret screen;`
	`374`	`+ if libc::isatty(fd) == 0 { file }`
	`375`	`+ else { screen }`
`378`	`376`	`}`
`379`	`377`	`}`
`380`	`378`
`@@ -661,7 +659,7 @@ impl of writer for mem_buffer {`
`661`	`659`	`}`
`662`	`660`	`fn tell() -> uint { self.pos }`
`663`	`661`	`fn flush() -> int { 0 }`
`664`		`- fn get_type() -> writer_type { ret file }`
	`662`	`+ fn get_type() -> writer_type { file }`
`665`	`663`	`}`
`666`	`664`
`667`	`665`	`fn mem_buffer() -> mem_buffer {`