Remove some cruft from foreign_modules refactor

rust-lang · Oct 27, 2020 · 81444b2 · 81444b2
1 parent 69dc981
commit 81444b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/compiler/rustc_codegen_ssa/src/base.rs b/compiler/rustc_codegen_ssa/src/base.rs
@@ -860,8 +860,6 @@ pub fn provide_both(providers: &mut Providers) {
 
     providers.dllimport_foreign_items = |tcx, krate| {
         let module_map = tcx.foreign_modules(krate);
-        let module_map =
-            module_map.iter().map(|(def_id, lib)| (def_id, lib)).collect::<FxHashMap<_, _>>();
 
         let dllimports = tcx
             .native_libraries(krate)

diff --git a/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs b/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs
@@ -270,9 +270,10 @@ pub fn provide(providers: &mut Providers) {
                         None => return false,
                     };
                     let map = tcx.foreign_modules(id.krate);
-                    let module =
-                        tcx.prof.generic_activity("finding_foreign_module").run(|| map.get(&fm_id));
-                    module.expect("failed to find foreign module").foreign_items.contains(&id)
+                    map.get(&fm_id)
+                        .expect("failed to find foreign module")
+                        .foreign_items
+                        .contains(&id)
                 })
                 .map(|l| l.kind)
         },