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 `()`
 }