Fix lint capitalization and ignoring, test with include_str

Author: asquared31415

compiler/rustc_builtin_macros/src/asm.rs

@@ -530,17 +530,17 @@ fn expand_preparsed_asm(
                             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()),
+                            BuiltinLintDiagnostics::NamedAsmLabel("only GAS local labels of the form `N:` where N is a number may be used in inline asm".to_string()),
                         );
                     }
                 } else {
                     // If there were labels but we couldn't find a span, combine the warnings and use the template span
                     ecx.parse_sess().buffer_lint_with_diagnostic(
                         lint::builtin::NAMED_ASM_LABELS,
-                        template_span,
+                        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()),
+                        BuiltinLintDiagnostics::NamedAsmLabel("only GAS local labels of the form `N:` where N is a number may be used in inline asm".to_string()),
                     );
                 }
             }

compiler/rustc_lint/src/context.rs

@@ -760,7 +760,7 @@ pub trait LintContext: Sized {
                 }
                 BuiltinLintDiagnostics::NamedAsmLabel(help) => {
                     db.help(&help);
-                    db.note("See the asm section of the unstable book <https://doc.rust-lang.org/nightly/unstable-book/library-features/asm.html#labels> for more information");
+                    db.note("see the asm section of the unstable book <https://doc.rust-lang.org/nightly/unstable-book/library-features/asm.html#labels> for more information");
                 }
             }
             // Rewrap `db`, and pass control to the user.

compiler/rustc_lint_defs/src/builtin.rs

@@ -2990,6 +2990,7 @@ declare_lint_pass! {
         INLINE_NO_SANITIZE,
         BAD_ASM_STYLE,
         ASM_SUB_REGISTER,
+        NAMED_ASM_LABELS,
         UNSAFE_OP_IN_UNSAFE_FN,
         INCOMPLETE_INCLUDE,
         CENUM_IMPL_DROP_CAST,

src/test/codegen/asm-sanitize-llvm.rs

@@ -7,6 +7,7 @@
 #![no_core]
 #![feature(no_core, lang_items, rustc_attrs)]
 #![crate_type = "rlib"]
+#![allow(named_asm_labels)]
 
 #[rustc_builtin_macro]
 macro_rules! asm {

src/test/ui/asm/named_asm_labels.rs renamed to src/test/ui/asm/named-asm-labels.rs

@@ -114,6 +114,20 @@ fn main() {
         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
+
+        // Test allowing or warning on the lint instead
+        #[allow(named_asm_labels)]
+        {
+            asm!("allowed: nop"); // Should not emit anything
+        }
+
+        #[warn(named_asm_labels)]
+        {
+            asm!("warned: nop"); //~ WARNING do not use named labels
+        }
     }
 }
 

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

@@ -0,0 +1,5 @@
+lab1: nop
+// do more things
+lab2: nop // does bar
+// a: b
+lab3: nop; lab4: nop