@@ -51,7 +51,7 @@ impl<'hir> Entry<'hir> {
51
51
} ,
52
52
53
53
Node :: TraitItem ( ref item) => match item. kind {
54
- TraitItemKind :: Method ( ref sig, _) => Some ( & sig. decl ) ,
54
+ TraitItemKind :: Fn ( ref sig, _) => Some ( & sig. decl ) ,
55
55
_ => None ,
56
56
} ,
57
57
@@ -77,7 +77,7 @@ impl<'hir> Entry<'hir> {
77
77
} ,
78
78
79
79
Node :: TraitItem ( item) => match & item. kind {
80
- TraitItemKind :: Method ( sig, _) => Some ( sig) ,
80
+ TraitItemKind :: Fn ( sig, _) => Some ( sig) ,
81
81
_ => None ,
82
82
} ,
83
83
@@ -101,7 +101,7 @@ impl<'hir> Entry<'hir> {
101
101
102
102
Node :: TraitItem ( item) => match item. kind {
103
103
TraitItemKind :: Const ( _, Some ( body) )
104
- | TraitItemKind :: Method ( _, TraitMethod :: Provided ( body) ) => Some ( body) ,
104
+ | TraitItemKind :: Fn ( _, TraitMethod :: Provided ( body) ) => Some ( body) ,
105
105
_ => None ,
106
106
} ,
107
107
@@ -326,7 +326,7 @@ impl<'hir> Map<'hir> {
326
326
} ,
327
327
Node :: TraitItem ( item) => match item. kind {
328
328
TraitItemKind :: Const ( ..) => DefKind :: AssocConst ,
329
- TraitItemKind :: Method ( ..) => DefKind :: AssocFn ,
329
+ TraitItemKind :: Fn ( ..) => DefKind :: AssocFn ,
330
330
TraitItemKind :: Type ( ..) => DefKind :: AssocTy ,
331
331
} ,
332
332
Node :: ImplItem ( item) => match item. kind {
@@ -473,7 +473,7 @@ impl<'hir> Map<'hir> {
473
473
| Node :: AnonConst ( _) => BodyOwnerKind :: Const ,
474
474
Node :: Ctor ( ..)
475
475
| Node :: Item ( & Item { kind : ItemKind :: Fn ( ..) , .. } )
476
- | Node :: TraitItem ( & TraitItem { kind : TraitItemKind :: Method ( ..) , .. } )
476
+ | Node :: TraitItem ( & TraitItem { kind : TraitItemKind :: Fn ( ..) , .. } )
477
477
| Node :: ImplItem ( & ImplItem { kind : ImplItemKind :: Method ( ..) , .. } ) => BodyOwnerKind :: Fn ,
478
478
Node :: Item ( & Item { kind : ItemKind :: Static ( _, m, _) , .. } ) => BodyOwnerKind :: Static ( m) ,
479
479
Node :: Expr ( & Expr { kind : ExprKind :: Closure ( ..) , .. } ) => BodyOwnerKind :: Closure ,
@@ -801,7 +801,7 @@ impl<'hir> Map<'hir> {
801
801
_ => false ,
802
802
} ,
803
803
Node :: TraitItem ( ti) => match ti. kind {
804
- TraitItemKind :: Method ( ..) => true ,
804
+ TraitItemKind :: Fn ( ..) => true ,
805
805
_ => false ,
806
806
} ,
807
807
Node :: ImplItem ( ii) => match ii. kind {
@@ -1312,7 +1312,7 @@ fn hir_id_to_string(map: &Map<'_>, id: HirId, include_id: bool) -> String {
1312
1312
Some ( Node :: TraitItem ( ti) ) => {
1313
1313
let kind = match ti. kind {
1314
1314
TraitItemKind :: Const ( ..) => "assoc constant" ,
1315
- TraitItemKind :: Method ( ..) => "trait method" ,
1315
+ TraitItemKind :: Fn ( ..) => "trait method" ,
1316
1316
TraitItemKind :: Type ( ..) => "assoc type" ,
1317
1317
} ;
1318
1318
0 commit comments