Update duplicate options test

diff --git a/src/test/ui/asm/duplicate-options.rs b/src/test/ui/asm/duplicate-options.rs
index e412932fa7ebe717e5870b1111a75acf560f9baf..1df7f55f81248eb7bb07e42f874c7d07b83f9682 100644 (file)
--- a/src/test/ui/asm/duplicate-options.rs
+++ b/src/test/ui/asm/duplicate-options.rs
@@ -6,19 +6,13 @@ fn main() {
     unsafe {
         asm!("", options(nomem, nomem));
         //~^ ERROR the `nomem` option was already provided
-        //~| HELP remove this option
         asm!("", options(att_syntax, att_syntax));
         //~^ ERROR the `att_syntax` option was already provided
-        //~| HELP remove this option
         asm!("", options(nostack, att_syntax), options(nostack));
         //~^ ERROR the `nostack` option was already provided
-        //~| HELP remove this option
         asm!("", options(nostack, nostack), options(nostack), options(nostack));
         //~^ ERROR the `nostack` option was already provided
-        //~| HELP remove this option
         //~| ERROR the `nostack` option was already provided
-        //~| HELP remove this option
         //~| ERROR the `nostack` option was already provided
-        //~| HELP remove this option
     }
 }

diff --git a/src/test/ui/asm/duplicate-options.stderr b/src/test/ui/asm/duplicate-options.stderr
index accfdef474bb9aa0d504beaab207cc8c9879f751..6339ae9db8105e8e174451c1b1ff9d6dec7ae6d7 100644 (file)
--- a/src/test/ui/asm/duplicate-options.stderr
+++ b/src/test/ui/asm/duplicate-options.stderr
@@ -2,73 +2,37 @@ error: the `nomem` option was already provided
   --> $DIR/duplicate-options.rs:7:33
    |
 LL |         asm!("", options(nomem, nomem));
-   |                                 ^^^^^
-   |
-help: remove this option
-  --> $DIR/duplicate-options.rs:7:33
-   |
-LL |         asm!("", options(nomem, nomem));
-   |                                 ^^^^^
+   |                                 ^^^^^ remove this option
 
 error: the `att_syntax` option was already provided
-  --> $DIR/duplicate-options.rs:10:38
-   |
-LL |         asm!("", options(att_syntax, att_syntax));
-   |                                      ^^^^^^^^^^
-   |
-help: remove this option
-  --> $DIR/duplicate-options.rs:10:38
+  --> $DIR/duplicate-options.rs:9:38
    |
 LL |         asm!("", options(att_syntax, att_syntax));
-   |                                      ^^^^^^^^^^
+   |                                      ^^^^^^^^^^ remove this option
 
 error: the `nostack` option was already provided
-  --> $DIR/duplicate-options.rs:13:56
-   |
-LL |         asm!("", options(nostack, att_syntax), options(nostack));
-   |                                                        ^^^^^^^
-   |
-help: remove this option
-  --> $DIR/duplicate-options.rs:13:56
+  --> $DIR/duplicate-options.rs:11:56
    |
 LL |         asm!("", options(nostack, att_syntax), options(nostack));
-   |                                                        ^^^^^^^
+   |                                                        ^^^^^^^ remove this option
 
 error: the `nostack` option was already provided
-  --> $DIR/duplicate-options.rs:16:35
+  --> $DIR/duplicate-options.rs:13:35
    |
 LL |         asm!("", options(nostack, nostack), options(nostack), options(nostack));
-   |                                   ^^^^^^^
-   |
-help: remove this option
-  --> $DIR/duplicate-options.rs:16:35
-   |
-LL |         asm!("", options(nostack, nostack), options(nostack), options(nostack));
-   |                                   ^^^^^^^
+   |                                   ^^^^^^^ remove this option
 
 error: the `nostack` option was already provided
-  --> $DIR/duplicate-options.rs:16:53
+  --> $DIR/duplicate-options.rs:13:53
    |
 LL |         asm!("", options(nostack, nostack), options(nostack), options(nostack));
-   |                                                     ^^^^^^^
-   |
-help: remove this option
-  --> $DIR/duplicate-options.rs:16:53
-   |
-LL |         asm!("", options(nostack, nostack), options(nostack), options(nostack));
-   |                                                     ^^^^^^^
+   |                                                     ^^^^^^^ remove this option
 
 error: the `nostack` option was already provided
-  --> $DIR/duplicate-options.rs:16:71
-   |
-LL |         asm!("", options(nostack, nostack), options(nostack), options(nostack));
-   |                                                                       ^^^^^^^
-   |
-help: remove this option
-  --> $DIR/duplicate-options.rs:16:71
+  --> $DIR/duplicate-options.rs:13:71
    |
 LL |         asm!("", options(nostack, nostack), options(nostack), options(nostack));
-   |                                                                       ^^^^^^^
+   |                                                                       ^^^^^^^ remove this option
 
 error: aborting due to 6 previous errors