diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-12-22 12:49:57 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-12-22 12:49:57 -0800 |
| commit | 459f3b2cfa0e618d6e28ce564a363a9477567f71 (patch) | |
| tree | 4d308abea1b026ac9db0e538f6d01170b173c89f /src/libsyntax/ext | |
| parent | 6938d51122f37dd7ab213b88bc2d457c5a9da781 (diff) | |
| parent | 22050e3ed44d9b4d79edced506b470a425e0d302 (diff) | |
| download | rust-459f3b2cfa0e618d6e28ce564a363a9477567f71.tar.gz rust-459f3b2cfa0e618d6e28ce564a363a9477567f71.zip | |
rollup merge of #20056: MrFloya/iter_rename
Conflicts: src/libcollections/bit.rs src/libcore/str.rs
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/deriving/generic/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/ext/deriving/generic/mod.rs b/src/libsyntax/ext/deriving/generic/mod.rs index a2b5c0b9e96..cf0201294ae 100644 --- a/src/libsyntax/ext/deriving/generic/mod.rs +++ b/src/libsyntax/ext/deriving/generic/mod.rs @@ -766,7 +766,7 @@ impl<'a> MethodDef<'a> { let fields = if raw_fields.len() > 0 { let mut raw_fields = raw_fields.into_iter().map(|v| v.into_iter()); let first_field = raw_fields.next().unwrap(); - let mut other_fields: Vec<vec::MoveItems<(Span, Option<Ident>, P<Expr>)>> + let mut other_fields: Vec<vec::IntoIter<(Span, Option<Ident>, P<Expr>)>> = raw_fields.collect(); first_field.map(|(span, opt_id, field)| { FieldInfo { |