Move more early buffered lints to dyn lint diagnostics (1/N)

Author: fmease

compiler/rustc_builtin_macros/messages.ftl

@@ -64,6 +64,11 @@ builtin_macros_autodiff_ty_activity = {$act} can not be used for this type
 builtin_macros_autodiff_unknown_activity = did not recognize Activity: `{$act}`
 
 builtin_macros_autodiff_width = autodiff width must fit u32, but is {$width}
+
+builtin_macros_avoid_att_syntax = avoid using `.att_syntax`, prefer using `options(att_syntax)` instead
+
+builtin_macros_avoid_intel_syntax = avoid using `.intel_syntax`, Intel syntax is the default
+
 builtin_macros_bad_derive_target = `derive` may only be applied to `struct`s, `enum`s and `union`s
 .label = not applicable here
 .label2 = not a `struct`, `enum` or `union`
@@ -138,6 +143,8 @@ builtin_macros_derive_path_args_list = traits in `#[derive(...)]` don't accept a
 builtin_macros_derive_path_args_value = traits in `#[derive(...)]` don't accept values
 .suggestion = remove the value
 
+builtin_macros_duplicate_macro_attribute = duplicated attribute
+
 builtin_macros_env_not_defined = environment variable `{$var}` not defined at compile time
 .cargo = Cargo sets build script variables at run time. Use `std::env::var({$var_expr})` instead
 .custom = use `std::env::var({$var_expr})` to read the variable at run time
@@ -231,6 +238,8 @@ builtin_macros_derive_from_wrong_field_count = `#[derive(From)]` used on a struc
 
 builtin_macros_derive_from_usage_note = `#[derive(From)]` can only be used on structs with exactly one field
 
+builtin_macros_incomplete_include = include macro expected single expression in source
+
 builtin_macros_multiple_default_attrs = multiple `#[default]` attributes
 .note = only one `#[default]` attribute is needed
 .label = `#[default]` used here
@@ -294,3 +303,5 @@ builtin_macros_unexpected_lit = expected path to a trait, found literal
 .label = not a trait
 .str_lit = try using `#[derive({$sym})]`
 .other = for example, write `#[derive(Debug)]` for `Debug`
+
+builtin_macros_unnameable_test_items = cannot test inner items

compiler/rustc_builtin_macros/src/asm.rs

@@ -1,4 +1,3 @@
-use lint::BuiltinLintDiag;
 use rustc_ast::tokenstream::TokenStream;
 use rustc_ast::{AsmMacro, token};
 use rustc_data_structures::fx::{FxHashMap,FxIndexMap};
@@ -352,15 +351,15 @@ fn expand_preparsed_asm(
  lint::builtin::BAD_ASM_STYLE,
 find_span(".intel_syntax"),
  ecx.current_expansion.lint_node_id,
-BuiltinLintDiag::AvoidUsingIntelSyntax,
+errors::AvoidIntelSyntax,
 );
 }
 if template_str.contains(".att_syntax"){
  ecx.psess().buffer_lint(
  lint::builtin::BAD_ASM_STYLE,
 find_span(".att_syntax"),
  ecx.current_expansion.lint_node_id,
-BuiltinLintDiag::AvoidUsingAttSyntax,
+errors::AvoidAttSyntax,
 );
 }
 }

compiler/rustc_builtin_macros/src/errors.rs

@@ -3,9 +3,29 @@ use rustc_errors::{
 Diag,DiagCtxtHandle,Diagnostic,EmissionGuarantee,Level,MultiSpan,SingleLabelManySpans,
 Subdiagnostic,
 };
-use rustc_macros::{Diagnostic,Subdiagnostic};
+use rustc_macros::{Diagnostic,LintDiagnostic,Subdiagnostic};
 use rustc_span::{Ident,Span,Symbol};
 
