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

Merge pull request #327 from dtolnay/literal

Browse source 
Improve error on malformed format attribute
This commit is contained in:
David Tolnay 2024-10-31 14:28:28 -07:00 • committed by GitHub
commit bb30f2e9b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
impl/src/attr.rs
View file

@ -91,7 +91,11 @@ fn parse_error_attribute<'a>(attrs: &mut Attrs<'a>, attr: &'a Attribute) -> Resu
syn::custom_keyword!(transparent);
attr.parse_args_with(|input: ParseStream| {
if let Some(kw) = input.parse::<Option<transparent>>()? {
let lookahead = input.lookahead1();
let fmt = if lookahead.peek(LitStr) {
input.parse::<LitStr>()?
} else if lookahead.peek(transparent) {
let kw: transparent = input.parse()?;
if attrs.transparent.is_some() {
return Err(Error::new_spanned(
attr,
@ -103,9 +107,9 @@ fn parse_error_attribute<'a>(attrs: &mut Attrs<'a>, attr: &'a Attribute) -> Resu
span: kw.span,
});
return Ok(());
}
let fmt: LitStr = input.parse()?;
} else {
return Err(lookahead.error());
};
let ahead = input.fork();
ahead.parse::<Option<Token![,]>>()?;

2
tests/ui/concat-display.stderr
View file

@ -1,4 +1,4 @@
error: expected string literal
error: expected string literal or `transparent`
--> tests/ui/concat-display.rs:8:17
|
8 | #[error(concat!("invalid ", $what))]