bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Better error recovery in Subdiagnostic derive

Browse source
This commit is contained in:
Xiretza 2022-09-12 21:11:49 +02:00
parent e7251cc441
commit 57679fb1c5
1 changed files with 28 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

48
compiler/rustc_macros/src/diagnostics/subdiagnostic.rs
View file

@ -13,6 +13,7 @@ use std::collections::HashMap;
use syn::{spanned::Spanned, Attribute, Meta, MetaList, MetaNameValue, NestedMeta, Path}; use syn::{spanned::Spanned, Attribute, Meta, MetaList, MetaNameValue, NestedMeta, Path};
use synstructure::{BindingInfo, Structure, VariantInfo}; use synstructure::{BindingInfo, Structure, VariantInfo};
use super::error::invalid_attr;
use super::utils::{SpannedOption, SubdiagnosticKind}; use super::utils::{SpannedOption, SubdiagnosticKind};
/// The central struct for constructing the `add_to_diagnostic` method from an annotated struct. /// The central struct for constructing the `add_to_diagnostic` method from an annotated struct.
@ -271,19 +272,19 @@ impl<'a> SubdiagnosticDeriveBuilder<'a> {
"skip_arg" => Ok(quote! {}), "skip_arg" => Ok(quote! {}),
"primary_span" => { "primary_span" => {
if kind_stats.has_multipart_suggestion { if kind_stats.has_multipart_suggestion {
throw_invalid_attr!(attr, &Meta::Path(path), |diag| { invalid_attr(attr, &Meta::Path(path))
diag.help( .help(
"multipart suggestions use one or more `#[suggestion_part]`s rather \ "multipart suggestions use one or more `#[suggestion_part]`s rather \
than one `#[primary_span]`", than one `#[primary_span]`",
) )
}) .emit();
} else {
report_error_if_not_applied_to_span(attr, &info)?;
let binding = info.binding.binding.clone();
self.span_field.set_once(binding, span);
} }
report_error_if_not_applied_to_span(attr, &info)?;
let binding = info.binding.binding.clone();
self.span_field.set_once(binding, span);
Ok(quote! {}) Ok(quote! {})
} }
"suggestion_part" => { "suggestion_part" => {
@ -292,14 +293,16 @@ impl<'a> SubdiagnosticDeriveBuilder<'a> {
if kind_stats.has_multipart_suggestion { if kind_stats.has_multipart_suggestion {
span_err(span, "`#[suggestion_part(...)]` attribute without `code = \"...\"`") span_err(span, "`#[suggestion_part(...)]` attribute without `code = \"...\"`")
.emit(); .emit();
Ok(quote! {})
} else { } else {
throw_invalid_attr!(attr, &Meta::Path(path), |diag| { invalid_attr(attr, &Meta::Path(path))
diag.help( .help(
"`#[suggestion_part(...)]` is only valid in multipart suggestions, use `#[primary_span]` instead", "`#[suggestion_part(...)]` is only valid in multipart suggestions, \
) use `#[primary_span]` instead",
}); )
.emit();
} }
Ok(quote! {})
} }
"applicability" => { "applicability" => {
if kind_stats.has_multipart_suggestion || kind_stats.has_normal_suggestion { if kind_stats.has_multipart_suggestion || kind_stats.has_normal_suggestion {
@ -322,7 +325,7 @@ impl<'a> SubdiagnosticDeriveBuilder<'a> {
Ok(quote! {}) Ok(quote! {})
} }
_ => throw_invalid_attr!(attr, &Meta::Path(path), |diag| { _ => {
let mut span_attrs = vec![]; let mut span_attrs = vec![];
if kind_stats.has_multipart_suggestion { if kind_stats.has_multipart_suggestion {
span_attrs.push("suggestion_part"); span_attrs.push("suggestion_part");
@ -330,11 +333,16 @@ impl<'a> SubdiagnosticDeriveBuilder<'a> {
if !kind_stats.all_multipart_suggestions { if !kind_stats.all_multipart_suggestions {
span_attrs.push("primary_span") span_attrs.push("primary_span")
} }
diag.help(format!(
"only `{}`, `applicability` and `skip_arg` are valid field attributes", invalid_attr(attr, &Meta::Path(path))
span_attrs.join(", ") .help(format!(
)) "only `{}`, `applicability` and `skip_arg` are valid field attributes",
}), span_attrs.join(", ")
))
.emit();
Ok(quote! {})
}
} }
} }