Auto merge of rust-lang#70737 - Centril:cleanup-lower-item-id, r=este…

…bank cleanup `lower_item_id` r? @oli-obk
kfitch · Apr 6, 2020 · 4015890 · 4015890
2 parents bd18bc9 + abe0c2d
commit 4015890
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/src/librustc_ast_lowering/item.rs b/src/librustc_ast_lowering/item.rs
@@ -165,19 +165,10 @@ impl<'hir> LoweringContext<'_, 'hir> {
             }
             ItemKind::MacroDef(..) => SmallVec::new(),
             ItemKind::Fn(..) | ItemKind::Impl { of_trait: None, .. } => smallvec![i.id],
-            ItemKind::Static(ref ty, ..) => {
+            ItemKind::Static(ref ty, ..) | ItemKind::Const(_, ref ty, ..) => {
                 let mut ids = smallvec![i.id];
                 if self.sess.features_untracked().impl_trait_in_bindings {
-                    let mut visitor = ImplTraitTypeIdVisitor { ids: &mut ids };
-                    visitor.visit_ty(ty);
-                }
-                ids
-            }
-            ItemKind::Const(_, ref ty, ..) => {
-                let mut ids = smallvec![i.id];
-                if self.sess.features_untracked().impl_trait_in_bindings {
-                    let mut visitor = ImplTraitTypeIdVisitor { ids: &mut ids };
-                    visitor.visit_ty(ty);
+                    ImplTraitTypeIdVisitor { ids: &mut ids }.visit_ty(ty);
                 }
                 ids
             }