Combine spans into one error, deduplicate code

Author: asquared31415

compiler/rustc_builtin_macros/src/asm.rs

@@ -10,7 +10,7 @@ use rustc_parse_format as parse;
 use rustc_session::lint::{self, BuiltinLintDiagnostics};
 use rustc_span::symbol::Ident;
 use rustc_span::symbol::{kw, sym, Symbol};
-use rustc_span::{InnerSpan, Span};
+use rustc_span::{InnerSpan, MultiSpan, Span};
 use rustc_target::asm::InlineAsmArch;
 use smallvec::smallvec;
 
@@ -523,26 +523,19 @@ fn expand_preparsed_asm(
             if found_labels.len() > 0 {
                 let spans =
                     found_labels.into_iter().filter_map(find_label_span).collect::<Vec<Span>>();
-                if spans.len() > 0 {
-                    for span in spans.into_iter() {
-                        ecx.parse_sess().buffer_lint_with_diagnostic(
-                            lint::builtin::NAMED_ASM_LABELS,
-                            span,
-                            ecx.current_expansion.lint_node_id,
-                            "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 {
-                    // 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_sp,
-                        ecx.current_expansion.lint_node_id,
-                        "avoid using named labels in inline assembly",
-                        BuiltinLintDiagnostics::NamedAsmLabel("only local labels of the form `<number>:` should be used in inline asm".to_string()),
-                    );
-                }
+                // If there were labels but we couldn't find a span, combine the warnings and use the template span
+                let target_spans: MultiSpan =
+                    if spans.len() > 0 { spans.into() } else { template_sp.into() };
+                ecx.parse_sess().buffer_lint_with_diagnostic(
+                    lint::builtin::NAMED_ASM_LABELS,
+                    target_spans,
+                    ecx.current_expansion.lint_node_id,
+                    "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

@@ -16,13 +16,11 @@ fn main() {
         // Multiple labels on one line
         asm!("foo: bar1: nop");
         //~^ ERROR avoid using named labels
-        //~| ERROR avoid using named labels
 
         // Multiple lines
         asm!("foo1: nop", "nop"); //~ ERROR avoid using named labels
         asm!("foo2: foo3: nop", "nop");
         //~^ 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 avoid using named labels
@@ -31,19 +29,16 @@ fn main() {
         // Statement separator
         asm!("foo7: nop; foo8: nop");
         //~^ 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 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 avoid using named labels
-        //~| ERROR avoid using named labels
 
         // Raw strings
         asm!(
@@ -53,7 +48,7 @@ fn main() {
             "
         );
         //~^^^^ ERROR avoid using named labels
-        //~^^^^ ERROR avoid using named labels
+
         asm!(
             r###"
             nop