@@ -2056,7 +2056,7 @@ impl SelfKind {
20562056 return true ;
20572057 }
20582058 match ty. node {
2059- hir:: TyRptr ( _, ref mt_ty) => {
2059+ hir:: TyKind :: Rptr ( _, ref mt_ty) => {
20602060 let mutability_match = if self == SelfKind :: Ref {
20612061 mt_ty. mutbl == hir:: MutImmutable
20622062 } else {
@@ -2127,8 +2127,8 @@ fn is_as_ref_or_mut_trait(ty: &hir::Ty, self_ty: &hir::Ty, generics: &hir::Gener
21272127fn is_ty ( ty : & hir:: Ty , self_ty : & hir:: Ty ) -> bool {
21282128 match ( & ty. node , & self_ty. node ) {
21292129 (
2130- & hir:: TyPath ( hir:: QPath :: Resolved ( _, ref ty_path) ) ,
2131- & hir:: TyPath ( hir:: QPath :: Resolved ( _, ref self_ty_path) ) ,
2130+ & hir:: TyKind :: Path ( hir:: QPath :: Resolved ( _, ref ty_path) ) ,
2131+ & hir:: TyKind :: Path ( hir:: QPath :: Resolved ( _, ref self_ty_path) ) ,
21322132 ) => ty_path
21332133 . segments
21342134 . iter ( )
@@ -2139,7 +2139,7 @@ fn is_ty(ty: &hir::Ty, self_ty: &hir::Ty) -> bool {
21392139}
21402140
21412141fn single_segment_ty ( ty : & hir:: Ty ) -> Option < & hir:: PathSegment > {
2142- if let hir:: TyPath ( ref path) = ty. node {
2142+ if let hir:: TyKind :: Path ( ref path) = ty. node {
21432143 single_segment_path ( path)
21442144 } else {
21452145 None
@@ -2176,17 +2176,17 @@ impl OutType {
21762176 fn matches ( self , ty : & hir:: FunctionRetTy ) -> bool {
21772177 match ( self , ty) {
21782178 ( OutType :: Unit , & hir:: DefaultReturn ( _) ) => true ,
2179- ( OutType :: Unit , & hir:: Return ( ref ty) ) if ty. node == hir:: TyTup ( vec ! [ ] . into ( ) ) => true ,
2179+ ( OutType :: Unit , & hir:: Return ( ref ty) ) if ty. node == hir:: TyKind :: Tup ( vec ! [ ] . into ( ) ) => true ,
21802180 ( OutType :: Bool , & hir:: Return ( ref ty) ) if is_bool ( ty) => true ,
2181- ( OutType :: Any , & hir:: Return ( ref ty) ) if ty. node != hir:: TyTup ( vec ! [ ] . into ( ) ) => true ,
2182- ( OutType :: Ref , & hir:: Return ( ref ty) ) => matches ! ( ty. node, hir:: TyRptr ( _, _) ) ,
2181+ ( OutType :: Any , & hir:: Return ( ref ty) ) if ty. node != hir:: TyKind :: Tup ( vec ! [ ] . into ( ) ) => true ,
2182+ ( OutType :: Ref , & hir:: Return ( ref ty) ) => matches ! ( ty. node, hir:: TyKind :: Rptr ( _, _) ) ,
21832183 _ => false ,
21842184 }
21852185 }
21862186}
21872187
21882188fn is_bool ( ty : & hir:: Ty ) -> bool {
2189- if let hir:: TyPath ( ref p) = ty. node {
2189+ if let hir:: TyKind :: Path ( ref p) = ty. node {
21902190 match_qpath ( p, & [ "bool" ] )
21912191 } else {
21922192 false
0 commit comments