Auto merge of #68435 - tmandry:llvmup-2-the-return-of-phibitcast-transform-fixes...

[rust.git] / src / librustc_metadata / foreign_modules.rs

diff --git a/src/librustc_metadata/foreign_modules.rs b/src/librustc_metadata/foreign_modules.rs
index acfcdd9a87f904eedff25e451c693f2e2dbddc8d..fc988ec15cee99f58392b17052a14f6eb2ccd3c4 100644 (file)
--- a/src/librustc_metadata/foreign_modules.rs
+++ b/src/librustc_metadata/foreign_modules.rs
@@ -1,13 +1,10 @@
-use rustc::hir::itemlikevisit::ItemLikeVisitor;
-use rustc::hir;
 use rustc::middle::cstore::ForeignModule;
 use rustc::ty::TyCtxt;
+use rustc_hir as hir;
+use rustc_hir::itemlikevisit::ItemLikeVisitor;
 
 crate fn collect(tcx: TyCtxt<'_>) -> Vec<ForeignModule> {
-    let mut collector = Collector {
-        tcx,
-        modules: Vec::new(),
-    };
+    let mut collector = Collector { tcx, modules: Vec::new() };
     tcx.hir().krate().visit_all_item_likes(&mut collector);
     return collector.modules;
 }
@@ -24,15 +21,12 @@ fn visit_item(&mut self, it: &'tcx hir::Item<'tcx>) {
             _ => return,
         };
 
-        let foreign_items = fm.items.iter()
-            .map(|it| self.tcx.hir().local_def_id(it.hir_id))
-            .collect();
-        self.modules.push(ForeignModule {
-            foreign_items,
-            def_id: self.tcx.hir().local_def_id(it.hir_id),
-        });
+        let foreign_items =
+            fm.items.iter().map(|it| self.tcx.hir().local_def_id(it.hir_id)).collect();
+        self.modules
+            .push(ForeignModule { foreign_items, def_id: self.tcx.hir().local_def_id(it.hir_id) });
     }
 
-    fn visit_trait_item(&mut self, _it: &'tcx hir::TraitItem) {}
-    fn visit_impl_item(&mut self, _it: &'tcx hir::ImplItem) {}
+    fn visit_trait_item(&mut self, _it: &'tcx hir::TraitItem<'tcx>) {}
+    fn visit_impl_item(&mut self, _it: &'tcx hir::ImplItem<'tcx>) {}
 }