Move some more early buffered lints to dyn lint diagnostics

Author: fmease

compiler/rustc_builtin_macros/messages.ftl

@@ -259,6 +259,11 @@ builtin_macros_naked_functions_testing_attribute =
     .label = function marked with testing attribute here
     .naked_attribute = `#[unsafe(naked)]` is incompatible with testing attributes
 
+builtin_macros_named_argument_used_positionally = named argument `{$named_arg_name}` is not used by name
+    .label_named_arg = this named argument is referred to by position in formatting string
+    .label_position_arg = this formatting argument uses named argument `{$named_arg_name}` by position
+    .suggestion = use the named argument by name to avoid ambiguity
+
 builtin_macros_no_default_variant = `#[derive(Default)]` on enum with no `#[default]`
     .label = this enum needs a unit variant marked with `#[default]`
     .suggestion = make this unit variant default by placing `#[default]` on it

compiler/rustc_builtin_macros/src/errors.rs

@@ -1,11 +1,13 @@
 use rustc_errors::codes::*;
 use rustc_errors::{
-    Diag, DiagCtxtHandle, Diagnostic, EmissionGuarantee, Level, MultiSpan, SingleLabelManySpans,
-    Subdiagnostic,
+    Applicability, Diag, DiagCtxtHandle, Diagnostic, EmissionGuarantee, Level, LintDiagnostic,
+    MultiSpan, SingleLabelManySpans, Subdiagnostic,
 };
 use rustc_macros::{Diagnostic, LintDiagnostic, Subdiagnostic};
 use rustc_span::{Ident, Span, Symbol};
 
+use crate::fluent_generated as fluent;
+
 #[derive(LintDiagnostic)]
 #[diag(builtin_macros_avoid_intel_syntax)]
 pub(crate) struct AvoidIntelSyntax;
@@ -1010,3 +1012,35 @@ pub(crate) struct CfgSelectUnreachable {
     #[label]
     pub wildcard_span: Span,
 }
+
+pub(crate) struct NamedArgumentUsedPositionally {
+    pub position_sp_to_replace: Option<Span>,
+    pub position_sp_for_msg: Option<Span>,
+    pub named_arg_sp: Span,
+    pub named_arg_name: Symbol,
+    pub is_formatting_arg: bool,
+}
+
+impl<'a> LintDiagnostic<'a, ()> for NamedArgumentUsedPositionally {
+    fn decorate_lint<'b>(self, diag: &'b mut Diag<'a, ()>) {
+        diag.primary_message(fluent::builtin_macros_named_argument_used_positionally);
+        diag.span_label(self.named_arg_sp, fluent::builtin_macros_label_named_arg);
+        if let Some(span) = self.position_sp_for_msg {
+            diag.span_label(span, fluent::builtin_macros_label_position_arg);
+        }
+        diag.arg("named_arg_name", self.named_arg_name);
+
+        if let Some(positional_arg_to_replace) = self.position_sp_to_replace {
+            let mut name = self.named_arg_name.to_string();
+            if self.is_formatting_arg {
+                name.push('$')
+            };
+            diag.span_suggestion_verbose(
+                positional_arg_to_replace,
+                fluent::builtin_macros_suggestion,
+                name,
+                Applicability::MaybeIncorrect,
+            );
+        }
+    }
+}

compiler/rustc_builtin_macros/src/format.rs

@@ -14,8 +14,8 @@ use rustc_errors::{
     pluralize,
 };
 use rustc_expand::base::*;
+use rustc_lint_defs::LintId;
 use rustc_lint_defs::builtin::NAMED_ARGUMENTS_USED_POSITIONALLY;
-use rustc_lint_defs::{BuiltinLintDiag, LintId};
 use rustc_parse::exp;
 use rustc_parse_format as parse;
 use rustc_span::{BytePos, ErrorGuaranteed, Ident, InnerSpan, Span, Symbol};
@@ -589,11 +589,11 @@ fn make_format_args(
                 span: Some(arg_name.span.into()),
                 node_id: rustc_ast::CRATE_NODE_ID,
                 lint_id: LintId::of(NAMED_ARGUMENTS_USED_POSITIONALLY),
-                diagnostic: BuiltinLintDiag::NamedArgumentUsedPositionally {
+                diagnostic: errors::NamedArgumentUsedPositionally {
                     position_sp_to_replace,
                     position_sp_for_msg,
                     named_arg_sp: arg_name.span,
-                    named_arg_name: arg_name.name.to_string(),
+                    named_arg_name: arg_name.name,
                     is_formatting_arg: matches!(used_as, Width | Precision),
                 }
                 .into(),

compiler/rustc_lint/messages.ftl

@@ -596,11 +596,6 @@ lint_mixed_script_confusables =
 
 lint_multiple_supertrait_upcastable = `{$ident}` is dyn-compatible and has multiple supertraits
 
-lint_named_argument_used_positionally = named argument `{$named_arg_name}` is not used by name
-    .label_named_arg = this named argument is referred to by position in formatting string
-    .label_position_arg = this formatting argument uses named argument `{$named_arg_name}` by position
-    .suggestion = use the named argument by name to avoid ambiguity
-
 lint_node_source = `forbid` level set here
     .note = {$reason}
 
@@ -954,9 +949,6 @@ lint_unused_coroutine =
     }{$post} that must be used
     .note = coroutines are lazy and do nothing unless resumed
 
-lint_unused_crate_dependency = extern crate `{$extern_crate}` is unused in crate `{$local_crate}`
-    .help = remove the dependency or add `use {$extern_crate} as _;` to the crate root
-
 lint_unused_def = unused {$pre}`{$def}`{$post} that must be used
     .suggestion = use `let _ = ...` to ignore the resulting value
 

compiler/rustc_lint/src/early/diagnostics.rs

@@ -135,41 +135,6 @@ pub fn decorate_builtin_lint(
         BuiltinLintDiag::SingleUseLifetime { use_span: None, deletion_span, ident, .. } => {
             lints::UnusedLifetime { deletion_span, ident }.decorate_lint(diag);
         }
-        BuiltinLintDiag::NamedArgumentUsedPositionally {
-            position_sp_to_replace,
-            position_sp_for_msg,
-            named_arg_sp,
-            named_arg_name,
-            is_formatting_arg,
-        } => {
-            let (suggestion, name) = if let Some(positional_arg_to_replace) = position_sp_to_replace
-            {
-                let mut name = named_arg_name.clone();
-                if is_formatting_arg {
-                    name.push('$')
-                };
-                let span_to_replace = if let Ok(positional_arg_content) =
-                    sess.source_map().span_to_snippet(positional_arg_to_replace)
-                    && positional_arg_content.starts_with(':')
-                {
-                    positional_arg_to_replace.shrink_to_lo()
-                } else {
-                    positional_arg_to_replace
-                };
-                (Some(span_to_replace), name)
-            } else {
-                (None, String::new())
-            };
-
-            lints::NamedArgumentUsedPositionally {
-                named_arg_sp,
-                position_label_sp: position_sp_for_msg,
-                suggestion,
-                name,
-                named_arg_name,
-            }
-            .decorate_lint(diag);
-        }
         BuiltinLintDiag::AmbiguousGlobReexports {
             name,
             namespace,
@@ -217,9 +182,6 @@ pub fn decorate_builtin_lint(
             }
             .decorate_lint(diag);
         }
-        BuiltinLintDiag::UnusedCrateDependency { extern_crate, local_crate } => {
-            lints::UnusedCrateDependency { extern_crate, local_crate }.decorate_lint(diag)
-        }
         BuiltinLintDiag::AttributeLint(kind) => decorate_attribute_lint(sess, tcx, &kind, diag),
     }
 }

compiler/rustc_lint/src/lints.rs

@@ -2574,14 +2574,6 @@ pub(crate) mod unexpected_cfg_value {
     }
 }
 
-#[derive(LintDiagnostic)]
-#[diag(lint_unused_crate_dependency)]
-#[help]
-pub(crate) struct UnusedCrateDependency {
-    pub extern_crate: Symbol,
-    pub local_crate: Symbol,
-}
-
 // FIXME(jdonszelmann): duplicated in rustc_attr_parsing, should be moved there completely.
 #[derive(LintDiagnostic)]
 #[diag(lint_ill_formed_attribute_input)]
@@ -2707,20 +2699,6 @@ pub(crate) struct UnusedLifetime {
     pub ident: Ident,
 }
 
