Update error message

Author: asquared31415

compiler/rustc_builtin_macros/src/asm.rs

@@ -529,8 +529,8 @@ fn expand_preparsed_asm(
                             lint::builtin::NAMED_ASM_LABELS,
                             span,
                             ecx.current_expansion.lint_node_id,
-                            "do not use named labels in inline assembly",
-                            BuiltinLintDiagnostics::NamedAsmLabel("only GAS local labels of the form `N:` where N is a number may be used in inline asm".to_string()),
+                            "avoid using named labels in inline assembly",
+                            BuiltinLintDiagnostics::NamedAsmLabel("only local labels of the form `<number>:` should be used in inline asm".to_string()),
                         );
                     }
                 } else {
@@ -539,8 +539,8 @@ fn expand_preparsed_asm(
                         lint::builtin::NAMED_ASM_LABELS,
                         template_sp,
                         ecx.current_expansion.lint_node_id,
-                        "do not use named labels in inline assembly",
-                        BuiltinLintDiagnostics::NamedAsmLabel("only GAS local labels of the form `N:` where N is a number may be used in inline asm".to_string()),
+                        "avoid using named labels in inline assembly",
+                        BuiltinLintDiagnostics::NamedAsmLabel("only local labels of the form `<number>:` should be used in inline asm".to_string()),
                     );
                 }
             }

src/test/ui/asm/named-asm-labels.rs