+#[derive(LintDiagnostic)]
+#[diag(builtin_macros_avoid_intel_syntax)]
+pub(crate)structAvoidIntelSyntax;
+
+#[derive(LintDiagnostic)]
+#[diag(builtin_macros_avoid_att_syntax)]
+pub(crate)structAvoidAttSyntax;
+
+#[derive(LintDiagnostic)]
+#[diag(builtin_macros_incomplete_include)]
+pub(crate)structIncompleteInclude;
+
+#[derive(LintDiagnostic)]
+#[diag(builtin_macros_unnameable_test_items)]
+pub(crate)structUnnameableTestItems;
+
+#[derive(LintDiagnostic)]
+#[diag(builtin_macros_duplicate_macro_attribute)]
+pub(crate)structDuplicateMacroAttribute;
+
 #[derive(Diagnostic)]
 #[diag(builtin_macros_requires_cfg_pattern)]
 pub(crate)structRequiresCfgPattern{

compiler/rustc_builtin_macros/src/source_util.rs

@@ -12,7 +12,6 @@ use rustc_expand::base::{
 DummyResult,ExpandResult,ExtCtxt,MacEager,MacResult,MacroExpanderResult, resolve_path,
 };
 use rustc_expand::module::DirOwnership;
-use rustc_lint_defs::BuiltinLintDiag;
 use rustc_parse::lexer::StripTokens;
 use rustc_parse::parser::ForceCollect;
 use rustc_parse::{new_parser_from_file, unwrap_or_emit_fatal, utf8_error};
@@ -159,7 +158,7 @@ pub(crate) fn expand_include<'cx>(
 INCOMPLETE_INCLUDE,
  p.token.span,
 self.node_id,
-BuiltinLintDiag::IncompleteInclude,
+errors::IncompleteInclude,
 );
 }
 Some(expr)

compiler/rustc_builtin_macros/src/test_harness.rs

@@ -11,7 +11,6 @@ use rustc_errors::DiagCtxtHandle;
 use rustc_expand::base::{ExtCtxt,ResolverExpand};
 use rustc_expand::expand::{AstFragment,ExpansionConfig};
 use rustc_feature::Features;
-use rustc_lint_defs::BuiltinLintDiag;
 use rustc_session::Session;
 use rustc_session::lint::builtin::UNNAMEABLE_TEST_ITEMS;
 use rustc_span::hygiene::{AstPass,SyntaxContext,Transparency};
@@ -165,7 +164,7 @@ impl<'a> Visitor<'a> for InnerItemLinter<'_> {
 UNNAMEABLE_TEST_ITEMS,
  attr.span,
  i.id,
-BuiltinLintDiag::UnnameableTestItems,
+errors::UnnameableTestItems,
 );
 }
 }

compiler/rustc_builtin_macros/src/util.rs

@@ -5,7 +5,6 @@ use rustc_errors::{Applicability, Diag, ErrorGuaranteed};
 use rustc_expand::base::{Annotatable,ExpandResult,ExtCtxt};
 use rustc_expand::expand::AstFragment;
 use rustc_feature::AttributeTemplate;
-use rustc_lint_defs::BuiltinLintDiag;
 use rustc_lint_defs::builtin::DUPLICATE_MACRO_ATTRIBUTES;
 use rustc_parse::{exp, parser};
 use rustc_session::errors::report_lit_error;
@@ -49,7 +48,7 @@ pub(crate) fn warn_on_duplicate_attribute(ecx: &ExtCtxt<'_>, item: &Annotatable,
 DUPLICATE_MACRO_ATTRIBUTES,
  attr.span,
  ecx.current_expansion.lint_node_id,
-BuiltinLintDiag::DuplicateMacroAttribute,
+errors::DuplicateMacroAttribute,
 );
 }
 }

compiler/rustc_expand/messages.ftl

@@ -3,6 +3,8 @@ expand_attributes_on_expressions_experimental =
 .help_outer_doc = `///` is used for outer documentation comments; for a plain comment, use `//`
 .help_inner_doc = `//!` is used for inner documentation comments; for a plain comment, use `//` by removing the `!` or inserting a space in between them: `// !`
 
+expand_cfg_attr_no_attributes = `#[cfg_attr]` does not expand to any attributes
+
 expand_collapse_debuginfo_illegal =
  illegal value for attribute #[collapse_debuginfo(no|external|yes)]
 
@@ -89,6 +91,13 @@ expand_malformed_feature_attribute =
  malformed `feature` attribute input
 .expected = expected just one word
 
+expand_metavar_still_repeating = variable `{$ident}` is still repeating at this depth
+.label = expected repetition
+
+expand_metavariable_wrong_operator = meta-variable repeats with different Kleene operator
+.binder_label = expected repetition
+.occurrence_label = conflicting repetition
+
 expand_meta_var_dif_seq_matchers = {$msg}
 
 expand_missing_fragment_specifier = missing fragment specifier
@@ -176,11 +185,10 @@ expand_resolve_relative_path =
 
 expand_trace_macro = trace_macro
 
+expand_unknown_macro_variable = unknown macro variable `{$name}`
+
 expand_unsupported_key_value =
  key-value macro attributes are not supported
 
-expand_var_still_repeating =
- variable `{$ident}` is still repeating at this depth
-
 expand_wrong_fragment_kind =
  non-{$kind} macro in {$kind} position: {$name}

compiler/rustc_expand/src/config.rs

@@ -21,7 +21,6 @@ use rustc_feature::{
 ACCEPTED_LANG_FEATURES,AttributeSafety,EnabledLangFeature,EnabledLibFeature,Features,
 REMOVED_LANG_FEATURES,UNSTABLE_LANG_FEATURES,
 };
-use rustc_lint_defs::BuiltinLintDiag;
 use rustc_session::Session;
 use rustc_session::parse::feature_err;
 use rustc_span::{STDLIB_STABLE_CRATES,Span,Symbol, sym};
@@ -315,7 +314,7 @@ impl<'a> StripUnconfigured<'a> {
  rustc_lint_defs::builtin::UNUSED_ATTRIBUTES,
  cfg_attr.span,
  ast::CRATE_NODE_ID,
-BuiltinLintDiag::CfgAttrNoAttributes,
+crate::errors::CfgAttrNoAttributes,
 );
 }
 

compiler/rustc_expand/src/errors.rs

@@ -3,9 +3,13 @@ use std::borrow::Cow;
 use rustc_ast::ast;
 use rustc_errors::codes::*;
 use rustc_hir::limit::Limit;
-use rustc_macros::{Diagnostic,Subdiagnostic};
+use rustc_macros::{Diagnostic,LintDiagnostic,Subdiagnostic};
 use rustc_span::{Ident,MacroRulesNormalizedIdent,Span,Symbol};
 
