Update compile-fail tests for error message deduplication.

Author: michaelwoerister

src/etc/generate-deriving-span-tests.py

@@ -74,7 +74,7 @@
 
 ENUM_TUPLE, ENUM_STRUCT, STRUCT_FIELDS, STRUCT_TUPLE = range(4)
 
-def create_test_case(type, trait, super_traits, number_of_errors):
+def create_test_case(type, trait, super_traits, error_count):
     string = [ENUM_STRING, ENUM_STRUCT_VARIANT_STRING, STRUCT_STRING, STRUCT_TUPLE_STRING][type]
     all_traits = ','.join([trait] + super_traits)
     super_traits = ','.join(super_traits)
@@ -113,7 +113,7 @@ def write_file(name, string):
 
 for (trait, supers, errs) in [('Clone', [], 1),
                               ('PartialEq', [], 2),
-                              ('PartialOrd', ['PartialEq'], 9),
+                              ('PartialOrd', ['PartialEq'], 3),
                               ('Eq', ['PartialEq'], 1),
                               ('Ord', ['Eq', 'PartialOrd', 'PartialEq'], 1),
                               ('Debug', [], 1),

src/test/compile-fail/E0017.rs

@@ -13,15 +13,9 @@ const C: i32 = 2;
 
 const CR: &'static mut i32 = &mut C; //~ ERROR E0017
                                      //~| NOTE constants require immutable values
-                                     //~| ERROR E0017
-                                     //~| NOTE constants require immutable values
 static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017
-                                              //~| NOTE statics require immutable values
-                                              //~| ERROR E0017
                                               //~| NOTE statics require immutable values
                                               //~| ERROR cannot borrow
 static CONST_REF: &'static mut i32 = &mut C; //~ ERROR E0017
                                              //~| NOTE statics require immutable values
-                                             //~| ERROR E0017
-                                             //~| NOTE statics require immutable values
 fn main() {}

src/test/compile-fail/E0388.rs

@@ -12,11 +12,8 @@ static X: i32 = 1;
 const C: i32 = 2;
 
 const CR: &'static mut i32 = &mut C; //~ ERROR E0017
-                                     //~| ERROR E0017
 static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017
-                                              //~| ERROR E0017
                                               //~| ERROR cannot borrow
 static CONST_REF: &'static mut i32 = &mut C; //~ ERROR E0017
-                                             //~| ERROR E0017
 
 fn main() {}

src/test/compile-fail/borrowck/borrowck-overloaded-call.rs

@@ -67,7 +67,6 @@ fn f() {
     };
     let sp = &mut s;
     s(3);   //~ ERROR cannot borrow `s` as immutable because it is also borrowed as mutable
-    //~^ ERROR cannot borrow `s` as immutable because it is also borrowed as mutable
 }
 
 fn g() {

src/test/compile-fail/borrowck/borrowck-unboxed-closures.rs

@@ -11,7 +11,6 @@
 fn a<F:Fn(isize, isize) -> isize>(mut f: F) {
     let g = &mut f;
     f(1, 2);    //~ ERROR cannot borrow `f` as immutable
-    //~^ ERROR cannot borrow `f` as immutable
 }
 
 fn b<F:FnMut(isize, isize) -> isize>(f: F) {

src/test/compile-fail/check-static-immutable-mut-slices.rs

@@ -12,6 +12,5 @@
 
 static TEST: &'static mut [isize] = &mut [];
 //~^ ERROR references in statics may only refer to immutable values
-//~^^ ERROR references in statics may only refer to immutable values
 
 pub fn main() { }

src/test/compile-fail/const-err.rs

@@ -24,17 +24,14 @@ fn black_box<T>(_: T) {
 const FOO: u8 = [5u8][1];
 //~^ ERROR constant evaluation error
 //~| index out of bounds: the len is 1 but the index is 1
-//~^^^ ERROR constant evaluation error
-//~| index out of bounds: the len is 1 but the index is 1
 
 fn main() {
     let a = -std::i8::MIN;
     //~^ WARN this expression will panic at run-time
     //~| attempt to negate with overflow
     let b = 200u8 + 200u8 + 200u8;
     //~^ WARN this expression will panic at run-time
-    //~| attempt to add with overflow
-    //~^^^ WARN this expression will panic at run-time
+    //~^^ WARN this expression will panic at run-time
     //~| attempt to add with overflow
     let c = 200u8 * 4;
     //~^ WARN this expression will panic at run-time

src/test/compile-fail/const-err2.rs

@@ -21,7 +21,6 @@ fn main() {
     //~^ ERROR attempt to negate with overflow
     let b = 200u8 + 200u8 + 200u8;
     //~^ ERROR attempt to add with overflow
-    //~| ERROR attempt to add with overflow
     let c = 200u8 * 4;
     //~^ ERROR attempt to multiply with overflow
     let d = 42u8 - (42u8 + 1);

src/test/compile-fail/cycle-trait-default-type-trait.rs

@@ -13,7 +13,6 @@
 
 trait Foo<X = Box<Foo>> {
     //~^ ERROR unsupported cyclic reference
-    //~| ERROR unsupported cyclic reference
 }
 
 fn main() { }

src/test/compile-fail/derives-span-Clone-enum-struct-variant.rs

@@ -1,4 +1,4 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //