Move remaining early buffered lints for rustc_parse to dyn lint diagnostics

Author: fmease

compiler/rustc_lint/messages.ftl

@@ -44,9 +44,6 @@ lint_bad_attribute_argument = bad attribute argument
 
 lint_bad_opt_access = {$msg}
 
-lint_break_with_label_and_loop = this labeled break expression is easy to confuse with an unlabeled break with a labeled value expression
-    .suggestion = wrap this expression in parentheses
-
 lint_builtin_allow_internal_unsafe =
     `allow_internal_unsafe` allows defining macros using unsafe without triggering the `unsafe_code` lint at their call site
 
@@ -765,11 +762,6 @@ lint_range_endpoint_out_of_range = range endpoint is out of range for `{$ty}`
 
 lint_range_use_inclusive_range = use an inclusive range instead
 
-
-lint_raw_prefix = prefix `'r` is reserved
-    .label = reserved prefix
-    .suggestion = insert whitespace here to avoid this being parsed as a prefix in Rust 2021
-
 lint_reason_must_be_string_literal = reason must be a string literal
 
 lint_reason_must_come_last = reason in lint attribute must come last
@@ -801,16 +793,6 @@ lint_renamed_lint = lint `{$name}` has been renamed to `{$replace}`
 
 lint_requested_level = requested on the command line with `{$level} {$lint_name}`
 
-lint_reserved_multihash = reserved token in Rust 2024
-    .suggestion = insert whitespace here to avoid this being parsed as a forbidden token in Rust 2024
-
-lint_reserved_prefix = prefix `{$prefix}` is unknown
-    .label = unknown prefix
-    .suggestion = insert whitespace here to avoid this being parsed as a prefix in Rust 2021
-
-lint_reserved_string = will be parsed as a guarded string in Rust 2024
-    .suggestion = insert whitespace here to avoid this being parsed as a guarded string in Rust 2024
-
 lint_shadowed_into_iter =
     this method call resolves to `<&{$target} as IntoIterator>::into_iter` (due to backwards compatibility), but will resolve to `<{$target} as IntoIterator>::into_iter` in Rust {$edition}
     .use_iter_suggestion = use `.iter()` instead of `.into_iter()` to avoid ambiguity
@@ -927,16 +909,6 @@ lint_unexpected_cfg_value_specify_value = specify a config value
 lint_ungated_async_fn_track_caller = `#[track_caller]` on async functions is a no-op
      .label = this function will not propagate the caller location
 
-lint_unicode_text_flow = unicode codepoint changing visible direction of text present in comment
-    .label = {$num_codepoints ->
-            [1] this comment contains an invisible unicode text flow control codepoint
-            *[other] this comment contains invisible unicode text flow control codepoints
-        }
-    .note = these kind of unicode codepoints change the way text flows on applications that support them, but can cause confusion because they change the order of characters on the screen
-    .suggestion = if their presence wasn't intentional, you can remove them
-    .label_comment_char = {$c_debug}
-
-
 lint_unit_bindings = binding has unit type `()`
     .label = this pattern is inferred to be the unit type `()`
 

compiler/rustc_lint/src/early/diagnostics.rs

@@ -1,6 +1,5 @@
 use std::borrow::Cow;
 
-use rustc_ast::util::unicode::TEXT_FLOW_CONTROL_CHARS;
 use rustc_errors::{
     Applicability, Diag, DiagArgValue, LintDiagnostic, elided_lifetime_in_path_suggestion,
 };
@@ -9,7 +8,6 @@ use rustc_middle::middle::stability;
 use rustc_middle::ty::TyCtxt;
 use rustc_session::Session;
 use rustc_session::lint::BuiltinLintDiag;
-use rustc_span::BytePos;
 use tracing::debug;
 
 use crate::lints;