+#[derive(LintDiagnostic)]
+#[diag(expand_cfg_attr_no_attributes)]
+pub(crate)structCfgAttrNoAttributes;
+
 #[derive(Diagnostic)]
 #[diag(expand_expr_repeat_no_syntax_vars)]
 pub(crate)structNoSyntaxVarsExprRepeat{
@@ -28,13 +32,30 @@ pub(crate) struct CountRepetitionMisplaced {
 }
 
 #[derive(Diagnostic)]
-#[diag(expand_var_still_repeating)]
-pub(crate)structVarStillRepeating{
+#[diag(expand_metavar_still_repeating)]
+pub(crate)structMacroVarStillRepeating{
 #[primary_span]
 pubspan:Span,
 pubident:MacroRulesNormalizedIdent,
 }
 
+#[derive(LintDiagnostic)]
+#[diag(expand_metavar_still_repeating)]
+pub(crate)structMetaVarStillRepeatingLint{
+#[label]
+publabel:Span,
+pubident:MacroRulesNormalizedIdent,
+}
+
+#[derive(LintDiagnostic)]
+#[diag(expand_metavariable_wrong_operator)]
+pub(crate)structMetaVariableWrongOperator{
+#[label(expand_binder_label)]
+pubbinder:Span,
+#[label(expand_occurrence_label)]
+puboccurrence:Span,
+}
+
 #[derive(Diagnostic)]
 #[diag(expand_meta_var_dif_seq_matchers)]
 pub(crate)structMetaVarsDifSeqMatchers{
@@ -43,6 +64,12 @@ pub(crate) struct MetaVarsDifSeqMatchers {
 pubmsg:String,
 }
 
+#[derive(LintDiagnostic)]
+#[diag(expand_unknown_macro_variable)]
+pub(crate)structUnknownMacroVariable{
+pubname:MacroRulesNormalizedIdent,
+}
+
 #[derive(Diagnostic)]
 #[diag(expand_resolve_relative_path)]
 pub(crate)structResolveRelativePath{
@@ -345,6 +372,15 @@ pub(crate) struct DuplicateMatcherBinding {
 pubprev:Span,
 }
 
+#[derive(LintDiagnostic)]
+#[diag(expand_duplicate_matcher_binding)]
+pub(crate)structDuplicateMatcherBindingLint{
+#[label]
+pubspan:Span,
+#[label(expand_label2)]
+pubprev:Span,
+}
+
 #[derive(Diagnostic)]
 #[diag(expand_missing_fragment_specifier)]
 #[note]

compiler/rustc_expand/src/mbe/macro_check.rs

@@ -108,8 +108,7 @@
 use rustc_ast::token::{Delimiter,IdentIsRaw,Token,TokenKind};
 use rustc_ast::{DUMMY_NODE_ID,NodeId};
 use rustc_data_structures::fx::FxHashMap;
-use rustc_errors::MultiSpan;
-use rustc_lint_defs::BuiltinLintDiag;
+use rustc_errors::DecorateDiagCompat;
 use rustc_session::lint::builtin::META_VARIABLE_MISUSE;
 use rustc_session::parse::ParseSess;
 use rustc_span::{ErrorGuaranteed,MacroRulesNormalizedIdent,Span, kw};
@@ -245,9 +244,12 @@ fn check_binders(
 // There are 3 possibilities:
 ifletSome(prev_info) = binders.get(&name){
 // 1. The meta-variable is already bound in the current LHS: This is an error.
-letmut span = MultiSpan::from_span(span);
- span.push_span_label(prev_info.span,"previous declaration");
-buffer_lint(psess, span, node_id,BuiltinLintDiag::DuplicateMatcherBinding);
+buffer_lint(
+ psess,
+ span,
+ node_id,
+ errors::DuplicateMatcherBindingLint{ span,prev: prev_info.span},
+);
 }elseifget_binder_info(macros, binders, name).is_none(){
 // 2. The meta-variable is free: This is a binder.
  binders.insert(name,BinderInfo{ span,ops: ops.into()});
@@ -579,7 +581,7 @@ fn check_ops_is_prefix(
 return;
 }
 }
-buffer_lint(psess, span.into(), node_id,BuiltinLintDiag::UnknownMacroVariable(name));
+buffer_lint(psess, span, node_id,errors::UnknownMacroVariable{name});
 }
 
 /// Returns whether `binder_ops` is a prefix of `occurrence_ops`.
@@ -604,29 +606,42 @@ fn ops_is_prefix(
 psess:&ParseSess,
 node_id:NodeId,
 span:Span,
-name:MacroRulesNormalizedIdent,
+ident:MacroRulesNormalizedIdent,
 binder_ops:&[KleeneToken],
 occurrence_ops:&[KleeneToken],
 ){
 for(i, binder)in binder_ops.iter().enumerate(){
 if i >= occurrence_ops.len(){
-letmut span = MultiSpan::from_span(span);
- span.push_span_label(binder.span,"expected repetition");
-buffer_lint(psess, span, node_id,BuiltinLintDiag::MetaVariableStillRepeating(name));
+buffer_lint(
+ psess,
+ span,
+ node_id,
+ errors::MetaVarStillRepeatingLint{label: binder.span, ident },
+);
 return;
 }
 let occurrence = &occurrence_ops[i];
 if occurrence.op != binder.op{
-letmut span = MultiSpan::from_span(span);
- span.push_span_label(binder.span,"expected repetition");
- span.push_span_label(occurrence.span,"conflicting repetition");
-buffer_lint(psess, span, node_id,BuiltinLintDiag::MetaVariableWrongOperator);
+buffer_lint(
+ psess,
+ span,
+ node_id,
+ errors::MetaVariableWrongOperator{
+binder: binder.span,
+occurrence: occurrence.span,
+},
+);
 return;
 }
 }
 }
 
-fnbuffer_lint(psess:&ParseSess,span:MultiSpan,node_id:NodeId,diag:BuiltinLintDiag){
+fnbuffer_lint(
+psess:&ParseSess,
+span:Span,
+node_id:NodeId,
+diag:implInto<DecorateDiagCompat>,
+){
 // Macros loaded from other crates have dummy node ids.
 if node_id != DUMMY_NODE_ID{
  psess.buffer_lint(META_VARIABLE_MISUSE, span, node_id, diag);