@@ -12,7 +12,6 @@ use std::panic;
12
12
13
13
use rustc_data_structures:: flat_map_in_place:: FlatMapInPlace ;
14
14
use rustc_data_structures:: stack:: ensure_sufficient_stack;
15
- use rustc_span:: source_map:: Spanned ;
16
15
use rustc_span:: { Ident , Span } ;
17
16
use smallvec:: { Array , SmallVec , smallvec} ;
18
17
use thin_vec:: ThinVec ;
@@ -499,58 +498,6 @@ fn walk_assoc_item_constraint<T: MutVisitor>(
499
498
vis. visit_span ( span) ;
500
499
}
501
500
502
- pub fn walk_ty < T : MutVisitor > ( vis : & mut T , ty : & mut Ty ) {
503
- let Ty { id, kind, span, tokens : _ } = ty;
504
- vis. visit_id ( id) ;
505
- match kind {
506
- TyKind :: Err ( _guar) => { }
507
- TyKind :: Infer | TyKind :: ImplicitSelf | TyKind :: Dummy | TyKind :: Never | TyKind :: CVarArgs => {
508
- }
509
- TyKind :: Slice ( ty) => vis. visit_ty ( ty) ,
510
- TyKind :: Ptr ( MutTy { ty, mutbl : _ } ) => vis. visit_ty ( ty) ,
511
- TyKind :: Ref ( lt, MutTy { ty, mutbl : _ } ) | TyKind :: PinnedRef ( lt, MutTy { ty, mutbl : _ } ) => {
512
- visit_opt ( lt, |lt| vis. visit_lifetime ( lt) ) ;
513
- vis. visit_ty ( ty) ;
514
- }
515
- TyKind :: BareFn ( bft) => {
516
- let BareFnTy { safety, ext : _, generic_params, decl, decl_span } = bft. deref_mut ( ) ;
517
- visit_safety ( vis, safety) ;
518
- generic_params. flat_map_in_place ( |param| vis. flat_map_generic_param ( param) ) ;
519
- vis. visit_fn_decl ( decl) ;
520
- vis. visit_span ( decl_span) ;
521
- }
522
- TyKind :: UnsafeBinder ( binder) => {
523
- let UnsafeBinderTy { generic_params, inner_ty } = binder. deref_mut ( ) ;
524
- generic_params. flat_map_in_place ( |param| vis. flat_map_generic_param ( param) ) ;
525
- vis. visit_ty ( inner_ty) ;
526
- }
527
- TyKind :: Tup ( tys) => visit_thin_vec ( tys, |ty| vis. visit_ty ( ty) ) ,
528
- TyKind :: Paren ( ty) => vis. visit_ty ( ty) ,
529
- TyKind :: Pat ( ty, pat) => {
530
- vis. visit_ty ( ty) ;
531
- vis. visit_ty_pat ( pat) ;
532
- }
533
- TyKind :: Path ( qself, path) => {
534
- vis. visit_qself ( qself) ;
535
- vis. visit_path ( path) ;
536
- }
537
- TyKind :: Array ( ty, length) => {
538
- vis. visit_ty ( ty) ;
539
- vis. visit_anon_const ( length) ;
540
- }
541
- TyKind :: Typeof ( expr) => vis. visit_anon_const ( expr) ,
542
- TyKind :: TraitObject ( bounds, _syntax) => {
543
- visit_vec ( bounds, |bound| vis. visit_param_bound ( bound, BoundKind :: TraitObject ) )
544
- }
545
- TyKind :: ImplTrait ( id, bounds) => {
546
- vis. visit_id ( id) ;
547
- visit_vec ( bounds, |bound| vis. visit_param_bound ( bound, BoundKind :: Impl ) ) ;
548
- }
549
- TyKind :: MacCall ( mac) => vis. visit_mac_call ( mac) ,
550
- }
551
- vis. visit_span ( span) ;
552
- }
553
-
554
501
pub fn walk_ty_pat < T : MutVisitor > ( vis : & mut T , ty : & mut TyPat ) {
555
502
let TyPat { id, kind, span, tokens : _ } = ty;
556
503
vis. visit_id ( id) ;
@@ -588,13 +535,6 @@ fn walk_ident<T: MutVisitor>(vis: &mut T, Ident { name: _, span }: &mut Ident) {
588
535
vis. visit_span ( span) ;
589
536
}
590
537
591
- fn walk_path_segment < T : MutVisitor > ( vis : & mut T , segment : & mut PathSegment ) {
592
- let PathSegment { ident, id, args } = segment;
593
- vis. visit_id ( id) ;
594
- vis. visit_ident ( ident) ;
595
- visit_opt ( args, |args| vis. visit_generic_args ( args) ) ;
596
- }
597
-
598
538
fn walk_path < T : MutVisitor > ( vis : & mut T , Path { segments, span, tokens : _ } : & mut Path ) {
599
539
for segment in segments {
600
540
vis. visit_path_segment ( segment) ;
@@ -729,18 +669,6 @@ fn walk_closure_binder<T: MutVisitor>(vis: &mut T, binder: &mut ClosureBinder) {
729
669
}
730
670
}
731
671
732
- fn walk_coroutine_kind < T : MutVisitor > ( vis : & mut T , coroutine_kind : & mut CoroutineKind ) {
733
- match coroutine_kind {
734
- CoroutineKind :: Async { span, closure_id, return_impl_trait_id }
735
- | CoroutineKind :: Gen { span, closure_id, return_impl_trait_id }
736
- | CoroutineKind :: AsyncGen { span, closure_id, return_impl_trait_id } => {
737
- vis. visit_id ( closure_id) ;
738
- vis. visit_id ( return_impl_trait_id) ;
739
- vis. visit_span ( span) ;
740
- }
741
- }
742
- }
743
-
744
672
fn walk_fn < T : MutVisitor > ( vis : & mut T , kind : FnKind < ' _ > ) {
745
673
match kind {
746
674
FnKind :: Fn (
@@ -991,13 +919,6 @@ pub fn walk_flat_map_expr_field<T: MutVisitor>(
991
919
smallvec ! [ f]
992
920
}
993
921
994
- pub fn walk_block < T : MutVisitor > ( vis : & mut T , block : & mut Block ) {
995
- let Block { id, stmts, rules : _, span, tokens : _ } = block;
996
- vis. visit_id ( id) ;
997
- stmts. flat_map_in_place ( |stmt| vis. flat_map_stmt ( stmt) ) ;
998
- vis. visit_span ( span) ;
999
- }
1000
-
1001
922
pub fn walk_item_kind < K : WalkItemKind > (
1002
923
kind : & mut K ,
1003
924
span : Span ,
@@ -1041,57 +962,6 @@ pub fn walk_flat_map_assoc_item(
1041
962
smallvec ! [ item]
1042
963
}
1043
964
1044
- pub fn walk_pat < T : MutVisitor > ( vis : & mut T , pat : & mut Pat ) {
1045
- let Pat { id, kind, span, tokens : _ } = pat;
1046
- vis. visit_id ( id) ;
1047
- match kind {
1048
- PatKind :: Err ( _guar) => { }
1049
- PatKind :: Missing | PatKind :: Wild | PatKind :: Rest | PatKind :: Never => { }
1050
- PatKind :: Ident ( _binding_mode, ident, sub) => {
1051
- vis. visit_ident ( ident) ;
1052
- visit_opt ( sub, |sub| vis. visit_pat ( sub) ) ;
1053
- }
1054
- PatKind :: Expr ( e) => vis. visit_expr ( e) ,
1055
- PatKind :: TupleStruct ( qself, path, elems) => {
1056
- vis. visit_qself ( qself) ;
1057
- vis. visit_path ( path) ;
1058
- visit_thin_vec ( elems, |elem| vis. visit_pat ( elem) ) ;
1059
- }
1060
- PatKind :: Path ( qself, path) => {
1061
- vis. visit_qself ( qself) ;
1062
- vis. visit_path ( path) ;
1063
- }
1064
- PatKind :: Struct ( qself, path, fields, _etc) => {
1065
- vis. visit_qself ( qself) ;
1066
- vis. visit_path ( path) ;
1067
- fields. flat_map_in_place ( |field| vis. flat_map_pat_field ( field) ) ;
1068
- }
1069
- PatKind :: Box ( inner) => vis. visit_pat ( inner) ,
1070
- PatKind :: Deref ( inner) => vis. visit_pat ( inner) ,
1071
- PatKind :: Ref ( inner, _mutbl) => vis. visit_pat ( inner) ,
1072
- PatKind :: Range ( e1, e2, Spanned { span : _, node : _ } ) => {
1073
- visit_opt ( e1, |e| vis. visit_expr ( e) ) ;
1074
- visit_opt ( e2, |e| vis. visit_expr ( e) ) ;
1075
- vis. visit_span ( span) ;
1076
- }
1077
- PatKind :: Guard ( p, e) => {
1078
- vis. visit_pat ( p) ;
1079
- vis. visit_expr ( e) ;
1080
- }
1081
- PatKind :: Tuple ( elems) | PatKind :: Slice ( elems) | PatKind :: Or ( elems) => {
1082
- visit_thin_vec ( elems, |elem| vis. visit_pat ( elem) )
1083
- }
1084
- PatKind :: Paren ( inner) => vis. visit_pat ( inner) ,
1085
- PatKind :: MacCall ( mac) => vis. visit_mac_call ( mac) ,
1086
- }
1087
- vis. visit_span ( span) ;
1088
- }
1089
-
1090
- fn walk_anon_const < T : MutVisitor > ( vis : & mut T , AnonConst { id, value } : & mut AnonConst ) {
1091
- vis. visit_id ( id) ;
1092
- vis. visit_expr ( value) ;
1093
- }
1094
-
1095
965
fn walk_inline_asm < T : MutVisitor > ( vis : & mut T , asm : & mut InlineAsm ) {
1096
966
// FIXME: Visit spans inside all this currently ignored stuff.
1097
967
let InlineAsm {
0 commit comments