Remove last remaining usages of UnsupportedLiteral

Author: JonathanBrouwer

compiler/rustc_attr_parsing/messages.ftl

@@ -235,8 +235,6 @@ attr_parsing_unstable_cfg_target_compact =
 attr_parsing_unstable_feature_bound_incompatible_stability = item annotated with `#[unstable_feature_bound]` should not be stable
     .help = If this item is meant to be stable, do not use any functions annotated with `#[unstable_feature_bound]`. Otherwise, mark this item as unstable with `#[unstable]`
 
-attr_parsing_unsupported_literal_generic =
-    unsupported literal
 attr_parsing_unsupported_literal_suggestion =
     consider removing the prefix
 

compiler/rustc_attr_parsing/src/attributes/stability.rs

@@ -302,11 +302,7 @@ pub(crate) fn parse_stability<S: Stage>(
     for param in list.mixed() {
         let param_span = param.span();
         let Some(param) = param.meta_item() else {
-            cx.emit_err(session_diagnostics::UnsupportedLiteral {
-                span: param_span,
-                is_bytestr: false,
-                start_point_span: cx.sess().source_map().start_point(param_span),
-            });
+            cx.unexpected_literal(param.span());
             return None;
         };
 
@@ -381,11 +377,7 @@ pub(crate) fn parse_unstability<S: Stage>(
 
     for param in list.mixed() {
         let Some(param) = param.meta_item() else {
-            cx.emit_err(session_diagnostics::UnsupportedLiteral {
-                span: param.span(),
-                is_bytestr: false,
-                start_point_span: cx.sess().source_map().start_point(param.span()),
-            });
+            cx.unexpected_literal(param.span());
             return None;
         };
 

compiler/rustc_attr_parsing/src/session_diagnostics.rs

@@ -217,31 +217,6 @@ pub(crate) struct InvalidReprHintNoValue {
     pub name: Symbol,
 }
 
-/// Error code: E0565
-// FIXME(jdonszelmann): slowly phased out
-pub(crate) struct UnsupportedLiteral {
-    pub span: Span,
-    pub is_bytestr: bool,
-    pub start_point_span: Span,
-}
-
-impl<'a, G: EmissionGuarantee> Diagnostic<'a, G> for UnsupportedLiteral {
-    fn into_diag(self, dcx: DiagCtxtHandle<'a>, level: Level) -> Diag<'a, G> {
-        let mut diag = Diag::new(dcx, level, fluent::attr_parsing_unsupported_literal_generic);
-        diag.span(self.span);
-        diag.code(E0565);
-        if self.is_bytestr {
-            diag.span_suggestion(
-                self.start_point_span,
-                fluent::attr_parsing_unsupported_literal_suggestion,
-                "",
-                Applicability::MaybeIncorrect,
-            );
-        }
-        diag
-    }
-}
-
 #[derive(Diagnostic)]
 #[diag(attr_parsing_invalid_repr_align_need_arg, code = E0589)]
 pub(crate) struct InvalidReprAlignNeedArg {