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 #341 from dtolnay/parsescan

Browse source 
Interleave Expr parsing and scanning better
This commit is contained in:
David Tolnay 2024-11-04 11:28:22 -05:00 • committed by GitHub
commit c92ac9940b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
impl/src/fmt.rs
View file

@ -1,6 +1,6 @@
use crate::ast::Field;
use crate::attr::{Display, Trait};
use crate::scan_expr;
use crate::scan_expr::scan_expr;
use proc_macro2::{TokenStream, TokenTree};
use quote::{format_ident, quote, quote_spanned};
use std::collections::{BTreeSet as Set, HashMap as Map};
@ -138,12 +138,7 @@ fn explicit_named_args(input: ParseStream) -> Result<Set<Ident>> {
}
fn try_explicit_named_args(input: ParseStream) -> Result<Set<Ident>> {
let scan_expr = if is_syn_full() {
|input: ParseStream| input.parse::<Expr>().map(drop)
} else {
scan_expr::scan_expr
};
let syn_full = is_syn_full();
let mut named_args = Set::new();
while !input.is_empty() {
@ -156,6 +151,13 @@ fn try_explicit_named_args(input: ParseStream) -> Result<Set<Ident>> {
input.parse::<Token![=]>()?;
named_args.insert(ident);
}
if syn_full {
let ahead = input.fork();
if ahead.parse::<Expr>().is_ok() {
input.advance_to(&ahead);
continue;
}
}
scan_expr(input)?;
}