Remove NOTE/HELP annotations from UI tests

src/test/ui/token/issue-10636-2.rs

@@ -12,9 +12,8 @@
 // first one. This would be easy-ish to address by better recovery in tokenisation.
 
 pub fn trace_option(option: Option<isize>) {
-    option.map(|some| 42; //~ NOTE: unclosed delimiter
+    option.map(|some| 42;
                           //~^ ERROR: expected one of
-                          //~| NOTE: expected one of
 
 } //~ ERROR: incorrect close delimiter
 //~^ ERROR: expected expression, found `)`

src/test/ui/token/issue-10636-2.stderr

@@ -1,25 +1,25 @@
 error: incorrect close delimiter: `}`
-  --> $DIR/issue-10636-2.rs:19:1
+  --> $DIR/issue-10636-2.rs:18:1
    |
-19 | } //~ ERROR: incorrect close delimiter
+18 | } //~ ERROR: incorrect close delimiter
    | ^
    |
 note: unclosed delimiter
   --> $DIR/issue-10636-2.rs:15:15
    |
-15 |     option.map(|some| 42; //~ NOTE: unclosed delimiter
+15 |     option.map(|some| 42;
    |               ^
 
 error: expected one of `,`, `.`, `?`, or an operator, found `;`
   --> $DIR/issue-10636-2.rs:15:25
    |
-15 |     option.map(|some| 42; //~ NOTE: unclosed delimiter
+15 |     option.map(|some| 42;
    |                         ^ expected one of `,`, `.`, `?`, or an operator here
 
 error: expected expression, found `)`
-  --> $DIR/issue-10636-2.rs:19:1
+  --> $DIR/issue-10636-2.rs:18:1
    |
-19 | } //~ ERROR: incorrect close delimiter
+18 | } //~ ERROR: incorrect close delimiter
    | ^
 
 error[E0601]: main function not found

src/test/ui/token/macro-incomplete-parse.rs

@@ -20,7 +20,6 @@ macro_rules! ignored_item {
 
 macro_rules! ignored_expr {
     () => ( 1,  //~ ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found `,`
-                //~^ NOTE expected one of `.`, `;`, `?`, `}`, or an operator here
 
             2 )
 }
@@ -29,12 +28,12 @@ macro_rules! ignored_pat {
     () => ( 1, 2 ) //~ ERROR macro expansion ignores token `,`
 }
 
-ignored_item!(); //~ NOTE caused by the macro expansion here
+ignored_item!();
 
 fn main() {
-    ignored_expr!(); //~ NOTE in this expansion
+    ignored_expr!();
     match 1 {
-        ignored_pat!() => (), //~ NOTE caused by the macro expansion here
+        ignored_pat!() => (),
         _ => (),
     }
 }

src/test/ui/token/macro-incomplete-parse.stderr

@@ -5,9 +5,9 @@ error: macro expansion ignores token `,` and any following
    |         ^
    |
 note: caused by the macro expansion here; the usage of `ignored_item!` is likely invalid in item context
-  --> $DIR/macro-incomplete-parse.rs:32:1
+  --> $DIR/macro-incomplete-parse.rs:31:1
    |
-32 | ignored_item!(); //~ NOTE caused by the macro expansion here
+31 | ignored_item!();
    | ^^^^^^^^^^^^^^^^
 
 error: expected one of `.`, `;`, `?`, `}`, or an operator, found `,`
@@ -16,19 +16,19 @@ error: expected one of `.`, `;`, `?`, `}`, or an operator, found `,`
 22 |     () => ( 1,  //~ ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found `,`
    |              ^ expected one of `.`, `;`, `?`, `}`, or an operator here
 ...
-35 |     ignored_expr!(); //~ NOTE in this expansion
+34 |     ignored_expr!();
    |     ---------------- in this macro invocation
 
 error: macro expansion ignores token `,` and any following
-  --> $DIR/macro-incomplete-parse.rs:29:14
+  --> $DIR/macro-incomplete-parse.rs:28:14
    |
-29 |     () => ( 1, 2 ) //~ ERROR macro expansion ignores token `,`
+28 |     () => ( 1, 2 ) //~ ERROR macro expansion ignores token `,`
    |              ^
    |
 note: caused by the macro expansion here; the usage of `ignored_pat!` is likely invalid in pattern context
-  --> $DIR/macro-incomplete-parse.rs:37:9
+  --> $DIR/macro-incomplete-parse.rs:36:9
    |
-37 |         ignored_pat!() => (), //~ NOTE caused by the macro expansion here
+36 |         ignored_pat!() => (),
    |         ^^^^^^^^^^^^^^
 
 error: aborting due to 3 previous errors