---

catamorphism · catamorphism · commit 57d0d26015bc · 2012-07-26T17:06:09.000-07:00
yaml --- r: 31452 b: refs/heads/dist-snap c: c60a6b9 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 74d60a619a21e7992e58d7544d69c4e1219dd6b1
+refs/heads/dist-snap: c60a6b93fbb11751dfb411ee2909fa85644fe76f
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/dist-snap/src/libcore/io.rs b/branches/dist-snap/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 {`