@@ -17,7 +17,6 @@ use syntax::ast::{MetaWord, MetaList, MetaNameValue};
17
17
use syntax:: attr:: ThinAttributesExt ;
18
18
use hir;
19
19
use syntax:: codemap:: { respan, Span , Spanned } ;
20
- use syntax:: owned_slice:: OwnedSlice ;
21
20
use syntax:: ptr:: P ;
22
21
use syntax:: parse:: token;
23
22
use syntax:: util:: move_map:: MoveMap ;
@@ -35,7 +34,7 @@ pub trait Folder : Sized {
35
34
noop_fold_crate ( c, self )
36
35
}
37
36
38
- fn fold_meta_items ( & mut self , meta_items : Vec < P < MetaItem > > ) -> Vec < P < MetaItem > > {
37
+ fn fold_meta_items ( & mut self , meta_items : HirVec < P < MetaItem > > ) -> HirVec < P < MetaItem > > {
39
38
noop_fold_meta_items ( meta_items, self )
40
39
}
41
40
@@ -199,19 +198,19 @@ pub trait Folder : Sized {
199
198
noop_fold_variant_data ( vdata, self )
200
199
}
201
200
202
- fn fold_lifetimes ( & mut self , lts : Vec < Lifetime > ) -> Vec < Lifetime > {
201
+ fn fold_lifetimes ( & mut self , lts : HirVec < Lifetime > ) -> HirVec < Lifetime > {
203
202
noop_fold_lifetimes ( lts, self )
204
203
}
205
204
206
- fn fold_lifetime_defs ( & mut self , lts : Vec < LifetimeDef > ) -> Vec < LifetimeDef > {
205
+ fn fold_lifetime_defs ( & mut self , lts : HirVec < LifetimeDef > ) -> HirVec < LifetimeDef > {
207
206
noop_fold_lifetime_defs ( lts, self )
208
207
}
209
208
210
209
fn fold_ty_param ( & mut self , tp : TyParam ) -> TyParam {
211
210
noop_fold_ty_param ( tp, self )
212
211
}
213
212
214
- fn fold_ty_params ( & mut self , tps : OwnedSlice < TyParam > ) -> OwnedSlice < TyParam > {
213
+ fn fold_ty_params ( & mut self , tps : P < [ TyParam ] > ) -> P < [ TyParam ] > {
215
214
noop_fold_ty_params ( tps, self )
216
215
}
217
216
@@ -220,12 +219,12 @@ pub trait Folder : Sized {
220
219
}
221
220
222
221
fn fold_opt_bounds ( & mut self ,
223
- b : Option < OwnedSlice < TyParamBound > > )
224
- -> Option < OwnedSlice < TyParamBound > > {
222
+ b : Option < TyParamBounds > )
223
+ -> Option < TyParamBounds > {
225
224
noop_fold_opt_bounds ( b, self )
226
225
}
227
226
228
- fn fold_bounds ( & mut self , b : OwnedSlice < TyParamBound > ) -> OwnedSlice < TyParamBound > {
227
+ fn fold_bounds ( & mut self , b : TyParamBounds ) -> TyParamBounds {
229
228
noop_fold_bounds ( b, self )
230
229
}
231
230
@@ -264,9 +263,9 @@ pub trait Folder : Sized {
264
263
}
265
264
}
266
265
267
- pub fn noop_fold_meta_items < T : Folder > ( meta_items : Vec < P < MetaItem > > ,
266
+ pub fn noop_fold_meta_items < T : Folder > ( meta_items : HirVec < P < MetaItem > > ,
268
267
fld : & mut T )
269
- -> Vec < P < MetaItem > > {
268
+ -> HirVec < P < MetaItem > > {
270
269
meta_items. move_map ( |x| fld. fold_meta_item ( x) )
271
270
}
272
271
@@ -305,7 +304,7 @@ pub fn noop_fold_view_path<T: Folder>(view_path: P<ViewPath>, fld: &mut T) -> P<
305
304
} )
306
305
}
307
306
308
- pub fn fold_attrs < T : Folder > ( attrs : Vec < Attribute > , fld : & mut T ) -> Vec < Attribute > {
307
+ pub fn fold_attrs < T : Folder > ( attrs : HirVec < Attribute > , fld : & mut T ) -> HirVec < Attribute > {
309
308
attrs. move_flat_map ( |x| fld. fold_attribute ( x) )
310
309
}
311
310
@@ -478,7 +477,7 @@ pub fn noop_fold_local<T: Folder>(l: P<Local>, fld: &mut T) -> P<Local> {
478
477
pat : fld. fold_pat ( pat) ,
479
478
init : init. map ( |e| fld. fold_expr ( e) ) ,
480
479
span : fld. new_span ( span) ,
481
- attrs : attrs. map_thin_attrs ( |attrs| fold_attrs ( attrs, fld) ) ,
480
+ attrs : attrs. map_thin_attrs ( |attrs| fold_attrs ( attrs. into ( ) , fld) . into ( ) ) ,
482
481
}
483
482
} )
484
483
}
@@ -576,9 +575,9 @@ pub fn noop_fold_ty_param<T: Folder>(tp: TyParam, fld: &mut T) -> TyParam {
576
575
}
577
576
}
578
577
579
- pub fn noop_fold_ty_params < T : Folder > ( tps : OwnedSlice < TyParam > ,
578
+ pub fn noop_fold_ty_params < T : Folder > ( tps : P < [ TyParam ] > ,
580
579
fld : & mut T )
581
- -> OwnedSlice < TyParam > {
580
+ -> P < [ TyParam ] > {
582
581
tps. move_map ( |tp| fld. fold_ty_param ( tp) )
583
582
}
584
583
@@ -597,11 +596,13 @@ pub fn noop_fold_lifetime_def<T: Folder>(l: LifetimeDef, fld: &mut T) -> Lifetim
597
596
}
598
597
}
599
598
600
- pub fn noop_fold_lifetimes < T : Folder > ( lts : Vec < Lifetime > , fld : & mut T ) -> Vec < Lifetime > {
599
+ pub fn noop_fold_lifetimes < T : Folder > ( lts : HirVec < Lifetime > , fld : & mut T ) -> HirVec < Lifetime > {
601
600
lts. move_map ( |l| fld. fold_lifetime ( l) )
602
601
}
603
602
604
- pub fn noop_fold_lifetime_defs < T : Folder > ( lts : Vec < LifetimeDef > , fld : & mut T ) -> Vec < LifetimeDef > {
603
+ pub fn noop_fold_lifetime_defs < T : Folder > ( lts : HirVec < LifetimeDef > ,
604
+ fld : & mut T )
605
+ -> HirVec < LifetimeDef > {
605
606
lts. move_map ( |l| fld. fold_lifetime_def ( l) )
606
607
}
607
608
@@ -726,9 +727,9 @@ pub fn noop_fold_mt<T: Folder>(MutTy { ty, mutbl }: MutTy, folder: &mut T) -> Mu
726
727
}
727
728
}
728
729
729
- pub fn noop_fold_opt_bounds < T : Folder > ( b : Option < OwnedSlice < TyParamBound > > ,
730
+ pub fn noop_fold_opt_bounds < T : Folder > ( b : Option < TyParamBounds > ,
730
731
folder : & mut T )
731
- -> Option < OwnedSlice < TyParamBound > > {
732
+ -> Option < TyParamBounds > {
732
733
b. map ( |bounds| folder. fold_bounds ( bounds) )
733
734
}
734
735
@@ -1140,7 +1141,7 @@ pub fn noop_fold_expr<T: Folder>(Expr { id, node, span, attrs }: Expr, folder: &
1140
1141
}
1141
1142
} ,
1142
1143
span : folder. new_span ( span) ,
1143
- attrs : attrs. map_thin_attrs ( |attrs| fold_attrs ( attrs, folder) ) ,
1144
+ attrs : attrs. map_thin_attrs ( |attrs| fold_attrs ( attrs. into ( ) , folder) . into ( ) ) ,
1144
1145
}
1145
1146
}
1146
1147
0 commit comments