Merge pull request #328 from dtolnay/peekend

Use peek2(End) instead of fork/advance_to
dtolnay · Oct 31, 2024 · e2e9da3 · e2e9da3
2 parents a9a6c98 + 3d79a90
commit e2e9da3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/impl/Cargo.toml b/impl/Cargo.toml
@@ -14,7 +14,7 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1.0.74"
 quote = "1.0.35"
-syn = "2.0.46"
+syn = "2.0.86"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/impl/src/attr.rs b/impl/src/attr.rs
@@ -2,7 +2,7 @@ use proc_macro2::{Delimiter, Group, Literal, Punct, Spacing, Span, TokenStream,
 use quote::{format_ident, quote, ToTokens};
 use std::collections::BTreeSet as Set;
 use syn::parse::discouraged::Speculative;
-use syn::parse::ParseStream;
+use syn::parse::{End, ParseStream};
 use syn::{
     braced, bracketed, parenthesized, token, Attribute, Error, Ident, Index, LitFloat, LitInt,
     LitStr, Meta, Result, Token,
@@ -111,10 +111,8 @@ fn parse_error_attribute<'a>(attrs: &mut Attrs<'a>, attr: &'a Attribute) -> Resu
             return Err(lookahead.error());
         };
 
-        let ahead = input.fork();
-        ahead.parse::<Option<Token![,]>>()?;
-        let args = if ahead.is_empty() {
-            input.advance_to(&ahead);
+        let args = if input.is_empty() || input.peek(Token![,]) && input.peek2(End) {
+            input.parse::<Option<Token![,]>>()?;
             TokenStream::new()
         } else {
             parse_token_expr(input, false)?