---

lkuper · lkuper · commit 5b86947caac5 · 2012-06-06T14:51:13.000-07:00
yaml --- r: 13284 b: refs/heads/master c: cba77ff h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 9e3e57c58bebe1f8d6872c62be8f8b697846109b
+refs/heads/master: cba77ffbfa469727314f65405117277839a1783b
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
diff --git a/trunk/src/libsyntax/diagnostic.rs b/trunk/src/libsyntax/diagnostic.rs
@@ -86,11 +86,14 @@ impl codemap_handler of handler for handler_t {
     }
     fn has_errors() -> bool { self.err_count > 0u }
     fn abort_if_errors() {
-        if self.err_count > 0u {
-            let s = #fmt["aborting due to %u previous errors",
-                         self.err_count];
-            self.fatal(s);
+        let s;
+        alt self.err_count {
+          0u { ret; }
+          1u { s = "aborting due to previous error"; }
+          _  { s = #fmt["aborting due to %u previous errors",
+                        self.err_count]; }
         }
+        self.fatal(s);
     }
     fn warn(msg: str) {
         self.emit(none, msg, warning);

Original file line number	Diff line number	Diff line change
`@@ -86,11 +86,14 @@ impl codemap_handler of handler for handler_t {`
`86`	`86`	`}`
`87`	`87`	`fn has_errors() -> bool { self.err_count > 0u }`
`88`	`88`	`fn abort_if_errors() {`
`89`		`- if self.err_count > 0u {`
`90`		`- let s = #fmt["aborting due to %u previous errors",`
`91`		`- self.err_count];`
`92`		`- self.fatal(s);`
	`89`	`+ let s;`
	`90`	`+ alt self.err_count {`
	`91`	`+ 0u { ret; }`
	`92`	`+ 1u { s = "aborting due to previous error"; }`
	`93`	`+ _ { s = #fmt["aborting due to %u previous errors",`
	`94`	`+ self.err_count]; }`
`93`	`95`	`}`
	`96`	`+ self.fatal(s);`
`94`	`97`	`}`
`95`	`98`	`fn warn(msg: str) {`
`96`	`99`	`self.emit(none, msg, warning);`