---

lkuper · lkuper · commit 21da96f77836 · 2012-06-05T10:08:32.000-07:00
yaml --- r: 13256 b: refs/heads/master c: 1a3b8fc h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 99d6807ee009b0289d5a1ae46385d251e4f0da64
+refs/heads/master: 1a3b8fc43c8974c5f6238095b1bb0077a3b2c348
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
diff --git a/trunk/src/compiletest/runtest.rs b/trunk/src/compiletest/runtest.rs
@@ -266,7 +266,7 @@ fn check_expected_errors(expected_errors: [errors::expected_error],
         }
 
         // ignore this msg which gets printed at the end
-        if str::contains(line, "aborting due to previous errors") {
+        if str::contains(line, "aborting due to") {
             was_expected = true;
         }
 
diff --git a/trunk/src/libsyntax/diagnostic.rs b/trunk/src/libsyntax/diagnostic.rs
@@ -87,7 +87,9 @@ 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 {
-            self.fatal("aborting due to previous errors");
+            let s = #fmt["aborting due to %u previous errors",
+                         self.err_count];
+            self.fatal(s);
         }
     }
     fn warn(msg: str) {

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ fn check_expected_errors(expected_errors: [errors::expected_error],`
`266`	`266`	`}`
`267`	`267`
`268`	`268`	`// ignore this msg which gets printed at the end`
`269`		`- if str::contains(line, "aborting due to previous errors") {`
	`269`	`+ if str::contains(line, "aborting due to") {`
`270`	`270`	`was_expected = true;`
`271`	`271`	`}`
`272`	`272`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,9 @@ impl codemap_handler of handler for handler_t {`
`87`	`87`	`fn has_errors() -> bool { self.err_count > 0u }`
`88`	`88`	`fn abort_if_errors() {`
`89`	`89`	`if self.err_count > 0u {`
`90`		`- self.fatal("aborting due to previous errors");`
	`90`	`+ let s = #fmt["aborting due to %u previous errors",`
	`91`	`+ self.err_count];`
	`92`	`+ self.fatal(s);`
`91`	`93`	`}`
`92`	`94`	`}`
`93`	`95`	`fn warn(msg: str) {`