Remove NOTE/HELP annotations from UI tests

Author: petrochenkov

src/test/ui/arbitrary-self-types-not-object-safe.rs

@@ -39,12 +39,7 @@ impl Bar for usize {
 fn make_foo() {
     let x = Box::new(5usize) as Box<Foo>;
     //~^ ERROR E0038
-    //~| NOTE method `foo` has a non-standard `self` type
-    //~| NOTE the trait `Foo` cannot be made into an object
     //~| ERROR E0038
-    //~| NOTE method `foo` has a non-standard `self` type
-    //~| NOTE the trait `Foo` cannot be made into an object
-    //~| NOTE requirements on the impl of `std::ops::CoerceUnsized<std::boxed::Box<Foo>>`
 }
 
 fn make_bar() {

src/test/ui/asm-out-assign-imm.rs

@@ -23,12 +23,11 @@ fn foo(x: isize) { println!("{}", x); }
           target_arch = "aarch64"))]
 pub fn main() {
     let x: isize;
-    x = 1; //~ NOTE first assignment
+    x = 1;
     foo(x);
     unsafe {
         asm!("mov $1, $0" : "=r"(x) : "r"(5));
         //~^ ERROR cannot assign twice to immutable variable `x`
-        //~| NOTE cannot assign twice to immutable
     }
     foo(x);
 }

src/test/ui/asm-out-assign-imm.stderr

@@ -1,7 +1,7 @@
 error[E0384]: cannot assign twice to immutable variable `x`
   --> $DIR/asm-out-assign-imm.rs:29:9
    |
-26 |     x = 1; //~ NOTE first assignment
+26 |     x = 1;
    |     ----- first assignment to `x`
 ...
 29 |         asm!("mov $1, $0" : "=r"(x) : "r"(5));

src/test/ui/associated-const-impl-wrong-lifetime.rs

@@ -15,12 +15,8 @@ trait Foo {
 
 
 impl<'a> Foo for &'a () {
-//~^ NOTE the lifetime 'a as defined
     const NAME: &'a str = "unit";
     //~^ ERROR mismatched types [E0308]
-    //~| NOTE lifetime mismatch
-    //~| NOTE expected type `&'static str`
-    //~| NOTE ...does not necessarily outlive the static lifetime
 }
 
 fn main() {}

src/test/ui/associated-const-impl-wrong-lifetime.stderr

@@ -1,7 +1,7 @@
 error[E0308]: mismatched types
-  --> $DIR/associated-const-impl-wrong-lifetime.rs:19:5
+  --> $DIR/associated-const-impl-wrong-lifetime.rs:18:5
    |
-19 |     const NAME: &'a str = "unit";
+18 |     const NAME: &'a str = "unit";
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch
    |
    = note: expected type `&'static str`
@@ -10,12 +10,9 @@ note: the lifetime 'a as defined on the impl at 17:1...
   --> $DIR/associated-const-impl-wrong-lifetime.rs:17:1
    |
 17 | / impl<'a> Foo for &'a () {
-18 | | //~^ NOTE the lifetime 'a as defined
-19 | |     const NAME: &'a str = "unit";
-20 | |     //~^ ERROR mismatched types [E0308]
-...  |
-23 | |     //~| NOTE ...does not necessarily outlive the static lifetime
-24 | | }
+18 | |     const NAME: &'a str = "unit";
+19 | |     //~^ ERROR mismatched types [E0308]
+20 | | }
    | |_^
    = note: ...does not necessarily outlive the static lifetime
 

src/test/ui/associated-const-impl-wrong-type.rs

@@ -10,15 +10,14 @@
 
 
 trait Foo {
-    const BAR: u32; //~ NOTE type in trait
+    const BAR: u32;
 }
 
 struct SignedBar;
 
 impl Foo for SignedBar {
     const BAR: i32 = -1;
     //~^ ERROR implemented const `BAR` has an incompatible type for trait [E0326]
-    //~| NOTE expected u32, found i32
 }
 
 fn main() {}

src/test/ui/associated-const-impl-wrong-type.stderr

@@ -1,7 +1,7 @@
 error[E0326]: implemented const `BAR` has an incompatible type for trait
   --> $DIR/associated-const-impl-wrong-type.rs:19:16
    |
-13 |     const BAR: u32; //~ NOTE type in trait
+13 |     const BAR: u32;
    |                --- type in trait
 ...
 19 |     const BAR: i32 = -1;

