---

bors · bors · commit 7adee2ebb6b2 · 2015-07-21T09:59:18.000Z
yaml --- r: 220766 b: refs/heads/master c: e33b128 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f47d20aecdcd7db34d41ad1666fd3eee095cc943
+refs/heads/master: e33b128e01e1a5a2d23abac5b88274eea5cf9059
 refs/heads/snap-stage3: d4432b37378ec55450e06799f5344b4b0f4b94e0
 refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
diff --git a/trunk/src/libsyntax/diagnostic.rs b/trunk/src/libsyntax/diagnostic.rs
@@ -208,6 +208,10 @@ impl Handler {
     }
     pub fn fatal(&self, msg: &str) -> ! {
         self.emit.borrow_mut().emit(None, msg, None, Fatal);
+
+        // Suppress the fatal error message from the panic below as we've
+        // already terminated in our own "legitimate" fashion.
+        io::set_panic(Box::new(io::sink()));
         panic!(FatalError);
     }
     pub fn err(&self, msg: &str) {
diff --git a/trunk/src/libsyntax/lib.rs b/trunk/src/libsyntax/lib.rs
@@ -32,6 +32,7 @@
 #![feature(libc)]
 #![feature(ref_slice)]
 #![feature(rustc_private)]
+#![feature(set_stdio)]
 #![feature(staged_api)]
 #![feature(str_char)]
 #![feature(str_escape)]

Original file line number	Diff line number	Diff line change
`@@ -208,6 +208,10 @@ impl Handler {`
`208`	`208`	`}`
`209`	`209`	`pub fn fatal(&self, msg: &str) -> ! {`
`210`	`210`	`self.emit.borrow_mut().emit(None, msg, None, Fatal);`
	`211`	`+`
	`212`	`+ // Suppress the fatal error message from the panic below as we've`
	`213`	`+ // already terminated in our own "legitimate" fashion.`
	`214`	`+ io::set_panic(Box::new(io::sink()));`
`211`	`215`	`panic!(FatalError);`
`212`	`216`	`}`
`213`	`217`	`pub fn err(&self, msg: &str) {`