Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit c90dc20

Browse files
nnethercotennethercote
committedMar 7, 2024
Rename SubdiagnosticKind as SubdiagKind.
1 parent e67d6f2 commit c90dc20

File tree

3 files changed

+60
-65
lines changed

3 files changed

+60
-65
lines changed
 

‎compiler/rustc_macros/src/diagnostics/diagnostic_builder.rs

+17-17
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::diagnostics::error::{span_err, throw_invalid_attr, throw_span_err, Di
44
use crate::diagnostics::utils::{
55
build_field_mapping, is_doc_comment, report_error_if_not_applied_to_span, report_type_error,
66
should_generate_arg, type_is_bool, type_is_unit, type_matches_path, FieldInfo, FieldInnerTy,
7-
FieldMap, HasFieldMap, SetOnce, SpannedOption, SubdiagnosticKind,
7+
FieldMap, HasFieldMap, SetOnce, SpannedOption, SubdiagKind,
88
};
99
use proc_macro2::{Ident, Span, TokenStream};
1010
use quote::{format_ident, quote, quote_spanned};
@@ -137,28 +137,28 @@ impl DiagDeriveVariantBuilder {
137137
body
138138
}
139139

140-
/// Parse a `SubdiagnosticKind` from an `Attribute`.
140+
/// Parse a `SubdiagKind` from an `Attribute`.
141141
fn parse_subdiag_attribute(
142142
&self,
143143
attr: &Attribute,
144-
) -> Result<Option<(SubdiagnosticKind, Path, bool)>, DiagDeriveError> {
144+
) -> Result<Option<(SubdiagKind, Path, bool)>, DiagDeriveError> {
145145
let Some(subdiag) = SubdiagnosticVariant::from_attr(attr, self)? else {
146146
// Some attributes aren't errors - like documentation comments - but also aren't
147147
// subdiagnostics.
148148
return Ok(None);
149149
};
150150

151-
if let SubdiagnosticKind::MultipartSuggestion { .. } = subdiag.kind {
151+
if let SubdiagKind::MultipartSuggestion { .. } = subdiag.kind {
152152
throw_invalid_attr!(attr, |diag| diag.help("consider creating an `AddToDiag` instead"));
153153
}
154154

155155
let slug = subdiag.slug.unwrap_or_else(|| match subdiag.kind {
156-
SubdiagnosticKind::Label => parse_quote! { _subdiag::label },
157-
SubdiagnosticKind::Note => parse_quote! { _subdiag::note },
158-
SubdiagnosticKind::Help => parse_quote! { _subdiag::help },
159-
SubdiagnosticKind::Warn => parse_quote! { _subdiag::warn },
160-
SubdiagnosticKind::Suggestion { .. } => parse_quote! { _subdiag::suggestion },
161-
SubdiagnosticKind::MultipartSuggestion { .. } => unreachable!(),
156+
SubdiagKind::Label => parse_quote! { _subdiag::label },
157+
SubdiagKind::Note => parse_quote! { _subdiag::note },
158+
SubdiagKind::Help => parse_quote! { _subdiag::help },
159+
SubdiagKind::Warn => parse_quote! { _subdiag::warn },
160+
SubdiagKind::Suggestion { .. } => parse_quote! { _subdiag::suggestion },
161+
SubdiagKind::MultipartSuggestion { .. } => unreachable!(),
162162
});
163163

164164
Ok(Some((subdiag.kind, slug, subdiag.no_span)))
@@ -230,14 +230,14 @@ impl DiagDeriveVariantBuilder {
230230
};
231231
let fn_ident = format_ident!("{}", subdiag);
232232
match subdiag {
233-
SubdiagnosticKind::Note | SubdiagnosticKind::Help | SubdiagnosticKind::Warn => {
233+
SubdiagKind::Note | SubdiagKind::Help | SubdiagKind::Warn => {
234234
Ok(self.add_subdiagnostic(&fn_ident, slug))
235235
}
236-
SubdiagnosticKind::Label | SubdiagnosticKind::Suggestion { .. } => {
236+
SubdiagKind::Label | SubdiagKind::Suggestion { .. } => {
237237
throw_invalid_attr!(attr, |diag| diag
238238
.help("`#[label]` and `#[suggestion]` can only be applied to fields"));
239239
}
240-
SubdiagnosticKind::MultipartSuggestion { .. } => unreachable!(),
240+
SubdiagKind::MultipartSuggestion { .. } => unreachable!(),
241241
}
242242
}
243243

@@ -340,11 +340,11 @@ impl DiagDeriveVariantBuilder {
340340
};
341341
let fn_ident = format_ident!("{}", subdiag);
342342
match subdiag {
343-
SubdiagnosticKind::Label => {
343+
SubdiagKind::Label => {
344344
report_error_if_not_applied_to_span(attr, &info)?;
345345
Ok(self.add_spanned_subdiagnostic(binding, &fn_ident, slug))
346346
}
347-
SubdiagnosticKind::Note | SubdiagnosticKind::Help | SubdiagnosticKind::Warn => {
347+
SubdiagKind::Note | SubdiagKind::Help | SubdiagKind::Warn => {
348348
let inner = info.ty.inner_type();
349349
if type_matches_path(inner, &["rustc_span", "Span"])
350350
|| type_matches_path(inner, &["rustc_span", "MultiSpan"])
@@ -358,7 +358,7 @@ impl DiagDeriveVariantBuilder {
358358
report_type_error(attr, "`Span`, `MultiSpan`, `bool` or `()`")?
359359
}
360360
}
361-
SubdiagnosticKind::Suggestion {
361+
SubdiagKind::Suggestion {
362362
suggestion_kind,
363363
applicability: static_applicability,
364364
code_field,
@@ -395,7 +395,7 @@ impl DiagDeriveVariantBuilder {
395395
);
396396
})
397397
}
398-
SubdiagnosticKind::MultipartSuggestion { .. } => unreachable!(),
398+
SubdiagKind::MultipartSuggestion { .. } => unreachable!(),
399399
}
400400
}
401401

‎compiler/rustc_macros/src/diagnostics/subdiagnostic.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::diagnostics::utils::{
77
build_field_mapping, build_suggestion_code, is_doc_comment, new_code_ident,
88
report_error_if_not_applied_to_applicability, report_error_if_not_applied_to_span,
99
should_generate_arg, AllowMultipleAlternatives, FieldInfo, FieldInnerTy, FieldMap, HasFieldMap,
10-
SetOnce, SpannedOption, SubdiagnosticKind,
10+
SetOnce, SpannedOption, SubdiagKind,
1111
};
1212
use proc_macro2::TokenStream;
1313
use quote::{format_ident, quote};
@@ -149,8 +149,8 @@ struct KindsStatistics {
149149
all_applicabilities_static: bool,
150150
}
151151

152-
impl<'a> FromIterator<&'a SubdiagnosticKind> for KindsStatistics {
153-
fn from_iter<T: IntoIterator<Item = &'a SubdiagnosticKind>>(kinds: T) -> Self {
152+
impl<'a> FromIterator<&'a SubdiagKind> for KindsStatistics {
153+
fn from_iter<T: IntoIterator<Item = &'a SubdiagKind>>(kinds: T) -> Self {
154154
let mut ret = Self {
155155
has_multipart_suggestion: false,
156156
all_multipart_suggestions: true,
@@ -159,18 +159,18 @@ impl<'a> FromIterator<&'a SubdiagnosticKind> for KindsStatistics {
159159
};
160160

161161
for kind in kinds {
162-
if let SubdiagnosticKind::MultipartSuggestion { applicability: None, .. }
163-
| SubdiagnosticKind::Suggestion { applicability: None, .. } = kind
162+
if let SubdiagKind::MultipartSuggestion { applicability: None, .. }
163+
| SubdiagKind::Suggestion { applicability: None, .. } = kind
164164
{
165165
ret.all_applicabilities_static = false;
166166
}
167-
if let SubdiagnosticKind::MultipartSuggestion { .. } = kind {
167+
if let SubdiagKind::MultipartSuggestion { .. } = kind {
168168
ret.has_multipart_suggestion = true;
169169
} else {
170170
ret.all_multipart_suggestions = false;
171171
}
172172

173-
if let SubdiagnosticKind::Suggestion { .. } = kind {
173+
if let SubdiagKind::Suggestion { .. } = kind {
174174
ret.has_normal_suggestion = true;
175175
}
176176
}
@@ -179,7 +179,7 @@ impl<'a> FromIterator<&'a SubdiagnosticKind> for KindsStatistics {
179179
}
180180

181181
impl<'parent, 'a> SubdiagDeriveVariantBuilder<'parent, 'a> {
182-
fn identify_kind(&mut self) -> Result<Vec<(SubdiagnosticKind, Path, bool)>, DiagDeriveError> {
182+
fn identify_kind(&mut self) -> Result<Vec<(SubdiagKind, Path, bool)>, DiagDeriveError> {
183183
let mut kind_slugs = vec![];
184184

185185
for attr in self.variant.ast().attrs {
@@ -522,7 +522,7 @@ impl<'parent, 'a> SubdiagDeriveVariantBuilder<'parent, 'a> {
522522
kind
523523
);
524524
let call = match kind {
525-
SubdiagnosticKind::Suggestion {
525+
SubdiagKind::Suggestion {
526526
suggestion_kind,
527527
applicability,
528528
code_init,
@@ -544,7 +544,7 @@ impl<'parent, 'a> SubdiagDeriveVariantBuilder<'parent, 'a> {
544544
quote! { unreachable!(); }
545545
}
546546
}
547-
SubdiagnosticKind::MultipartSuggestion { suggestion_kind, applicability } => {
547+
SubdiagKind::MultipartSuggestion { suggestion_kind, applicability } => {
548548
let applicability = applicability
549549
.value()
550550
.map(|a| quote! { #a })
@@ -563,7 +563,7 @@ impl<'parent, 'a> SubdiagDeriveVariantBuilder<'parent, 'a> {
563563

564564
quote! { #diag.#name(#message, suggestions, #applicability, #style); }
565565
}
566-
SubdiagnosticKind::Label => {
566+
SubdiagKind::Label => {
567567
if let Some(span) = span_field {
568568
quote! { #diag.#name(#span, #message); }
569569
} else {

‎compiler/rustc_macros/src/diagnostics/utils.rs

+32-37
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ impl SuggestionKind {
565565

566566
/// Types of subdiagnostics that can be created using attributes
567567
#[derive(Clone)]
568-
pub(super) enum SubdiagnosticKind {
568+
pub(super) enum SubdiagKind {
569569
/// `#[label(...)]`
570570
Label,
571571
/// `#[note(...)]`
@@ -593,15 +593,15 @@ pub(super) enum SubdiagnosticKind {
593593
}
594594

595595
pub(super) struct SubdiagnosticVariant {
596-
pub(super) kind: SubdiagnosticKind,
596+
pub(super) kind: SubdiagKind,
597597
pub(super) slug: Option<Path>,
598598
pub(super) no_span: bool,
599599
}
600600

601601
impl SubdiagnosticVariant {
602602
/// Constructs a `SubdiagnosticVariant` from a field or type attribute such as `#[note]`,
603603
/// `#[error(parser::add_paren, no_span)]` or `#[suggestion(code = "...")]`. Returns the
604-
/// `SubdiagnosticKind` and the diagnostic slug, if specified.
604+
/// `SubdiagKind` and the diagnostic slug, if specified.
605605
pub(super) fn from_attr(
606606
attr: &Attribute,
607607
fields: &impl HasFieldMap,
@@ -617,10 +617,10 @@ impl SubdiagnosticVariant {
617617
let name = name.as_str();
618618

619619
let mut kind = match name {
620-
"label" => SubdiagnosticKind::Label,
621-
"note" => SubdiagnosticKind::Note,
622-
"help" => SubdiagnosticKind::Help,
623-
"warning" => SubdiagnosticKind::Warn,
620+
"label" => SubdiagKind::Label,
621+
"note" => SubdiagKind::Note,
622+
"help" => SubdiagKind::Help,
623+
"warning" => SubdiagKind::Warn,
624624
_ => {
625625
// Recover old `#[(multipart_)suggestion_*]` syntaxes
626626
// FIXME(#100717): remove
@@ -635,7 +635,7 @@ impl SubdiagnosticVariant {
635635
.emit();
636636
}
637637

638-
SubdiagnosticKind::Suggestion {
638+
SubdiagKind::Suggestion {
639639
suggestion_kind: SuggestionKind::Normal,
640640
applicability: None,
641641
code_field: new_code_ident(),
@@ -652,7 +652,7 @@ impl SubdiagnosticVariant {
652652
.emit();
653653
}
654654

655-
SubdiagnosticKind::MultipartSuggestion {
655+
SubdiagKind::MultipartSuggestion {
656656
suggestion_kind: SuggestionKind::Normal,
657657
applicability: None,
658658
}
@@ -675,14 +675,14 @@ impl SubdiagnosticVariant {
675675
// Only allow this if there are no mandatory properties, such as `code = "..."` in
676676
// `#[suggestion(...)]`
677677
match kind {
678-
SubdiagnosticKind::Label
679-
| SubdiagnosticKind::Note
680-
| SubdiagnosticKind::Help
681-
| SubdiagnosticKind::Warn
682-
| SubdiagnosticKind::MultipartSuggestion { .. } => {
678+
SubdiagKind::Label
679+
| SubdiagKind::Note
680+
| SubdiagKind::Help
681+
| SubdiagKind::Warn
682+
| SubdiagKind::MultipartSuggestion { .. } => {
683683
return Ok(Some(SubdiagnosticVariant { kind, slug: None, no_span: false }));
684684
}
685-
SubdiagnosticKind::Suggestion { .. } => {
685+
SubdiagKind::Suggestion { .. } => {
686686
throw_span_err!(span, "suggestion without `code = \"...\"`")
687687
}
688688
}
@@ -735,7 +735,7 @@ impl SubdiagnosticVariant {
735735
let input = nested.input;
736736

737737
match (nested_name, &mut kind) {
738-
("code", SubdiagnosticKind::Suggestion { code_field, .. }) => {
738+
("code", SubdiagKind::Suggestion { code_field, .. }) => {
739739
let code_init = build_suggestion_code(
740740
code_field,
741741
nested,
@@ -746,8 +746,8 @@ impl SubdiagnosticVariant {
746746
}
747747
(
748748
"applicability",
749-
SubdiagnosticKind::Suggestion { ref mut applicability, .. }
750-
| SubdiagnosticKind::MultipartSuggestion { ref mut applicability, .. },
749+
SubdiagKind::Suggestion { ref mut applicability, .. }
750+
| SubdiagKind::MultipartSuggestion { ref mut applicability, .. },
751751
) => {
752752
let value = get_string!();
753753
let value = Applicability::from_str(&value.value()).unwrap_or_else(|()| {
@@ -759,8 +759,8 @@ impl SubdiagnosticVariant {
759759
}
760760
(
761761
"style",
762-
SubdiagnosticKind::Suggestion { .. }
763-
| SubdiagnosticKind::MultipartSuggestion { .. },
762+
SubdiagKind::Suggestion { .. }
763+
| SubdiagKind::MultipartSuggestion { .. },
764764
) => {
765765
let value = get_string!();
766766

@@ -776,15 +776,15 @@ impl SubdiagnosticVariant {
776776
}
777777

778778
// Invalid nested attribute
779-
(_, SubdiagnosticKind::Suggestion { .. }) => {
779+
(_, SubdiagKind::Suggestion { .. }) => {
780780
span_err(path_span, "invalid nested attribute")
781781
.help(
782782
"only `no_span`, `style`, `code` and `applicability` are valid nested attributes",
783783
)
784784
.emit();
785785
has_errors = true;
786786
}
787-
(_, SubdiagnosticKind::MultipartSuggestion { .. }) => {
787+
(_, SubdiagKind::MultipartSuggestion { .. }) => {
788788
span_err(path_span, "invalid nested attribute")
789789
.help("only `no_span`, `style` and `applicability` are valid nested attributes")
790790
.emit();
@@ -805,7 +805,7 @@ impl SubdiagnosticVariant {
805805
})?;
806806

807807
match kind {
808-
SubdiagnosticKind::Suggestion {
808+
SubdiagKind::Suggestion {
809809
ref code_field,
810810
ref mut code_init,
811811
suggestion_kind: ref mut kind_field,
@@ -822,32 +822,27 @@ impl SubdiagnosticVariant {
822822
quote! { let #code_field = std::iter::empty(); }
823823
};
824824
}
825-
SubdiagnosticKind::MultipartSuggestion {
826-
suggestion_kind: ref mut kind_field, ..
827-
} => {
825+
SubdiagKind::MultipartSuggestion { suggestion_kind: ref mut kind_field, .. } => {
828826
if let Some(kind) = suggestion_kind.value() {
829827
*kind_field = kind;
830828
}
831829
}
832-
SubdiagnosticKind::Label
833-
| SubdiagnosticKind::Note
834-
| SubdiagnosticKind::Help
835-
| SubdiagnosticKind::Warn => {}
830+
SubdiagKind::Label | SubdiagKind::Note | SubdiagKind::Help | SubdiagKind::Warn => {}
836831
}
837832

838833
Ok(Some(SubdiagnosticVariant { kind, slug, no_span }))
839834
}
840835
}
841836

842-
impl quote::IdentFragment for SubdiagnosticKind {
837+
impl quote::IdentFragment for SubdiagKind {
843838
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
844839
match self {
845-
SubdiagnosticKind::Label => write!(f, "label"),
846-
SubdiagnosticKind::Note => write!(f, "note"),
847-
SubdiagnosticKind::Help => write!(f, "help"),
848-
SubdiagnosticKind::Warn => write!(f, "warn"),
849-
SubdiagnosticKind::Suggestion { .. } => write!(f, "suggestions_with_style"),
850-
SubdiagnosticKind::MultipartSuggestion { .. } => {
840+
SubdiagKind::Label => write!(f, "label"),
841+
SubdiagKind::Note => write!(f, "note"),
842+
SubdiagKind::Help => write!(f, "help"),
843+
SubdiagKind::Warn => write!(f, "warn"),
844+
SubdiagKind::Suggestion { .. } => write!(f, "suggestions_with_style"),
845+
SubdiagKind::MultipartSuggestion { .. } => {
851846
write!(f, "multipart_suggestion_with_style")
852847
}
853848
}

0 commit comments

Comments
 (0)