@@ -8,42 +8,42 @@ pub static FOO: usize = 42;
 fn main() {
     unsafe {
         // Basic usage
-        asm!("bar: nop"); //~ ERROR do not use named labels
+        asm!("bar: nop"); //~ ERROR avoid using named labels
 
         // No following asm
-        asm!("abcd:"); //~ ERROR do not use named labels
+        asm!("abcd:"); //~ ERROR avoid using named labels
 
         // Multiple labels on one line
         asm!("foo: bar1: nop");
-        //~^ ERROR do not use named labels
-        //~| ERROR do not use named labels
+        //~^ ERROR avoid using named labels
+        //~| ERROR avoid using named labels
 
         // Multiple lines
-        asm!("foo1: nop", "nop"); //~ ERROR do not use named labels
+        asm!("foo1: nop", "nop"); //~ ERROR avoid using named labels
         asm!("foo2: foo3: nop", "nop");
-        //~^ ERROR do not use named labels
-        //~| ERROR do not use named labels
-        asm!("nop", "foo4: nop"); //~ ERROR do not use named labels
+        //~^ ERROR avoid using named labels
+        //~| ERROR avoid using named labels
+        asm!("nop", "foo4: nop"); //~ ERROR avoid using named labels
         asm!("foo5: nop", "foo6: nop");
-        //~^ ERROR do not use named labels
-        //~| ERROR do not use named labels
+        //~^ ERROR avoid using named labels
+        //~| ERROR avoid using named labels
 
         // Statement separator
         asm!("foo7: nop; foo8: nop");
-        //~^ ERROR do not use named labels
-        //~| ERROR do not use named labels
-        asm!("foo9: nop; nop"); //~ ERROR do not use named labels
-        asm!("nop; foo10: nop"); //~ ERROR do not use named labels
+        //~^ ERROR avoid using named labels
+        //~| ERROR avoid using named labels
+        asm!("foo9: nop; nop"); //~ ERROR avoid using named labels
+        asm!("nop; foo10: nop"); //~ ERROR avoid using named labels
 
         // Escaped newline
         asm!("bar2: nop\n bar3: nop");
-        //~^ ERROR do not use named labels
-        //~| ERROR do not use named labels
-        asm!("bar4: nop\n nop"); //~ ERROR do not use named labels
-        asm!("nop\n bar5: nop"); //~ ERROR do not use named labels
+        //~^ ERROR avoid using named labels
+        //~| ERROR avoid using named labels
+        asm!("bar4: nop\n nop"); //~ ERROR avoid using named labels
+        asm!("nop\n bar5: nop"); //~ ERROR avoid using named labels
         asm!("nop\n bar6: bar7: nop");
-        //~^ ERROR do not use named labels
-        //~| ERROR do not use named labels
+        //~^ ERROR avoid using named labels
+        //~| ERROR avoid using named labels
 
         // Raw strings
         asm!(
@@ -52,15 +52,15 @@ fn main() {
             blah3: nop
             "
         );
-        //~^^^^ ERROR do not use named labels
-        //~^^^^ ERROR do not use named labels
+        //~^^^^ ERROR avoid using named labels
+        //~^^^^ ERROR avoid using named labels
         asm!(
             r###"
             nop
             nop ; blah4: nop
             "###
         );
-        //~^^^ ERROR do not use named labels
+        //~^^^ ERROR avoid using named labels
 
         // Non-labels
         // should not trigger lint, but may be invalid asm
@@ -71,29 +71,29 @@ fn main() {
         asm!("1bar: blah: nop");
 
         // Only `blah1:` should trigger
-        asm!("blah1: 2bar: nop"); //~ ERROR do not use named labels
+        asm!("blah1: 2bar: nop"); //~ ERROR avoid using named labels
 
         // Duplicate labels
-        asm!("def: def: nop"); //~ ERROR do not use named labels
-        asm!("def: nop\ndef: nop"); //~ ERROR do not use named labels
-        asm!("def: nop; def: nop"); //~ ERROR do not use named labels
+        asm!("def: def: nop"); //~ ERROR avoid using named labels
+        asm!("def: nop\ndef: nop"); //~ ERROR avoid using named labels
+        asm!("def: nop; def: nop"); //~ ERROR avoid using named labels
 
         // Trying to break parsing
         asm!(":");
         asm!("\n:\n");
         asm!("::::");
 
         // 0x3A is a ':'
-        asm!("fooo\u{003A} nop"); //~ ERROR do not use named labels
-        asm!("foooo\x3A nop"); //~ ERROR do not use named labels
+        asm!("fooo\u{003A} nop"); //~ ERROR avoid using named labels
+        asm!("foooo\x3A nop"); //~ ERROR avoid using named labels
 
         // 0x0A is a newline
-        asm!("fooooo:\u{000A} nop"); //~ ERROR do not use named labels
-        asm!("foooooo:\x0A nop"); //~ ERROR do not use named labels
+        asm!("fooooo:\u{000A} nop"); //~ ERROR avoid using named labels
+        asm!("foooooo:\x0A nop"); //~ ERROR avoid using named labels
 
         // Intentionally breaking span finding
         // equivalent to "ABC: nop"
-        asm!("\x41\x42\x43\x3A\x20\x6E\x6F\x70"); //~ ERROR do not use named labels
+        asm!("\x41\x42\x43\x3A\x20\x6E\x6F\x70"); //~ ERROR avoid using named labels
 
         // Non-label colons - should pass
         // (most of these are stolen from other places)
@@ -108,15 +108,15 @@ fn main() {
             // cd: nop
             "
         );
-        //~^^^^ ERROR do not use named labels
+        //~^^^^ ERROR avoid using named labels
 
         // Tests usage of colons in non-label positions
         asm!(":lo12:FOO"); // this is apparently valid aarch64
         // is there an example that is valid x86 for this test?
         asm!(":bbb nop");
 
         // Test include_str in asm
-        asm!(include_str!("named-asm-labels.s")); //~ ERROR do not use named labels
+        asm!(include_str!("named-asm-labels.s")); //~ ERROR avoid using named labels
 
         // Test allowing or warning on the lint instead
         #[allow(named_asm_labels)]
@@ -126,7 +126,7 @@ fn main() {
 
         #[warn(named_asm_labels)]
         {
-            asm!("warned: nop"); //~ WARNING do not use named labels
+            asm!("warned: nop"); //~ WARNING avoid using named labels
         }
     }
 }