@@ -23,32 +21,6 @@ pub fn decorate_builtin_lint(
     diag: &mut Diag<'_, ()>,
 ) {
     match diagnostic {
-        BuiltinLintDiag::UnicodeTextFlow(comment_span, content) => {
-            let spans: Vec<_> = content
-                .char_indices()
-                .filter_map(|(i, c)| {
-                    TEXT_FLOW_CONTROL_CHARS.contains(&c).then(|| {
-                        let lo = comment_span.lo() + BytePos(2 + i as u32);
-                        (c, comment_span.with_lo(lo).with_hi(lo + BytePos(c.len_utf8() as u32)))
-                    })
-                })
-                .collect();
-            let characters = spans
-                .iter()
-                .map(|&(c, span)| lints::UnicodeCharNoteSub { span, c_debug: format!("{c:?}") })
-                .collect();
-            let suggestions = (!spans.is_empty()).then_some(lints::UnicodeTextFlowSuggestion {
-                spans: spans.iter().map(|(_c, span)| *span).collect(),
-            });
-
-            lints::UnicodeTextFlow {
-                comment_span,
-                characters,
-                suggestions,
-                num_codepoints: spans.len(),
-            }
-            .decorate_lint(diag);
-        }
         BuiltinLintDiag::AbsPathWithModule(mod_span) => {
             let (replacement, applicability) = match sess.source_map().span_to_snippet(mod_span) {
                 Ok(ref s) => {
@@ -141,34 +113,6 @@ pub fn decorate_builtin_lint(
             }
             .decorate_lint(diag);
         }
-        BuiltinLintDiag::ReservedPrefix(label_span, prefix) => {
-            lints::ReservedPrefix {
-                label: label_span,
-                suggestion: label_span.shrink_to_hi(),
-                prefix,
-            }
-            .decorate_lint(diag);
-        }
-        BuiltinLintDiag::RawPrefix(label_span) => {
-            lints::RawPrefix { label: label_span, suggestion: label_span.shrink_to_hi() }
-                .decorate_lint(diag);
-        }
-        BuiltinLintDiag::ReservedString { is_string, suggestion } => {
-            if is_string {
-                lints::ReservedString { suggestion }.decorate_lint(diag);
-            } else {
-                lints::ReservedMultihash { suggestion }.decorate_lint(diag);
-            }
-        }
-        BuiltinLintDiag::BreakWithLabelAndLoop(sugg_span) => {
-            lints::BreakWithLabelAndLoop {
-                sub: lints::BreakWithLabelAndLoopSub {
-                    left: sugg_span.shrink_to_lo(),
-                    right: sugg_span.shrink_to_hi(),
-                },
-            }
-            .decorate_lint(diag);
-        }
         BuiltinLintDiag::DeprecatedWhereclauseLocation(left_sp, sugg) => {
             let suggestion = match sugg {
                 Some((right_sp, sugg)) => lints::DeprecatedWhereClauseLocationSugg::MoveToEnd {

compiler/rustc_lint/src/lints.rs

@@ -2604,35 +2604,6 @@ pub(crate) struct IllFormedAttributeInput {
     pub docs: &'static str,
 }
 
-#[derive(LintDiagnostic)]
-#[diag(lint_unicode_text_flow)]
-#[note]
-pub(crate) struct UnicodeTextFlow {
-    #[label]
-    pub comment_span: Span,
-    #[subdiagnostic]
-    pub characters: Vec<UnicodeCharNoteSub>,
-    #[subdiagnostic]
-    pub suggestions: Option<UnicodeTextFlowSuggestion>,
-
-    pub num_codepoints: usize,
-}
-
-#[derive(Subdiagnostic)]
-#[label(lint_label_comment_char)]
-pub(crate) struct UnicodeCharNoteSub {
-    #[primary_span]
-    pub span: Span,
-    pub c_debug: String,
-}
-
-#[derive(Subdiagnostic)]
-#[multipart_suggestion(lint_suggestion, applicability = "machine-applicable", style = "hidden")]
-pub(crate) struct UnicodeTextFlowSuggestion {
-    #[suggestion_part(code = "")]
-    pub spans: Vec<Span>,
-}
-
 #[derive(LintDiagnostic)]
 #[diag(lint_abs_path_with_module)]
 pub(crate) struct AbsPathWithModule {
@@ -2737,42 +2708,6 @@ pub(crate) struct PatternsInFnsWithoutBodySub {
     pub ident: Ident,
 }
 
-#[derive(LintDiagnostic)]
-#[diag(lint_reserved_prefix)]
-pub(crate) struct ReservedPrefix {
-    #[label]
-    pub label: Span,
-    #[suggestion(code = " ", applicability = "machine-applicable")]
-    pub suggestion: Span,
-
-    pub prefix: String,
-}
-
-#[derive(LintDiagnostic)]
-#[diag(lint_raw_prefix)]
-pub(crate) struct RawPrefix {
-    #[label]
-    pub label: Span,
-    #[suggestion(code = " ", applicability = "machine-applicable")]
-    pub suggestion: Span,
-}
-
-#[derive(LintDiagnostic)]
-#[diag(lint_break_with_label_and_loop)]
-pub(crate) struct BreakWithLabelAndLoop {
-    #[subdiagnostic]
-    pub sub: BreakWithLabelAndLoopSub,
-}
-
-#[derive(Subdiagnostic)]
-#[multipart_suggestion(lint_suggestion, applicability = "machine-applicable")]
-pub(crate) struct BreakWithLabelAndLoopSub {
-    #[suggestion_part(code = "(")]
-    pub left: Span,
-    #[suggestion_part(code = ")")]
-    pub right: Span,
-}
-
 #[derive(LintDiagnostic)]
 #[diag(lint_deprecated_where_clause_location)]
 #[note]
@@ -2927,20 +2862,6 @@ pub(crate) enum MutRefSugg {
 #[diag(lint_unqualified_local_imports)]
 pub(crate) struct UnqualifiedLocalImportsDiag {}
 
-#[derive(LintDiagnostic)]
-#[diag(lint_reserved_string)]
-pub(crate) struct ReservedString {
-    #[suggestion(code = " ", applicability = "machine-applicable")]
-    pub suggestion: Span,
-}
-
-#[derive(LintDiagnostic)]
-#[diag(lint_reserved_multihash)]
-pub(crate) struct ReservedMultihash {
-    #[suggestion(code = " ", applicability = "machine-applicable")]
-    pub suggestion: Span,
-}
-
 #[derive(LintDiagnostic)]
 #[diag(lint_function_casts_as_integer)]
 pub(crate) struct FunctionCastsAsIntegerDiag<'tcx> {

compiler/rustc_lint_defs/src/lib.rs

@@ -678,16 +678,6 @@ pub enum BuiltinLintDiag {
         ident: Ident,
         is_foreign: bool,
     },
-    ReservedPrefix(Span, String),
-    /// `'r#` in edition < 2021.
-    RawPrefix(Span),
-    /// `##` or `#"` in edition < 2024.
-    ReservedString {
-        is_string: bool,
-        suggestion: Span,
-    },
-    BreakWithLabelAndLoop(Span),
-    UnicodeTextFlow(Span, String),
     DeprecatedWhereclauseLocation(Span, Option<(Span, String)>),
     SingleUseLifetime {
         /// Span of the parameter which declares this lifetime.

compiler/rustc_parse/messages.ftl

@@ -115,6 +115,9 @@ parse_box_not_pat = expected pattern, found {$descr}
 parse_box_syntax_removed = `box_syntax` has been removed
 parse_box_syntax_removed_suggestion = use `Box::new()` instead
 
+parse_break_with_label_and_loop = this labeled break expression is easy to confuse with an unlabeled break with a labeled value expression
+    .suggestion = wrap this expression in parentheses
+
 parse_cannot_be_raw_ident = `{$ident}` cannot be a raw identifier
 
 parse_cannot_be_raw_lifetime = `{$ident}` cannot be a raw lifetime
@@ -773,6 +776,10 @@ parse_question_mark_in_type = invalid `?` in type
     .label = `?` is only allowed on expressions, not types
     .suggestion = if you meant to express that the type might not contain a value, use the `Option` wrapper type
 
+parse_raw_prefix = prefix `'r` is reserved
+    .label = reserved prefix
+    .suggestion = insert whitespace here to avoid this being parsed as a prefix in Rust 2021
+
 parse_recover_import_as_use = expected item, found {$token_name}
     .suggestion = items are imported using the `use` keyword
 
@@ -787,13 +794,23 @@ parse_require_colon_after_labeled_expression = labeled expression must be follow
     .label = the label
     .suggestion = add `:` after the label
 
+parse_reserved_guarded_string = invalid string literal
+    .note = unprefixed guarded string literals are reserved for future use since Rust 2024
+    .suggestion = consider inserting whitespace here
+
+parse_reserved_guarded_string_lint = will be parsed as a guarded string in Rust 2024
+    .suggestion = insert whitespace here to avoid this being parsed as a guarded string in Rust 2024
+
 parse_reserved_multihash = reserved multi-hash token is forbidden
     .note = sequences of two or more # are reserved for future use since Rust 2024
-    .suggestion_whitespace = consider inserting whitespace here
+    .suggestion = consider inserting whitespace here
 
-parse_reserved_string = invalid string literal
-    .note = unprefixed guarded string literals are reserved for future use since Rust 2024
-    .suggestion_whitespace = consider inserting whitespace here
+parse_reserved_multihash_lint = reserved token in Rust 2024
+    .suggestion = insert whitespace here to avoid this being parsed as a forbidden token in Rust 2024
+
+parse_reserved_prefix = prefix `{$prefix}` is unknown
+    .label = unknown prefix
+    .suggestion = insert whitespace here to avoid this being parsed as a prefix in Rust 2021
 
 parse_return_types_use_thin_arrow = return types are denoted using `->`
     .suggestion = use `->` instead
@@ -951,6 +968,14 @@ parse_unicode_escape_in_byte = unicode escape in byte string
     .label = {parse_unicode_escape_in_byte}
     .help = unicode escape sequences cannot be used as a byte or in a byte string
 
+parse_unicode_text_flow = unicode codepoint changing visible direction of text present in comment
+    .label = {$num_codepoints ->
+            [1] this comment contains an invisible unicode text flow control codepoint
+            *[other] this comment contains invisible unicode text flow control codepoints
+        }
+    .note = these kind of unicode codepoints change the way text flows on applications that support them, but can cause confusion because they change the order of characters on the screen
+    .suggestion = if their presence wasn't intentional, you can remove them
+
 parse_unknown_builtin_construct = unknown `builtin #` construct `{$name}`
 
 parse_unknown_prefix = prefix `{$prefix}` is unknown