Only report Self: Sized violation once.

src/compiletest/runtest.rs

@@ -881,20 +881,28 @@ fn check_error_patterns(props: &TestProps,
     }
     let mut next_err_idx = 0;
     let mut next_err_pat = &props.error_patterns[next_err_idx];
-    let mut done = false;
-    for line in output_to_check.lines() {
+    let mut matched_all_patterns = false;
+    let mut lines = output_to_check.lines();
+    for line in &mut lines {
         if line.contains(next_err_pat) {
             debug!("found error pattern {}", next_err_pat);
             next_err_idx += 1;
             if next_err_idx == props.error_patterns.len() {
-                debug!("found all error patterns");
-                done = true;
+                matched_all_patterns = true;
                 break;
             }
             next_err_pat = &props.error_patterns[next_err_idx];
         }
     }
-    if done { return; }
+
+    if matched_all_patterns {
+        if lines.next().is_none() {
+            debug!("found all error patterns");
+            return;
+        } else {
+            fatal_proc_rec("no more error patterns to match against", proc_res);
+        }
+    }
 
     let missing_patterns = &props.error_patterns[next_err_idx..];
     if missing_patterns.len() == 1 {

src/librustc/middle/traits/object_safety.rs

@@ -79,9 +79,15 @@ pub fn object_safety_violations<'tcx>(tcx: &ty::ctxt<'tcx>,
                                       trait_def_id: ast::DefId)
                                       -> Vec<ObjectSafetyViolation<'tcx>>
 {
-    traits::supertrait_def_ids(tcx, trait_def_id)
+    let mut violations: Vec<_> = traits::supertrait_def_ids(tcx, trait_def_id)
         .flat_map(|def_id| object_safety_violations_for_trait(tcx, def_id))
-        .collect()
+        .collect();
+
+    if trait_has_sized_self(tcx, trait_def_id) {
+        violations.push(ObjectSafetyViolation::SizedSelf);
+    }
+
+    violations
 }
 
 fn object_safety_violations_for_trait<'tcx>(tcx: &ty::ctxt<'tcx>,
@@ -104,9 +110,6 @@ fn object_safety_violations_for_trait<'tcx>(tcx: &ty::ctxt<'tcx>,
         .collect();
 
     // Check the trait itself.
-    if trait_has_sized_self(tcx, trait_def_id) {
-        violations.push(ObjectSafetyViolation::SizedSelf);
-    }
     if supertraits_reference_self(tcx, trait_def_id) {
         violations.push(ObjectSafetyViolation::SupertraitSelf);
     }

src/test/compile-fail-fulldeps/plugin-MacroRulesTT.rs

@@ -1,4 +1,4 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2014-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -11,6 +11,7 @@
 // aux-build:macro_crate_MacroRulesTT.rs
 // ignore-stage1
 // error-pattern: plugin tried to register a new MacroRulesTT
+// error-pattern: aborting due to previous error
 
 #![feature(plugin)]
 #![plugin(macro_crate_MacroRulesTT)]

src/test/compile-fail/arg-count-mismatch.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,8 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: parameters were supplied
-
 fn f(x: isize) { }
 
-fn main() { let i: (); i = f(); }
+fn main() {
+    let i: ();
+    i = f(); //~ ERROR this function takes 1 parameter but 0 parameters were supplied
+}

src/test/compile-fail/arg-type-mismatch.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -9,8 +9,9 @@
 // except according to those terms.
 
 
-// error-pattern: mismatched types
-
 fn f(x: isize) { }
 
-fn main() { let i: (); i = f(()); }
+fn main() {
+    let i: ();
+    i = f(()); //~ ERROR mismatched types
+}

src/test/compile-fail/asm-src-loc-codegen-units.rs

@@ -1,4 +1,4 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2014-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -12,6 +12,8 @@
 // ignore-stage1
 // compile-flags: -C codegen-units=2
 // error-pattern: build without -C codegen-units for more exact errors
+// error-pattern: aborting due to previous error
+// error-pattern: aborting due to worker thread panic
 
 #![feature(asm)]
 

src/test/compile-fail/attr-bad-crate-attr.rc

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: expected item
-
 #![attr = "val"]
 #[attr = "val"] // Unterminated
+//~^ ERROR expected item after attributes

src/test/compile-fail/bad-env-capture.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,9 +8,13 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: can't capture dynamic environment in a fn item;
 fn foo() {
     let x: isize;
-    fn bar() { log(debug, x); }
+    fn bar() {
+        println!("{}", x);
+        //~^ ERROR can't capture dynamic environment in a fn item; use the || { ... } closure
+        // form instead
+        //~| ERROR unresolved name `x`
+    }
 }
 fn main() { foo(); }

src/test/compile-fail/bad-env-capture2.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,8 +8,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: can't capture dynamic environment in a fn item;
 fn foo(x: isize) {
-    fn bar() { log(debug, x); }
+    fn bar() {
+        println!("{}", x);
+        //~^ ERROR can't capture dynamic environment in a fn item; use the || { ... } closure
+        // form instead
+        //~| ERROR unresolved name `x`
+    }
 }
 fn main() { foo(2); }

src/test/compile-fail/bad-env-capture3.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,10 +8,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: can't capture dynamic environment in a fn item;
 fn foo(x: isize) {
     fn mth() {
-        fn bar() { log(debug, x); }
+        fn bar() {
+            println!("{}", x);
+            //~^ ERROR can't capture dynamic environment in a fn item; use the || { ... } closure
+            // form instead
+            //~| ERROR unresolved name `x`
+        }
     }
 }
 

src/test/compile-fail/bad-expr-path.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,8 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: unresolved name `m1::arguments`. Did you mean `arguments`?
-
 mod m1 {}
 
-fn main(arguments: Vec<String>) { log(debug, m1::arguments); }
+fn main(arguments: Vec<String>) {
+    println!("{:?}", m1::arguments);
+    //~^ ERROR unresolved name `m1::arguments`. Did you mean `arguments`?
+}

src/test/compile-fail/bad-expr-path2.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,12 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: unresolved name `m1::arguments`. Did you mean `arguments`?
-
 mod m1 {
     pub mod arguments {}
 }
 
 fn main(arguments: Vec<String>) {
-    log(debug, m1::arguments);
+    println!("{:?}", m1::arguments);
+    //~^ ERROR unresolved name `m1::arguments`. Did you mean `arguments`?
 }

src/test/compile-fail/bad-module.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: unresolved name
-
-fn main() { let foo = thing::len(Vec::new()); }
+fn main() {
+    let foo = thing::len(Vec::new());
+    //~^ ERROR failed to resolve. Use of undeclared type or module `thing`
+    //~| ERROR unresolved name `thing::len`
+}

src/test/compile-fail/binop-bitxor-str.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,6 +8,5 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:`^` cannot be applied to type `collections::string::String`
-
 fn main() { let x = "a".to_string() ^ "b".to_string(); }
+//~^ ERROR binary operation `^` cannot be applied to type `collections::string::String`

src/test/compile-fail/binop-mul-bool.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,6 +8,5 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:`*` cannot be applied to type `bool`
-
 fn main() { let x = true * false; }
+//~^ ERROR binary operation `*` cannot be applied to type `bool`

src/test/compile-fail/bogus-tag.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,15 +8,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-// error-pattern: unresolved
-
 enum color { rgb(isize, isize, isize), rgba(isize, isize, isize, isize), }
 
 fn main() {
-    let red: color = rgb(255, 0, 0);
+    let red: color = rgb(255, 0, 0); //~ ERROR unresolved name `rgb`
     match red {
-      rgb(r, g, b) => { println!("rgb"); }
-      hsl(h, s, l) => { println!("hsl"); }
+      rgb(r, g, b) => { println!("rgb"); } //~ ERROR unresolved enum variant, struct or const `rgb`
+      hsl(h, s, l) => { println!("hsl"); } //~ ERROR unresolved enum variant, struct or const `hsl`
     }
 }

src/test/compile-fail/capture1.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,10 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-// error-pattern: can't capture dynamic environment in a fn item;
-
 fn main() {
     let bar: isize = 5;
     fn foo() -> isize { return bar; }
+    //~^ ERROR can't capture dynamic environment in a fn item; use the || { ... } closure
+    // form instead
+    //~| ERROR unresolved name `bar`
 }

src/test/compile-fail/cast-as-bool.rs

@@ -1,4 +1,4 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2013-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,5 +8,4 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: cannot cast as `bool`, compare with zero instead
-fn main() { let u = (5 as bool); }
+fn main() { let u = (5 as bool); } //~ ERROR cannot cast as `bool`, compare with zero instead

src/test/compile-fail/cast-from-nil.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,5 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: non-scalar cast: `()` as `u32`
-fn main() { let u = (assert!(true) as u32); }
+fn main() {
+    let u = (assert!(true) as u32); //~ ERROR non-scalar cast: `()` as `u32`
+}

src/test/compile-fail/cast-to-nil.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,5 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: non-scalar cast: `u32` as `()`
-fn main() { let u = 0u32 as (); }
+fn main() {
+    let u = 0u32 as (); //~ ERROR non-scalar cast: `u32` as `()`
+}

src/test/compile-fail/cfg-attr-cfg-2.rs

@@ -9,6 +9,7 @@
 // except according to those terms.
 //
 // error-pattern: main function not found
+// error-pattern: aborting due to previous error
 // compile-flags: --cfg foo
 
 // main is conditionally compiled, but the conditional compilation