mirrors/thiserror
1
0
Fork 0
mirror of https://github.com/dtolnay/thiserror.git synced 2025-04-04 13:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Use error reporting provided by Meta

Browse source
This commit is contained in:
David Tolnay 2023-03-18 14:28:18 -07:00
parent 07c66e7259
commit 39aaeb00ff
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
2 changed files with 3 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
impl/Cargo.toml
View file

@ -14,7 +14,7 @@ proc-macro = true
[dependencies]
proc-macro2 = "1.0"
quote = "1.0"
syn = "2.0"
syn = "2.0.1"
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

16
impl/src/attr.rs
View file

@ -57,13 +57,13 @@ pub fn get(input: &[Attribute]) -> Result<Attrs> {
if attr.path().is_ident("error") {
parse_error_attribute(&mut attrs, attr)?;
} else if attr.path().is_ident("source") {
require_empty_attribute(attr)?;
attr.meta.require_path_only()?;
if attrs.source.is_some() {
return Err(Error::new_spanned(attr, "duplicate #[source] attribute"));
}
attrs.source = Some(attr);
} else if attr.path().is_ident("backtrace") {
require_empty_attribute(attr)?;
attr.meta.require_path_only()?;
if attrs.backtrace.is_some() {
return Err(Error::new_spanned(attr, "duplicate #[backtrace] attribute"));
}
@ -193,18 +193,6 @@ fn parse_token_expr(input: ParseStream, mut begin_expr: bool) -> Result<TokenStr
Ok(TokenStream::from_iter(tokens))
}
fn require_empty_attribute(attr: &Attribute) -> Result<()> {
let error_span = match &attr.meta {
Meta::Path(_) => return Ok(()),
Meta::List(meta) => meta.delimiter.span().open(),
Meta::NameValue(meta) => meta.eq_token.span,
};
Err(Error::new(
error_span,
"unexpected token in thiserror attribute",
))
}
impl ToTokens for Display<'_> {
fn to_tokens(&self, tokens: &mut TokenStream) {
let fmt = &self.fmt;