Punctuated
diff --git a/tests/macros/mod.rs b/tests/macros/mod.rs
index 86d40ca..6fd366b 100644
--- a/tests/macros/mod.rs
+++ b/tests/macros/mod.rs
@@ -8,20 +8,20 @@
}
#[macro_export]
-macro_rules! delimited {
+macro_rules! punctuated {
($first:expr, $($rest:expr,)*) => {{
- let mut d = ::syn::delimited::Delimited::new();
+ let mut seq = ::syn::punctuated::Punctuated::new();
let mut last = $first;
$(
- d.push(::std::mem::replace(&mut last, $rest));
- d.push_trailing(::std::default::Default::default());
+ seq.push(::std::mem::replace(&mut last, $rest));
+ seq.push_trailing(::std::default::Default::default());
)*
last = last;
- d.push(last);
- d
+ seq.push(last);
+ seq
}};
($($e:expr),+) => {
- delimited!($($e,)+)
+ punctuated!($($e,)+)
};
}
diff --git a/tests/test_derive_input.rs b/tests/test_derive_input.rs
index d38f970..9c42eba 100644
--- a/tests/test_derive_input.rs
+++ b/tests/test_derive_input.rs
@@ -92,7 +92,7 @@
struct_token: Default::default(),
fields: Fields::Named(FieldsNamed {
brace_token: Default::default(),
- fields: delimited![
+ fields: punctuated![
Field {
ident: Some("ident".into()),
colon_token: Some(Default::default()),
@@ -116,14 +116,14 @@
qself: None,
path: Path {
leading_colon: None,
- segments: delimited![
+ segments: punctuated![
PathSegment {
ident: "Vec".into(),
arguments: PathArguments::AngleBracketed(
AngleBracketedGenericArguments {
colon2_token: None,
lt_token: Default::default(),
- args: delimited![
+ args: punctuated![
GenericArgument::Type(Type::from(TypePath {
qself: None,
path: "Attribute".into(),
@@ -149,7 +149,7 @@
let expected_meta_item: MetaItem = MetaItemList {
ident: "derive".into(),
paren_token: Default::default(),
- nested: delimited![
+ nested: punctuated![
NestedMetaItem::MetaItem(MetaItem::Term("Debug".into())),
NestedMetaItem::MetaItem(MetaItem::Term("Clone".into())),
],
@@ -205,7 +205,7 @@
],
generics: Generics {
lt_token: Some(Default::default()),
- params: delimited![
+ params: punctuated![
GenericParam::Type(TypeParam {
attrs: Vec::new(),
ident: "T".into(),
@@ -227,13 +227,13 @@
where_clause: None,
},
data: Data::Enum(DataEnum {
- variants: delimited![
+ variants: punctuated![
Variant {
ident: "Ok".into(),
attrs: Vec::new(),
fields: Fields::Unnamed(FieldsUnnamed {
paren_token: Default::default(),
- fields: delimited![
+ fields: punctuated![
Field {
colon_token: None,
ident: None,
@@ -253,7 +253,7 @@
attrs: Vec::new(),
fields: Fields::Unnamed(FieldsUnnamed {
paren_token: Default::default(),
- fields: delimited![
+ fields: punctuated![
Field {
ident: None,
colon_token: None,
@@ -294,7 +294,7 @@
base: Box::new(Expr::Tuple(ExprTuple {
attrs: Vec::new(),
paren_token: Default::default(),
- elems: delimited![
+ elems: punctuated![
Expr::Lit(ExprLit {
attrs: Vec::new(),
lit: Lit {
@@ -370,7 +370,7 @@
style: AttrStyle::Outer,
path: Path {
leading_colon: Some(Default::default()),
- segments: delimited![
+ segments: punctuated![
PathSegment::from("attr_args"),
PathSegment::from("identity"),
],
@@ -432,7 +432,7 @@
style: AttrStyle::Outer,
path: Path {
leading_colon: None,
- segments: delimited![PathSegment::from("inert")],
+ segments: punctuated![PathSegment::from("inert")],
},
tts: TokenStream::from_iter(vec![op('<'), word("T"), op('>')]),
is_sugared_doc: false,
@@ -470,7 +470,7 @@
style: AttrStyle::Outer,
path: Path {
leading_colon: None,
- segments: delimited![PathSegment::from("foo"), PathSegment::from("self")],
+ segments: punctuated![PathSegment::from("foo"), PathSegment::from("self")],
},
tts: TokenStream::empty(),
is_sugared_doc: false,
@@ -511,13 +511,13 @@
data: Data::Struct(DataStruct {
fields: Fields::Unnamed(FieldsUnnamed {
paren_token: Default::default(),
- fields: delimited![
+ fields: punctuated![
Field {
ident: None,
vis: Visibility::Restricted(VisRestricted {
path: Box::new(Path {
leading_colon: None,
- segments: delimited![PathSegment::from("m"), PathSegment::from("n")],
+ segments: punctuated![PathSegment::from("m"), PathSegment::from("n")],
}),
in_token: Some(Default::default()),
paren_token: Default::default(),
diff --git a/tests/test_generics.rs b/tests/test_generics.rs
index 4b55b15..a3a2e77 100644
--- a/tests/test_generics.rs
+++ b/tests/test_generics.rs
@@ -21,7 +21,7 @@
let generics = Generics {
gt_token: Some(Default::default()),
lt_token: Some(Default::default()),
- params: delimited![
+ params: punctuated![
GenericParam::Lifetime(LifetimeDef {
attrs: Default::default(),
lifetime: Lifetime::new(Term::intern("'a"), Span::default()),
@@ -31,7 +31,7 @@
GenericParam::Lifetime(LifetimeDef {
attrs: Default::default(),
lifetime: Lifetime::new(Term::intern("'b"), Span::default()),
- bounds: delimited![Lifetime::new(Term::intern("'a"), Span::default())],
+ bounds: punctuated![Lifetime::new(Term::intern("'a"), Span::default())],
colon_token: Some(token::Colon::default()),
}),
GenericParam::Type(TypeParam {
@@ -46,7 +46,7 @@
},
],
ident: "T".into(),
- bounds: delimited![
+ bounds: punctuated![
TypeParamBound::Region(Lifetime::new(Term::intern("'a"), Span::default())),
],
default: Some(
@@ -61,7 +61,7 @@
],
where_clause: Some(WhereClause {
where_token: Default::default(),
- predicates: delimited![
+ predicates: punctuated![
WherePredicate::BoundPredicate(WhereBoundPredicate {
bound_lifetimes: None,
colon_token: Default::default(),
@@ -69,7 +69,7 @@
qself: None,
path: "T".into(),
}.into(),
- bounds: delimited![
+ bounds: punctuated![
TypeParamBound::Trait(
PolyTraitRef {
bound_lifetimes: None,
diff --git a/tests/test_meta_item.rs b/tests/test_meta_item.rs
index 0eb97a0..859507d 100644
--- a/tests/test_meta_item.rs
+++ b/tests/test_meta_item.rs
@@ -41,7 +41,7 @@
MetaItemList {
ident: "foo".into(),
paren_token: Default::default(),
- nested: delimited![NestedMetaItem::Literal(lit(Literal::integer(5)))],
+ nested: punctuated![NestedMetaItem::Literal(lit(Literal::integer(5)))],
},
)
}
@@ -53,7 +53,7 @@
MetaItemList {
ident: "foo".into(),
paren_token: Default::default(),
- nested: delimited![NestedMetaItem::MetaItem(MetaItem::Term("bar".into()))],
+ nested: punctuated![NestedMetaItem::MetaItem(MetaItem::Term("bar".into()))],
},
)
}
@@ -65,7 +65,7 @@
MetaItemList {
ident: "foo".into(),
paren_token: Default::default(),
- nested: delimited![
+ nested: punctuated![
NestedMetaItem::MetaItem(
MetaNameValue {
ident: "bar".into(),
@@ -85,7 +85,7 @@
MetaItemList {
ident: "foo".into(),
paren_token: Default::default(),
- nested: delimited![
+ nested: punctuated![
NestedMetaItem::MetaItem(MetaItem::Term("word".into())),
NestedMetaItem::MetaItem(
MetaNameValue {
@@ -98,7 +98,7 @@
MetaItemList {
ident: "list".into(),
paren_token: Default::default(),
- nested: delimited![
+ nested: punctuated![
NestedMetaItem::MetaItem(
MetaNameValue {
ident: "name2".into(),
diff --git a/tests/test_precedence.rs b/tests/test_precedence.rs
index de41721..2b8d0a4 100644
--- a/tests/test_precedence.rs
+++ b/tests/test_precedence.rs
@@ -352,7 +352,7 @@
fn collect_exprs(file: syn::File) -> Vec<syn::Expr> {
use syn::*;
use syn::fold::*;
- use syn::delimited::Delimited;
+ use syn::punctuated::Punctuated;
struct CollectExprsFolder(Vec<Expr>);
impl Folder for CollectExprsFolder {
@@ -361,7 +361,7 @@
Expr::Tuple(ExprTuple {
attrs: vec![],
- elems: Delimited::new(),
+ elems: Punctuated::new(),
paren_token: token::Paren::default(),
})
}