@@ -66,7 +66,7 @@ impl BoundKind {
66
66
#[ derive( Copy , Clone , Debug ) ]
67
67
pub enum FnKind < ' a > {
68
68
/// E.g., `fn foo()`, `fn foo(&self)`, or `extern "Abi" fn foo()`.
69
- Fn ( FnCtxt , Ident , & ' a FnSig , & ' a Visibility , & ' a Generics , Option < & ' a Block > ) ,
69
+ Fn ( FnCtxt , & ' a Ident , & ' a FnSig , & ' a Visibility , & ' a Generics , & ' a Option < P < Block > > ) ,
70
70
71
71
/// E.g., `|x, y| body`.
72
72
Closure ( & ' a ClosureBinder , & ' a Option < CoroutineKind > , & ' a FnDecl , & ' a Expr ) ,
@@ -357,7 +357,7 @@ impl WalkItemKind for ItemKind {
357
357
visit_opt ! ( visitor, visit_expr, expr) ;
358
358
}
359
359
ItemKind :: Fn ( box Fn { defaultness : _, generics, sig, body } ) => {
360
- let kind = FnKind :: Fn ( FnCtxt :: Free , * ident, sig, vis, generics, body. as_deref ( ) ) ;
360
+ let kind = FnKind :: Fn ( FnCtxt :: Free , ident, sig, vis, generics, body) ;
361
361
try_visit ! ( visitor. visit_fn( kind, * span, * id) ) ;
362
362
}
363
363
ItemKind :: Mod ( _unsafety, mod_kind) => match mod_kind {
@@ -687,15 +687,15 @@ impl WalkItemKind for ForeignItemKind {
687
687
_ctxt : AssocCtxt ,
688
688
visitor : & mut V ,
689
689
) -> V :: Result {
690
- let & Item { id, span, ident, ref vis, .. } = item;
690
+ let Item { id, span, ident, vis, .. } = item;
691
691
match self {
692
692
ForeignItemKind :: Static ( box StaticItem { ty, mutability : _, expr, safety : _ } ) => {
693
693
try_visit ! ( visitor. visit_ty( ty) ) ;
694
694
visit_opt ! ( visitor, visit_expr, expr) ;
695
695
}
696
696
ForeignItemKind :: Fn ( box Fn { defaultness : _, generics, sig, body } ) => {
697
- let kind = FnKind :: Fn ( FnCtxt :: Foreign , ident, sig, vis, generics, body. as_deref ( ) ) ;
698
- try_visit ! ( visitor. visit_fn( kind, span, id) ) ;
697
+ let kind = FnKind :: Fn ( FnCtxt :: Foreign , ident, sig, vis, generics, body) ;
698
+ try_visit ! ( visitor. visit_fn( kind, * span, * id) ) ;
699
699
}
700
700
ForeignItemKind :: TyAlias ( box TyAlias {
701
701
generics,
@@ -850,7 +850,7 @@ impl WalkItemKind for AssocItemKind {
850
850
ctxt : AssocCtxt ,
851
851
visitor : & mut V ,
852
852
) -> V :: Result {
853
- let & Item { id, span, ident, ref vis, .. } = item;
853
+ let Item { id, span, ident, vis, .. } = item;
854
854
match self {
855
855
AssocItemKind :: Const ( box ConstItem { defaultness : _, generics, ty, expr } ) => {
856
856
try_visit ! ( visitor. visit_generics( generics) ) ;
@@ -859,8 +859,8 @@ impl WalkItemKind for AssocItemKind {
859
859
}
860
860
AssocItemKind :: Fn ( box Fn { defaultness : _, generics, sig, body } ) => {
861
861
let kind =
862
- FnKind :: Fn ( FnCtxt :: Assoc ( ctxt) , ident, sig, vis, generics, body. as_deref ( ) ) ;
863
- try_visit ! ( visitor. visit_fn( kind, span, id) ) ;
862
+ FnKind :: Fn ( FnCtxt :: Assoc ( ctxt) , ident, sig, vis, generics, body) ;
863
+ try_visit ! ( visitor. visit_fn( kind, * span, * id) ) ;
864
864
}
865
865
AssocItemKind :: Type ( box TyAlias {
866
866
generics,
@@ -891,7 +891,7 @@ impl WalkItemKind for AssocItemKind {
891
891
}
892
892
AssocItemKind :: DelegationMac ( box DelegationMac { qself, prefix, suffixes, body } ) => {
893
893
try_visit ! ( walk_qself( visitor, qself) ) ;
894
- try_visit ! ( visitor. visit_path( prefix, id) ) ;
894
+ try_visit ! ( visitor. visit_path( prefix, * id) ) ;
895
895
if let Some ( suffixes) = suffixes {
896
896
for ( ident, rename) in suffixes {
897
897
visitor. visit_ident ( ident) ;
0 commit comments