Some cleanup

Author: gabrielbusta

compiler/rustc_error_messages/locales/en-US/trait_selection.ftl

@@ -3,15 +3,15 @@ dump_vtable_entries = vtable entries for `{$trait_ref}`: {$entries}
 unable_to_construct_constant_value = unable to construct a constant value for the unevaluated constant {$unevaluated}
 
 auto_deref_reached_recursion_limit = reached the recursion limit while auto-dereferencing `{$ty}`
-auto_deref_reached_recursion_limit_label = deref recursion limit reached
-auto_deref_reached_recursion_limit_help = consider increasing the recursion limit by adding a `#![recursion_limit = "{$suggested_limit}"]` attribute to your crate (`{$crate_name}`)
+    .label = deref recursion limit reached
+    .help = consider increasing the recursion limit by adding a `#![recursion_limit = "{$suggested_limit}"]` attribute to your crate (`{$crate_name}`)
 
 empty_on_clause_in_rustc_on_unimplemented = empty `on`-clause in `#[rustc_on_unimplemented]`
-empty_on_clause_in_rustc_on_unimplemented_label = empty on-clause here
+    .label = empty on-clause here
 
 invalid_on_clause_in_rustc_on_unimplemented = invalid `on`-clause in `#[rustc_on_unimplemented]`
-invalid_on_clause_in_rustc_on_unimplemented_label = invalid on-clause here
+    .label = invalid on-clause here
 
 no_value_in_rustc_on_unimplemented = this attribute must have a valid value
-no_value_in_rustc_on_unimplemented_label = expected value here
-no_value_in_rustc_on_unimplemented_note = "eg `#[rustc_on_unimplemented(message="foo")]`"
+    .label = expected value here
+    .note = "eg `#[rustc_on_unimplemented(message="foo")]`"

compiler/rustc_trait_selection/src/errors.rs

@@ -19,11 +19,11 @@ pub struct UnableToConstructConstantValue {
 }
 
 #[derive(SessionDiagnostic)]
-#[help(trait_selection::auto_deref_reached_recursion_limit_help)]
+#[help]
 #[error(trait_selection::auto_deref_reached_recursion_limit, code = "E0055")]
 pub struct AutoDerefReachedRecursionLimit {
     #[primary_span]
-    #[label(trait_selection::auto_deref_reached_recursion_limit_label)]
+    #[label]
     pub span: Span,
     pub ty: String,
     pub suggested_limit: String,
@@ -34,23 +34,23 @@ pub struct AutoDerefReachedRecursionLimit {
 #[error(trait_selection::empty_on_clause_in_rustc_on_unimplemented, code = "E0232")]
 pub struct EmptyOnClauseInOnUnimplemented {
     #[primary_span]
-    #[label(trait_selection::empty_on_clause_in_rustc_on_unimplemented_label)]
+    #[label]
     pub span: Span,
 }
 
 #[derive(SessionDiagnostic)]
 #[error(trait_selection::invalid_on_clause_in_rustc_on_unimplemented, code = "E0232")]
 pub struct InvalidOnClauseInOnUnimplemented {
     #[primary_span]
-    #[label(trait_selection::invalid_on_clause_in_rustc_on_unimplemented_label)]
+    #[label]
     pub span: Span,
 }
 
 #[derive(SessionDiagnostic)]
 #[error(trait_selection::no_value_in_rustc_on_unimplemented, code = "E0232")]
 pub struct NoValueInOnUnimplemented {
     #[primary_span]
-    #[label(trait_selection::no_value_in_rustc_on_unimplemented_label)]
-    #[note(trait_selection::no_value_in_rustc_on_unimplemented_note)]
+    #[label]
+    #[note]
     pub span: Span,
 }