@@ -58,7 +58,7 @@ pub enum FnKind<'a> {
58
58
ItemFn ( Name , & ' a Generics , Unsafety , Constness , Abi , & ' a Visibility , & ' a [ Attribute ] ) ,
59
59
60
60
/// fn foo(&self)
61
- Method ( Name , & ' a MethodSig , Option < & ' a Visibility > , & ' a [ Attribute ] ) ,
61
+ Method ( Ident , & ' a MethodSig , Option < & ' a Visibility > , & ' a [ Attribute ] ) ,
62
62
63
63
/// |x, y| {}
64
64
Closure ( & ' a [ Attribute ] ) ,
@@ -421,14 +421,14 @@ pub fn walk_ident<'v, V: Visitor<'v>>(visitor: &mut V, ident: Ident) {
421
421
}
422
422
423
423
pub fn walk_label < ' v , V : Visitor < ' v > > ( visitor : & mut V , label : & ' v Label ) {
424
- visitor. visit_name ( label. span , label . name ) ;
424
+ visitor. visit_ident ( label. ident ) ;
425
425
}
426
426
427
427
pub fn walk_lifetime < ' v , V : Visitor < ' v > > ( visitor : & mut V , lifetime : & ' v Lifetime ) {
428
428
visitor. visit_id ( lifetime. id ) ;
429
429
match lifetime. name {
430
- LifetimeName :: Name ( name ) => {
431
- visitor. visit_name ( lifetime . span , name ) ;
430
+ LifetimeName :: Ident ( ident ) => {
431
+ visitor. visit_ident ( ident ) ;
432
432
}
433
433
LifetimeName :: Fresh ( _) |
434
434
LifetimeName :: Static |
@@ -634,7 +634,7 @@ pub fn walk_path<'v, V: Visitor<'v>>(visitor: &mut V, path: &'v Path) {
634
634
pub fn walk_path_segment < ' v , V : Visitor < ' v > > ( visitor : & mut V ,
635
635
path_span : Span ,
636
636
segment : & ' v PathSegment ) {
637
- visitor. visit_name ( path_span , segment. name ) ;
637
+ visitor. visit_ident ( segment. ident ) ;
638
638
if let Some ( ref parameters) = segment. parameters {
639
639
visitor. visit_path_parameters ( path_span, parameters) ;
640
640
}
@@ -651,7 +651,7 @@ pub fn walk_path_parameters<'v, V: Visitor<'v>>(visitor: &mut V,
651
651
pub fn walk_assoc_type_binding < ' v , V : Visitor < ' v > > ( visitor : & mut V ,
652
652
type_binding : & ' v TypeBinding ) {
653
653
visitor. visit_id ( type_binding. id ) ;
654
- visitor. visit_name ( type_binding. span , type_binding . name ) ;
654
+ visitor. visit_ident ( type_binding. ident ) ;
655
655
visitor. visit_ty ( & type_binding. ty ) ;
656
656
}
657
657
@@ -680,9 +680,9 @@ pub fn walk_pat<'v, V: Visitor<'v>>(visitor: &mut V, pattern: &'v Pat) {
680
680
PatKind :: Ref ( ref subpattern, _) => {
681
681
visitor. visit_pat ( subpattern)
682
682
}
683
- PatKind :: Binding ( _, canonical_id, ref pth1 , ref optional_subpattern) => {
683
+ PatKind :: Binding ( _, canonical_id, ident , ref optional_subpattern) => {
684
684
visitor. visit_def_mention ( Def :: Local ( canonical_id) ) ;
685
- visitor. visit_name ( pth1 . span , pth1 . node ) ;
685
+ visitor. visit_ident ( ident ) ;
686
686
walk_list ! ( visitor, visit_pat, optional_subpattern) ;
687
687
}
688
688
PatKind :: Lit ( ref expression) => visitor. visit_expr ( expression) ,
@@ -705,11 +705,11 @@ pub fn walk_foreign_item<'v, V: Visitor<'v>>(visitor: &mut V, foreign_item: &'v
705
705
visitor. visit_name ( foreign_item. span , foreign_item. name ) ;
706
706
707
707
match foreign_item. node {
708
- ForeignItemFn ( ref function_declaration, ref names , ref generics) => {
708
+ ForeignItemFn ( ref function_declaration, ref param_names , ref generics) => {
709
709
visitor. visit_generics ( generics) ;
710
710
visitor. visit_fn_decl ( function_declaration) ;
711
- for name in names {
712
- visitor. visit_name ( name . span , name . node ) ;
711
+ for & param_name in param_names {
712
+ visitor. visit_ident ( param_name ) ;
713
713
}
714
714
}
715
715
ForeignItemStatic ( ref typ, _) => visitor. visit_ty ( typ) ,
@@ -735,8 +735,8 @@ pub fn walk_generic_param<'v, V: Visitor<'v>>(visitor: &mut V, param: &'v Generi
735
735
GenericParam :: Lifetime ( ref ld) => {
736
736
visitor. visit_id ( ld. lifetime . id ) ;
737
737
match ld. lifetime . name {
738
- LifetimeName :: Name ( name ) => {
739
- visitor. visit_name ( ld . lifetime . span , name ) ;
738
+ LifetimeName :: Ident ( ident ) => {
739
+ visitor. visit_ident ( ident ) ;
740
740
}
741
741
LifetimeName :: Fresh ( _) |
742
742
LifetimeName :: Static |
@@ -747,7 +747,7 @@ pub fn walk_generic_param<'v, V: Visitor<'v>>(visitor: &mut V, param: &'v Generi
747
747
}
748
748
GenericParam :: Type ( ref ty_param) => {
749
749
visitor. visit_id ( ty_param. id ) ;
750
- visitor. visit_name ( ty_param. span , ty_param . name ) ;
750
+ visitor. visit_ident ( ty_param. ident ) ;
751
751
walk_list ! ( visitor, visit_ty_param_bound, & ty_param. bounds) ;
752
752
walk_list ! ( visitor, visit_ty, & ty_param. default ) ;
753
753
walk_list ! ( visitor, visit_attribute, ty_param. attrs. iter( ) ) ;
@@ -827,7 +827,7 @@ pub fn walk_fn<'v, V: Visitor<'v>>(visitor: &mut V,
827
827
}
828
828
829
829
pub fn walk_trait_item < ' v , V : Visitor < ' v > > ( visitor : & mut V , trait_item : & ' v TraitItem ) {
830
- visitor. visit_name ( trait_item. span , trait_item . name ) ;
830
+ visitor. visit_ident ( trait_item. ident ) ;
831
831
walk_list ! ( visitor, visit_attribute, & trait_item. attrs) ;
832
832
visitor. visit_generics ( & trait_item. generics ) ;
833
833
match trait_item. node {
@@ -836,15 +836,15 @@ pub fn walk_trait_item<'v, V: Visitor<'v>>(visitor: &mut V, trait_item: &'v Trai
836
836
visitor. visit_ty ( ty) ;
837
837
walk_list ! ( visitor, visit_nested_body, default ) ;
838
838
}
839
- TraitItemKind :: Method ( ref sig, TraitMethod :: Required ( ref names ) ) => {
839
+ TraitItemKind :: Method ( ref sig, TraitMethod :: Required ( ref param_names ) ) => {
840
840
visitor. visit_id ( trait_item. id ) ;
841
841
visitor. visit_fn_decl ( & sig. decl ) ;
842
- for name in names {
843
- visitor. visit_name ( name . span , name . node ) ;
842
+ for & param_name in param_names {
843
+ visitor. visit_ident ( param_name ) ;
844
844
}
845
845
}
846
846
TraitItemKind :: Method ( ref sig, TraitMethod :: Provided ( body_id) ) => {
847
- visitor. visit_fn ( FnKind :: Method ( trait_item. name ,
847
+ visitor. visit_fn ( FnKind :: Method ( trait_item. ident ,
848
848
sig,
849
849
None ,
850
850
& trait_item. attrs ) ,
@@ -863,9 +863,9 @@ pub fn walk_trait_item<'v, V: Visitor<'v>>(visitor: &mut V, trait_item: &'v Trai
863
863
864
864
pub fn walk_trait_item_ref < ' v , V : Visitor < ' v > > ( visitor : & mut V , trait_item_ref : & ' v TraitItemRef ) {
865
865
// NB: Deliberately force a compilation error if/when new fields are added.
866
- let TraitItemRef { id, name , ref kind, span, ref defaultness } = * trait_item_ref;
866
+ let TraitItemRef { id, ident , ref kind, span : _ , ref defaultness } = * trait_item_ref;
867
867
visitor. visit_nested_trait_item ( id) ;
868
- visitor. visit_name ( span , name ) ;
868
+ visitor. visit_ident ( ident ) ;
869
869
visitor. visit_associated_item_kind ( kind) ;
870
870
visitor. visit_defaultness ( defaultness) ;
871
871
}
@@ -875,16 +875,16 @@ pub fn walk_impl_item<'v, V: Visitor<'v>>(visitor: &mut V, impl_item: &'v ImplIt
875
875
let ImplItem {
876
876
id : _,
877
877
hir_id : _,
878
- name ,
878
+ ident ,
879
879
ref vis,
880
880
ref defaultness,
881
881
ref attrs,
882
882
ref generics,
883
883
ref node,
884
- span
884
+ span : _ ,
885
885
} = * impl_item;
886
886
887
- visitor. visit_name ( span , name ) ;
887
+ visitor. visit_ident ( ident ) ;
888
888
visitor. visit_vis ( vis) ;
889
889
visitor. visit_defaultness ( defaultness) ;
890
890
walk_list ! ( visitor, visit_attribute, attrs) ;
@@ -896,7 +896,7 @@ pub fn walk_impl_item<'v, V: Visitor<'v>>(visitor: &mut V, impl_item: &'v ImplIt
896
896
visitor. visit_nested_body ( body) ;
897
897
}
898
898
ImplItemKind :: Method ( ref sig, body_id) => {
899
- visitor. visit_fn ( FnKind :: Method ( impl_item. name ,
899
+ visitor. visit_fn ( FnKind :: Method ( impl_item. ident ,
900
900
sig,
901
901
Some ( & impl_item. vis ) ,
902
902
& impl_item. attrs ) ,
@@ -914,9 +914,9 @@ pub fn walk_impl_item<'v, V: Visitor<'v>>(visitor: &mut V, impl_item: &'v ImplIt
914
914
915
915
pub fn walk_impl_item_ref < ' v , V : Visitor < ' v > > ( visitor : & mut V , impl_item_ref : & ' v ImplItemRef ) {
916
916
// NB: Deliberately force a compilation error if/when new fields are added.
917
- let ImplItemRef { id, name , ref kind, span, ref vis, ref defaultness } = * impl_item_ref;
917
+ let ImplItemRef { id, ident , ref kind, span : _ , ref vis, ref defaultness } = * impl_item_ref;
918
918
visitor. visit_nested_impl_item ( id) ;
919
- visitor. visit_name ( span , name ) ;
919
+ visitor. visit_ident ( ident ) ;
920
920
visitor. visit_associated_item_kind ( kind) ;
921
921
visitor. visit_vis ( vis) ;
922
922
visitor. visit_defaultness ( defaultness) ;
0 commit comments