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

Improve error on malformed format attribute

Browse source
This commit is contained in:
David Tolnay 2024-10-31 14:25:18 -07:00
parent 003a89fc01
commit 5d3edf9d7e
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
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); syn::custom_keyword!(transparent);
attr.parse_args_with(|input: ParseStream| { 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() { if attrs.transparent.is_some() {
return Err(Error::new_spanned( return Err(Error::new_spanned(
attr, attr,
@ -103,9 +107,9 @@ fn parse_error_attribute<'a>(attrs: &mut Attrs<'a>, attr: &'a Attribute) -> Resu
span: kw.span, span: kw.span,
}); });
return Ok(()); return Ok(());
} } else {
return Err(lookahead.error());
let fmt: LitStr = input.parse()?; };
let ahead = input.fork(); let ahead = input.fork();
ahead.parse::<Option<Token![,]>>()?; 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 --> tests/ui/concat-display.rs:8:17
| |
8 | #[error(concat!("invalid ", $what))] 8 | #[error(concat!("invalid ", $what))]