Rename TupField to TupleField
diff --git a/src/expr.rs b/src/expr.rs
index 53df61e..e7b35b1 100644
--- a/src/expr.rs
+++ b/src/expr.rs
@@ -239,7 +239,7 @@
/// Access of an unnamed field of a struct or tuple-struct
///
/// For example, `foo.0`.
- pub TupField(ExprTupField #full {
+ pub TupleField(ExprTupleField #full {
pub expr: Box<Expr>,
pub field: Lit,
pub dot_token: Token![.],
@@ -1090,7 +1090,7 @@
|
tap!(field: and_tup_field => {
let (field, token) = field;
- e = ExprTupField {
+ e = ExprTupleField {
expr: Box::new(e.into()),
field: field,
dot_token: token,
@@ -2623,7 +2623,7 @@
}
#[cfg(feature = "full")]
- impl ToTokens for ExprTupField {
+ impl ToTokens for ExprTupleField {
fn to_tokens(&self, tokens: &mut Tokens) {
self.expr.to_tokens(tokens);
self.dot_token.to_tokens(tokens);
diff --git a/src/gen/fold.rs b/src/gen/fold.rs
index e999ace..88f6ab2 100644
--- a/src/gen/fold.rs
+++ b/src/gen/fold.rs
@@ -173,9 +173,9 @@
# [ cfg ( feature = "full" ) ]
fn fold_expr_try(&mut self, i: ExprTry) -> ExprTry { fold_expr_try(self, i) }
# [ cfg ( feature = "full" ) ]
-fn fold_expr_tup_field(&mut self, i: ExprTupField) -> ExprTupField { fold_expr_tup_field(self, i) }
-# [ cfg ( feature = "full" ) ]
fn fold_expr_tuple(&mut self, i: ExprTuple) -> ExprTuple { fold_expr_tuple(self, i) }
+# [ cfg ( feature = "full" ) ]
+fn fold_expr_tuple_field(&mut self, i: ExprTupleField) -> ExprTupleField { fold_expr_tuple_field(self, i) }
fn fold_expr_type(&mut self, i: ExprType) -> ExprType { fold_expr_type(self, i) }
@@ -1105,9 +1105,9 @@
full!(_visitor.fold_expr_field(_binding_0)),
)
}
- TupField(_binding_0, ) => {
- TupField (
- full!(_visitor.fold_expr_tup_field(_binding_0)),
+ TupleField(_binding_0, ) => {
+ TupleField (
+ full!(_visitor.fold_expr_tuple_field(_binding_0)),
)
}
Index(_binding_0, ) => {
@@ -1275,14 +1275,6 @@
}
}
# [ cfg ( feature = "full" ) ]
-pub fn fold_expr_tup_field<V: Folder + ?Sized>(_visitor: &mut V, _i: ExprTupField) -> ExprTupField {
- ExprTupField {
- expr: Box::new(_visitor.fold_expr(* _i . expr)),
- field: _i . field,
- dot_token: _i . dot_token,
- }
-}
-# [ cfg ( feature = "full" ) ]
pub fn fold_expr_tuple<V: Folder + ?Sized>(_visitor: &mut V, _i: ExprTuple) -> ExprTuple {
ExprTuple {
args: FoldHelper::lift(_i . args, |it| { _visitor.fold_expr(it) }),
@@ -1290,6 +1282,14 @@
lone_comma: _i . lone_comma,
}
}
+# [ cfg ( feature = "full" ) ]
+pub fn fold_expr_tuple_field<V: Folder + ?Sized>(_visitor: &mut V, _i: ExprTupleField) -> ExprTupleField {
+ ExprTupleField {
+ expr: Box::new(_visitor.fold_expr(* _i . expr)),
+ field: _i . field,
+ dot_token: _i . dot_token,
+ }
+}
pub fn fold_expr_type<V: Folder + ?Sized>(_visitor: &mut V, _i: ExprType) -> ExprType {
ExprType {
diff --git a/src/gen/visit.rs b/src/gen/visit.rs
index c5ba47d..9caab14 100644
--- a/src/gen/visit.rs
+++ b/src/gen/visit.rs
@@ -147,9 +147,9 @@
# [ cfg ( feature = "full" ) ]
fn visit_expr_try(&mut self, i: &'ast ExprTry) { visit_expr_try(self, i) }
# [ cfg ( feature = "full" ) ]
-fn visit_expr_tup_field(&mut self, i: &'ast ExprTupField) { visit_expr_tup_field(self, i) }
-# [ cfg ( feature = "full" ) ]
fn visit_expr_tuple(&mut self, i: &'ast ExprTuple) { visit_expr_tuple(self, i) }
+# [ cfg ( feature = "full" ) ]
+fn visit_expr_tuple_field(&mut self, i: &'ast ExprTupleField) { visit_expr_tuple_field(self, i) }
fn visit_expr_type(&mut self, i: &'ast ExprType) { visit_expr_type(self, i) }
@@ -881,8 +881,8 @@
Field(ref _binding_0, ) => {
full!(_visitor.visit_expr_field(_binding_0));
}
- TupField(ref _binding_0, ) => {
- full!(_visitor.visit_expr_tup_field(_binding_0));
+ TupleField(ref _binding_0, ) => {
+ full!(_visitor.visit_expr_tuple_field(_binding_0));
}
Index(ref _binding_0, ) => {
_visitor.visit_expr_index(_binding_0);
@@ -999,17 +999,17 @@
// Skipped field _i . question_token;
}
# [ cfg ( feature = "full" ) ]
-pub fn visit_expr_tup_field<'ast, V: Visitor<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprTupField) {
- _visitor.visit_expr(& _i . expr);
- // Skipped field _i . field;
- // Skipped field _i . dot_token;
-}
-# [ cfg ( feature = "full" ) ]
pub fn visit_expr_tuple<'ast, V: Visitor<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprTuple) {
for el in & _i . args { let it = el.item(); _visitor.visit_expr(it) };
// Skipped field _i . paren_token;
// Skipped field _i . lone_comma;
}
+# [ cfg ( feature = "full" ) ]
+pub fn visit_expr_tuple_field<'ast, V: Visitor<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprTupleField) {
+ _visitor.visit_expr(& _i . expr);
+ // Skipped field _i . field;
+ // Skipped field _i . dot_token;
+}
pub fn visit_expr_type<'ast, V: Visitor<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprType) {
_visitor.visit_expr(& _i . expr);
diff --git a/src/gen/visit_mut.rs b/src/gen/visit_mut.rs
index 1bb2fa7..3034f90 100644
--- a/src/gen/visit_mut.rs
+++ b/src/gen/visit_mut.rs
@@ -147,9 +147,9 @@
# [ cfg ( feature = "full" ) ]
fn visit_expr_try_mut(&mut self, i: &mut ExprTry) { visit_expr_try_mut(self, i) }
# [ cfg ( feature = "full" ) ]
-fn visit_expr_tup_field_mut(&mut self, i: &mut ExprTupField) { visit_expr_tup_field_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
fn visit_expr_tuple_mut(&mut self, i: &mut ExprTuple) { visit_expr_tuple_mut(self, i) }
+# [ cfg ( feature = "full" ) ]
+fn visit_expr_tuple_field_mut(&mut self, i: &mut ExprTupleField) { visit_expr_tuple_field_mut(self, i) }
fn visit_expr_type_mut(&mut self, i: &mut ExprType) { visit_expr_type_mut(self, i) }
@@ -881,8 +881,8 @@
Field(ref mut _binding_0, ) => {
full!(_visitor.visit_expr_field_mut(_binding_0));
}
- TupField(ref mut _binding_0, ) => {
- full!(_visitor.visit_expr_tup_field_mut(_binding_0));
+ TupleField(ref mut _binding_0, ) => {
+ full!(_visitor.visit_expr_tuple_field_mut(_binding_0));
}
Index(ref mut _binding_0, ) => {
_visitor.visit_expr_index_mut(_binding_0);
@@ -999,17 +999,17 @@
// Skipped field _i . question_token;
}
# [ cfg ( feature = "full" ) ]
-pub fn visit_expr_tup_field_mut<V: VisitorMut + ?Sized>(_visitor: &mut V, _i: &mut ExprTupField) {
- _visitor.visit_expr_mut(& mut _i . expr);
- // Skipped field _i . field;
- // Skipped field _i . dot_token;
-}
-# [ cfg ( feature = "full" ) ]
pub fn visit_expr_tuple_mut<V: VisitorMut + ?Sized>(_visitor: &mut V, _i: &mut ExprTuple) {
for mut el in & mut _i . args { let mut it = el.item_mut(); _visitor.visit_expr_mut(it) };
// Skipped field _i . paren_token;
// Skipped field _i . lone_comma;
}
+# [ cfg ( feature = "full" ) ]
+pub fn visit_expr_tuple_field_mut<V: VisitorMut + ?Sized>(_visitor: &mut V, _i: &mut ExprTupleField) {
+ _visitor.visit_expr_mut(& mut _i . expr);
+ // Skipped field _i . field;
+ // Skipped field _i . dot_token;
+}
pub fn visit_expr_type_mut<V: VisitorMut + ?Sized>(_visitor: &mut V, _i: &mut ExprType) {
_visitor.visit_expr_mut(& mut _i . expr);
diff --git a/src/lib.rs b/src/lib.rs
index edfea5c..c2a7822 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -38,7 +38,7 @@
ExprBox, ExprBreak, ExprCall, ExprCast, ExprCatch, ExprClosure, ExprContinue,
ExprField, ExprForLoop, ExprGroup, ExprIf, ExprIfLet, ExprInPlace, ExprIndex,
ExprKind, ExprLoop, ExprMatch, ExprMethodCall, ExprParen, ExprPath, ExprRange,
- ExprRepeat, ExprRet, ExprStruct, ExprTry, ExprTupField, ExprTuple, ExprType,
+ ExprRepeat, ExprRet, ExprStruct, ExprTry, ExprTupleField, ExprTuple, ExprType,
ExprUnary, ExprUnsafe, ExprWhile, ExprWhileLet, ExprYield};
#[cfg(feature = "full")]