Cleanup in preparation of generic extraction

diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs
index 110ebf6b215a15ab4d840564d6ee0c3210d892a1..3350b046c97d5fbf1d99e099c2abb8cfb4f932fd 100644 (file)
--- a/src/librustc/hir/lowering.rs
+++ b/src/librustc/hir/lowering.rs
@@ -1364,8 +1364,9 @@ fn visit_generic_args(&mut self, span: Span, parameters: &'v hir::GenericArgs) {
             }
 
             fn visit_ty(&mut self, t: &'v hir::Ty) {
+                match t.node {
                 // Don't collect elided lifetimes used inside of `fn()` syntax
-                if let &hir::Ty_::TyBareFn(_) = &t.node {
+                    hir::Ty_::TyBareFn(_) => {
                     let old_collect_elided_lifetimes = self.collect_elided_lifetimes;
                     self.collect_elided_lifetimes = false;
 
@@ -1376,8 +1377,8 @@ fn visit_ty(&mut self, t: &'v hir::Ty) {
                     self.currently_bound_lifetimes.truncate(old_len);
 
                     self.collect_elided_lifetimes = old_collect_elided_lifetimes;
-                } else {
-                    hir::intravisit::walk_ty(self, t);
+                    },
+                    _ => hir::intravisit::walk_ty(self, t),
                 }
             }