src/test/ui/associated-type-projection-from-multiple-supertraits.rs

@@ -13,18 +13,12 @@
 
 pub trait Vehicle {
     type Color;
-    //~^ NOTE ambiguous `Color` from `Vehicle`
-    //~| NOTE ambiguous `Color` from `Vehicle`
-    //~| NOTE ambiguous `Color` from `Vehicle`
 
     fn go(&self) {  }
 }
 
 pub trait Box {
     type Color;
-    //~^ NOTE ambiguous `Color` from `Box`
-    //~| NOTE ambiguous `Color` from `Box`
-    //~| NOTE ambiguous `Color` from `Box`
     //
     fn mail(&self) {  }
 }
@@ -34,19 +28,15 @@ pub trait BoxCar : Box + Vehicle {
 
 fn dent<C:BoxCar>(c: C, color: C::Color) {
     //~^ ERROR ambiguous associated type `Color` in bounds of `C`
-    //~| NOTE ambiguous associated type `Color`
 }
 
 fn dent_object<COLOR>(c: BoxCar<Color=COLOR>) {
     //~^ ERROR ambiguous associated type
     //~| ERROR the value of the associated type `Color` (from the trait `Vehicle`) must be specified
-    //~| NOTE ambiguous associated type `Color`
-    //~| NOTE missing associated type `Color` value
 }
 
 fn paint<C:BoxCar>(c: C, d: C::Color) {
     //~^ ERROR ambiguous associated type `Color` in bounds of `C`
-    //~| NOTE ambiguous associated type `Color`
 }
 
 pub fn main() { }

src/test/ui/associated-type-projection-from-multiple-supertraits.stderr

@@ -1,43 +1,43 @@
 error[E0221]: ambiguous associated type `Color` in bounds of `C`
-  --> $DIR/associated-type-projection-from-multiple-supertraits.rs:35:32
+  --> $DIR/associated-type-projection-from-multiple-supertraits.rs:29:32
    |
 15 |     type Color;
    |     ----------- ambiguous `Color` from `Vehicle`
 ...
-24 |     type Color;
+21 |     type Color;
    |     ----------- ambiguous `Color` from `Box`
 ...
-35 | fn dent<C:BoxCar>(c: C, color: C::Color) {
+29 | fn dent<C:BoxCar>(c: C, color: C::Color) {
    |                                ^^^^^^^^ ambiguous associated type `Color`
 
 error[E0221]: ambiguous associated type `Color` in bounds of `BoxCar`
-  --> $DIR/associated-type-projection-from-multiple-supertraits.rs:40:33
+  --> $DIR/associated-type-projection-from-multiple-supertraits.rs:33:33
    |
 15 |     type Color;
    |     ----------- ambiguous `Color` from `Vehicle`
 ...
-24 |     type Color;
+21 |     type Color;
    |     ----------- ambiguous `Color` from `Box`
 ...
-40 | fn dent_object<COLOR>(c: BoxCar<Color=COLOR>) {
+33 | fn dent_object<COLOR>(c: BoxCar<Color=COLOR>) {
    |                                 ^^^^^^^^^^^ ambiguous associated type `Color`
 
 error[E0191]: the value of the associated type `Color` (from the trait `Vehicle`) must be specified
-  --> $DIR/associated-type-projection-from-multiple-supertraits.rs:40:26
+  --> $DIR/associated-type-projection-from-multiple-supertraits.rs:33:26
    |
-40 | fn dent_object<COLOR>(c: BoxCar<Color=COLOR>) {
+33 | fn dent_object<COLOR>(c: BoxCar<Color=COLOR>) {
    |                          ^^^^^^^^^^^^^^^^^^^ missing associated type `Color` value
 
 error[E0221]: ambiguous associated type `Color` in bounds of `C`
-  --> $DIR/associated-type-projection-from-multiple-supertraits.rs:47:29
+  --> $DIR/associated-type-projection-from-multiple-supertraits.rs:38:29
    |
 15 |     type Color;
    |     ----------- ambiguous `Color` from `Vehicle`
 ...
-24 |     type Color;
+21 |     type Color;
    |     ----------- ambiguous `Color` from `Box`
 ...
-47 | fn paint<C:BoxCar>(c: C, d: C::Color) {
+38 | fn paint<C:BoxCar>(c: C, d: C::Color) {
    |                             ^^^^^^^^ ambiguous associated type `Color`
 
 error: aborting due to 4 previous errors

src/test/ui/associated-types-ICE-when-projecting-out-of-err.rs

@@ -32,5 +32,4 @@ fn ice<A>(a: A) {
     let r = loop {};
     r = r + a;
     //~^ ERROR the trait bound `(): Add<A>` is not satisfied
-    //~| NOTE the trait `Add<A>` is not implemented for `()`
 }

src/test/ui/associated-types-in-ambiguous-context.rs

@@ -15,21 +15,15 @@ trait Get {
 
 fn get<T:Get,U:Get>(x: T, y: U) -> Get::Value {}
 //~^ ERROR ambiguous associated type
-//~| NOTE ambiguous associated type
-//~| NOTE specify the type using the syntax `<Type as Get>::Value`
 
 trait Grab {
     type Value;
     fn grab(&self) -> Grab::Value;
     //~^ ERROR ambiguous associated type
-    //~| NOTE ambiguous associated type
-    //~| NOTE specify the type using the syntax `<Type as Grab>::Value`
 }
 
 type X = std::ops::Deref::Target;
 //~^ ERROR ambiguous associated type
-//~| NOTE ambiguous associated type
-//~| NOTE specify the type using the syntax `<Type as std::ops::Deref>::Target`
 
 fn main() {
 }

src/test/ui/associated-types-in-ambiguous-context.stderr

@@ -7,17 +7,17 @@ error[E0223]: ambiguous associated type
    = note: specify the type using the syntax `<Type as Get>::Value`
 
 error[E0223]: ambiguous associated type
-  --> $DIR/associated-types-in-ambiguous-context.rs:29:10
+  --> $DIR/associated-types-in-ambiguous-context.rs:25:10
    |
-29 | type X = std::ops::Deref::Target;
+25 | type X = std::ops::Deref::Target;
    |          ^^^^^^^^^^^^^^^^^^^^^^^ ambiguous associated type
    |
    = note: specify the type using the syntax `<Type as std::ops::Deref>::Target`
 
 error[E0223]: ambiguous associated type
-  --> $DIR/associated-types-in-ambiguous-context.rs:23:23
+  --> $DIR/associated-types-in-ambiguous-context.rs:21:23
    |
-23 |     fn grab(&self) -> Grab::Value;
+21 |     fn grab(&self) -> Grab::Value;
    |                       ^^^^^^^^^^^ ambiguous associated type
    |
    = note: specify the type using the syntax `<Type as Grab>::Value`

src/test/ui/augmented-assignments.rs

@@ -22,7 +22,6 @@ fn main() {
     let mut x = Int(1);
     x   //~ error: use of moved value: `x`
     //~^ value used here after move
-    //~| note: move occurs because `x` has type `Int`
     +=
     x;  //~ value moved here
 

src/test/ui/augmented-assignments.stderr

@@ -1,10 +1,10 @@
 error[E0596]: cannot borrow immutable local variable `y` as mutable
-  --> $DIR/augmented-assignments.rs:31:5
+  --> $DIR/augmented-assignments.rs:30:5
    |
-29 |     let y = Int(2);
+28 |     let y = Int(2);
    |         - consider changing this to `mut y`
-30 |     //~^ consider changing this to `mut y`
-31 |     y   //~ error: cannot borrow immutable local variable `y` as mutable
+29 |     //~^ consider changing this to `mut y`
+30 |     y   //~ error: cannot borrow immutable local variable `y` as mutable
    |     ^ cannot borrow mutably
 
 error[E0382]: use of moved value: `x`
@@ -13,7 +13,7 @@ error[E0382]: use of moved value: `x`
 23 |     x   //~ error: use of moved value: `x`
    |     ^ value used here after move
 ...
-27 |     x;  //~ value moved here
+26 |     x;  //~ value moved here
    |     - value moved here
    |
    = note: move occurs because `x` has type `Int`, which does not implement the `Copy` trait

src/test/ui/binary-op-on-double-ref.rs

@@ -13,8 +13,6 @@ fn main() {
     let vr = v.iter().filter(|x| {
         x % 2 == 0
         //~^ ERROR binary operation `%` cannot be applied to type `&&{integer}`
-        //~| NOTE this is a reference to a type that `%` can be applied to
-        //~| NOTE an implementation of `std::ops::Rem` might be missing for `&&{integer}`
     });
     println!("{:?}", vr);
 }

src/test/ui/blind-item-item-shadow.rs

@@ -8,11 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-mod foo { pub mod foo {  } } //~ NOTE previous definition of the module `foo` here
+mod foo { pub mod foo {  } }
 
 use foo::foo;
 //~^ ERROR the name `foo` is defined multiple times
 //~| `foo` reimported here
-//~| NOTE `foo` must be defined only once in the type namespace of this module
 
 fn main() {}

src/test/ui/blind-item-item-shadow.stderr

@@ -1,7 +1,7 @@
 error[E0255]: the name `foo` is defined multiple times
   --> $DIR/blind-item-item-shadow.rs:13:5
    |
-11 | mod foo { pub mod foo {  } } //~ NOTE previous definition of the module `foo` here
+11 | mod foo { pub mod foo {  } }
    | ---------------------------- previous definition of the module `foo` here
 12 | 
 13 | use foo::foo;

src/test/ui/block-result/consider-removing-last-semi.rs

@@ -10,12 +10,12 @@
 
 fn f() -> String {  //~ ERROR mismatched types
     0u8;
-    "bla".to_string();  //~ HELP consider removing this semicolon
+    "bla".to_string();
 }
 
 fn g() -> String {  //~ ERROR mismatched types
     "this won't work".to_string();
-    "removeme".to_string(); //~ HELP consider removing this semicolon
+    "removeme".to_string();
 }
 
 fn main() {}

src/test/ui/block-result/consider-removing-last-semi.stderr

@@ -4,7 +4,7 @@ error[E0308]: mismatched types
 11 |   fn f() -> String {  //~ ERROR mismatched types
    |  __________________^
 12 | |     0u8;
-13 | |     "bla".to_string();  //~ HELP consider removing this semicolon
+13 | |     "bla".to_string();
    | |                      - help: consider removing this semicolon
 14 | | }
    | |_^ expected struct `std::string::String`, found ()
@@ -18,7 +18,7 @@ error[E0308]: mismatched types
 16 |   fn g() -> String {  //~ ERROR mismatched types
    |  __________________^
 17 | |     "this won't work".to_string();
-18 | |     "removeme".to_string(); //~ HELP consider removing this semicolon
+18 | |     "removeme".to_string();
    | |                           - help: consider removing this semicolon
 19 | | }
    | |_^ expected struct `std::string::String`, found ()

src/test/ui/block-result/issue-11714.rs

@@ -11,7 +11,7 @@
 fn blah() -> i32 { //~ ERROR mismatched types
     1
 
-    ; //~ HELP consider removing this semicolon
+    ;
 }
 
 fn main() { }

src/test/ui/block-result/issue-11714.stderr

@@ -5,7 +5,7 @@ error[E0308]: mismatched types
    |  __________________^
 12 | |     1
 13 | |
-14 | |     ; //~ HELP consider removing this semicolon
+14 | |     ;
    | |     - help: consider removing this semicolon
 15 | | }
    | |_^ expected i32, found ()

src/test/ui/block-result/issue-13428.rs

@@ -15,12 +15,12 @@ fn foo() -> String {  //~ ERROR mismatched types
             "world")
     // Put the trailing semicolon on its own line to test that the
     // note message gets the offending semicolon exactly
-    ;   //~ HELP consider removing this semicolon
+    ;
 }
 
 fn bar() -> String {  //~ ERROR mismatched types
     "foobar".to_string()
-    ;   //~ HELP consider removing this semicolon
+    ;
 }
 
 pub fn main() {}

src/test/ui/block-result/issue-13428.stderr

@@ -7,7 +7,7 @@ error[E0308]: mismatched types
 15 | |             "world")
 16 | |     // Put the trailing semicolon on its own line to test that the
 17 | |     // note message gets the offending semicolon exactly
-18 | |     ;   //~ HELP consider removing this semicolon
+18 | |     ;
    | |     - help: consider removing this semicolon
 19 | | }
    | |_^ expected struct `std::string::String`, found ()
@@ -21,7 +21,7 @@ error[E0308]: mismatched types
 21 |   fn bar() -> String {  //~ ERROR mismatched types
    |  ____________________^
 22 | |     "foobar".to_string()
-23 | |     ;   //~ HELP consider removing this semicolon
+23 | |     ;
    | |     - help: consider removing this semicolon
 24 | | }
    | |_^ expected struct `std::string::String`, found ()