diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2017-01-17 01:54:59 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2017-01-17 01:54:59 +0300 |
| commit | 03620dba25328ee8cc7316cf6d9bad2d0a118ba1 (patch) | |
| tree | 36d4e35e2c6196f64147a2d9f5bc897ff30da076 /src/libsyntax_ext | |
| parent | 2efe865d22eb85871562b2497ac819efc0174a3d (diff) | |
| download | rust-03620dba25328ee8cc7316cf6d9bad2d0a118ba1.tar.gz rust-03620dba25328ee8cc7316cf6d9bad2d0a118ba1.zip | |
Use resizable Vec instead of P<[T]> in AST
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/deriving/generic/mod.rs | 9 | ||||
| -rw-r--r-- | src/libsyntax_ext/deriving/generic/ty.rs | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs index b99b1019368..ce64aef516f 100644 --- a/src/libsyntax_ext/deriving/generic/mod.rs +++ b/src/libsyntax_ext/deriving/generic/mod.rs @@ -507,9 +507,8 @@ impl<'a> TraitDef<'a> { } }); - let Generics { mut lifetimes, ty_params, mut where_clause, span } = self.generics + let Generics { mut lifetimes, mut ty_params, mut where_clause, span } = self.generics .to_generics(cx, self.span, type_ident, generics); - let mut ty_params = ty_params.into_vec(); // Copy the lifetimes lifetimes.extend(generics.lifetimes.iter().cloned()); @@ -533,7 +532,7 @@ impl<'a> TraitDef<'a> { bounds.push((*declared_bound).clone()); } - cx.typaram(self.span, ty_param.ident, vec![], P::from_vec(bounds), None) + cx.typaram(self.span, ty_param.ident, vec![], bounds, None) })); // and similarly for where clauses @@ -596,7 +595,7 @@ impl<'a> TraitDef<'a> { span: self.span, bound_lifetimes: vec![], bounded_ty: ty, - bounds: P::from_vec(bounds), + bounds: bounds, }; let predicate = ast::WherePredicate::BoundPredicate(predicate); @@ -607,7 +606,7 @@ impl<'a> TraitDef<'a> { let trait_generics = Generics { lifetimes: lifetimes, - ty_params: P::from_vec(ty_params), + ty_params: ty_params, where_clause: where_clause, span: span, }; diff --git a/src/libsyntax_ext/deriving/generic/ty.rs b/src/libsyntax_ext/deriving/generic/ty.rs index 4749d082bc0..cfd52381538 100644 --- a/src/libsyntax_ext/deriving/generic/ty.rs +++ b/src/libsyntax_ext/deriving/generic/ty.rs @@ -212,7 +212,7 @@ fn mk_generics(lifetimes: Vec<ast::LifetimeDef>, ty_params: Vec<ast::TyParam>, s -> Generics { Generics { lifetimes: lifetimes, - ty_params: P::from_vec(ty_params), + ty_params: ty_params, where_clause: ast::WhereClause { id: ast::DUMMY_NODE_ID, predicates: Vec::new(), |