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

More robust scanning for fmt argument expressions

Browse source
This commit is contained in:
David Tolnay 2024-11-02 09:36:05 -07:00
parent c0050558f7
commit 2585669fa1
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
impl/src/fmt.rs
View file

@ -1,5 +1,6 @@
use crate::ast::Field; use crate::ast::Field;
use crate::attr::{Display, Trait}; use crate::attr::{Display, Trait};
use crate::scan_expr::scan_expr;
use proc_macro2::TokenTree; use proc_macro2::TokenTree;
use quote::{format_ident, quote_spanned}; use quote::{format_ident, quote_spanned};
use std::collections::{BTreeSet as Set, HashMap as Map}; use std::collections::{BTreeSet as Set, HashMap as Map};
@ -121,14 +122,16 @@ fn explicit_named_args(input: ParseStream) -> Result<Set<Ident>> {
let mut named_args = Set::new(); let mut named_args = Set::new();
while !input.is_empty() { while !input.is_empty() {
if input.peek(Token![,]) && input.peek2(Ident::peek_any) && input.peek3(Token![=]) { input.parse::<Token![,]>()?;
input.parse::<Token![,]>()?; if input.is_empty() {
break;
}
if input.peek(Ident::peek_any) && input.peek2(Token![=]) && !input.peek2(Token![==]) {
let ident = input.call(Ident::parse_any)?; let ident = input.call(Ident::parse_any)?;
input.parse::<Token![=]>()?; input.parse::<Token![=]>()?;
named_args.insert(ident); named_args.insert(ident);
} else {
input.parse::<TokenTree>()?;
} }
scan_expr(input)?;
} }
Ok(named_args) Ok(named_args)