diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:20:39 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:20:39 +0000 |
commit | 1376c5a617be5c25655d0d7cb63e3beaa5a6e026 (patch) | |
tree | 3bb8d61aee02bc7a15eab3f36e3b921afc2075d0 /vendor/syn/src/group.rs | |
parent | Releasing progress-linux version 1.69.0+dfsg1-1~progress7.99u1. (diff) | |
download | rustc-1376c5a617be5c25655d0d7cb63e3beaa5a6e026.tar.xz rustc-1376c5a617be5c25655d0d7cb63e3beaa5a6e026.zip |
Merging upstream version 1.70.0+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/syn/src/group.rs')
-rw-r--r-- | vendor/syn/src/group.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/vendor/syn/src/group.rs b/vendor/syn/src/group.rs index 7fd273c1d..cccbc467d 100644 --- a/vendor/syn/src/group.rs +++ b/vendor/syn/src/group.rs @@ -1,7 +1,8 @@ use crate::error::Result; use crate::parse::ParseBuffer; use crate::token; -use proc_macro2::{Delimiter, Span}; +use proc_macro2::extra::DelimSpan; +use proc_macro2::Delimiter; // Not public API. #[doc(hidden)] @@ -62,7 +63,7 @@ pub fn parse_brackets<'a>(input: &ParseBuffer<'a>) -> Result<Brackets<'a>> { #[cfg(any(feature = "full", feature = "derive"))] pub(crate) fn parse_group<'a>(input: &ParseBuffer<'a>) -> Result<Group<'a>> { parse_delimited(input, Delimiter::None).map(|(span, content)| Group { - token: token::Group(span), + token: token::Group(span.join()), content, }) } @@ -70,7 +71,7 @@ pub(crate) fn parse_group<'a>(input: &ParseBuffer<'a>) -> Result<Group<'a>> { fn parse_delimited<'a>( input: &ParseBuffer<'a>, delimiter: Delimiter, -) -> Result<(Span, ParseBuffer<'a>)> { +) -> Result<(DelimSpan, ParseBuffer<'a>)> { input.step(|cursor| { if let Some((content, span, rest)) = cursor.group(delimiter) { let scope = crate::buffer::close_span_of_group(*cursor); @@ -119,7 +120,7 @@ fn parse_delimited<'a>( /// struct_token: input.parse()?, /// ident: input.parse()?, /// paren_token: parenthesized!(content in input), -/// fields: content.parse_terminated(Type::parse)?, +/// fields: content.parse_terminated(Type::parse, Token![,])?, /// semi_token: input.parse()?, /// }) /// } @@ -185,7 +186,7 @@ macro_rules! parenthesized { /// struct_token: input.parse()?, /// ident: input.parse()?, /// brace_token: braced!(content in input), -/// fields: content.parse_terminated(Field::parse)?, +/// fields: content.parse_terminated(Field::parse, Token![,])?, /// }) /// } /// } |