-#[derive(LintDiagnostic)]
-#[diag(lint_named_argument_used_positionally)]
-pub(crate) struct NamedArgumentUsedPositionally {
-    #[label(lint_label_named_arg)]
-    pub named_arg_sp: Span,
-    #[label(lint_label_position_arg)]
-    pub position_label_sp: Option<Span>,
-    #[suggestion(style = "verbose", code = "{name}", applicability = "maybe-incorrect")]
-    pub suggestion: Option<Span>,
-
-    pub name: String,
-    pub named_arg_name: String,
-}
-
 #[derive(LintDiagnostic)]
 #[diag(lint_ambiguous_glob_reexport)]
 pub(crate) struct AmbiguousGlobReexports {

compiler/rustc_lint_defs/src/lib.rs

@@ -684,19 +684,6 @@ pub enum BuiltinLintDiag {
         use_span: Option<(Span, bool)>,
         ident: Ident,
     },
-    NamedArgumentUsedPositionally {
-        /// Span where the named argument is used by position and will be replaced with the named
-        /// argument name
-        position_sp_to_replace: Option<Span>,
-        /// Span where the named argument is used by position and is used for lint messages
-        position_sp_for_msg: Option<Span>,
-        /// Span where the named argument's name is (so we know where to put the warning message)
-        named_arg_sp: Span,
-        /// String containing the named arguments name
-        named_arg_name: String,
-        /// Indicates if the named argument is used as a width/precision for formatting
-        is_formatting_arg: bool,
-    },
     AmbiguousGlobReexports {
         /// The name for which collision(s) have occurred.
         name: String,
@@ -726,10 +713,6 @@ pub enum BuiltinLintDiag {
         span: Span,
         lifetimes_in_scope: MultiSpan,
     },
-    UnusedCrateDependency {
-        extern_crate: Symbol,
-        local_crate: Symbol,
-    },
     AttributeLint(AttributeLintKind),
 }
 

compiler/rustc_metadata/messages.ftl

@@ -236,5 +236,8 @@ metadata_two_panic_runtimes =
 
 metadata_unknown_target_modifier_unsafe_allowed = unknown target modifier `{$flag_name}`, requested by `-Cunsafe-allow-abi-mismatch={$flag_name}`
 
+metadata_unused_crate_dependency = extern crate `{$extern_crate}` is unused in crate `{$local_crate}`
+    .help = remove the dependency or add `use {$extern_crate} as _;` to the crate root
+
 metadata_wasm_c_abi =
     older versions of the `wasm-bindgen` crate are incompatible with current versions of Rust; please update to `wasm-bindgen` v0.2.88

compiler/rustc_metadata/src/creader.rs

@@ -23,15 +23,14 @@ use rustc_middle::bug;
 use rustc_middle::ty::data_structures::IndexSet;
 use rustc_middle::ty::{TyCtxt, TyCtxtFeed};
 use rustc_proc_macro::bridge::client::ProcMacro;
-use rustc_session::Session;
 use rustc_session::config::{
     CrateType, ExtendedTargetModifierInfo, ExternLocation, Externs, OptionsTargetModifiers,
     TargetModifier,
 };
 use rustc_session::cstore::{CrateDepKind, CrateSource, ExternCrate, ExternCrateSource};
-use rustc_session::lint::{self, BuiltinLintDiag};
 use rustc_session::output::validate_crate_name;
 use rustc_session::search_paths::PathKind;
+use rustc_session::{Session, lint};
 use rustc_span::def_id::DefId;
 use rustc_span::edition::Edition;
 use rustc_span::{DUMMY_SP, Ident, Span, Symbol, sym};
@@ -1261,7 +1260,7 @@ impl CStore {
                 lint::builtin::UNUSED_CRATE_DEPENDENCIES,
                 span,
                 ast::CRATE_NODE_ID,
-                BuiltinLintDiag::UnusedCrateDependency {
+                errors::UnusedCrateDependency {
                     extern_crate: name_interned,
                     local_crate: tcx.crate_name(LOCAL_CRATE),
                 },

compiler/rustc_metadata/src/errors.rs

@@ -3,7 +3,7 @@ use std::path::{Path, PathBuf};
 
 use rustc_errors::codes::*;
 use rustc_errors::{Diag, DiagCtxtHandle, Diagnostic, EmissionGuarantee, Level};
-use rustc_macros::{Diagnostic, Subdiagnostic};
+use rustc_macros::{Diagnostic, LintDiagnostic, Subdiagnostic};
 use rustc_span::{Span, Symbol, sym};
 use rustc_target::spec::{PanicStrategy, TargetTuple};
 
@@ -615,3 +615,11 @@ pub struct RawDylibMalformed {
     #[primary_span]
     pub span: Span,
 }
+
+#[derive(LintDiagnostic)]
+#[diag(metadata_unused_crate_dependency)]
+#[help]
+pub(crate) struct UnusedCrateDependency {
+    pub extern_crate: Symbol,
+    pub local_crate: Symbol,
+}