Skip to content

Commit 81444b2

Browse files
committed
Remove some cruft from foreign_modules refactor
1 parent 69dc981 commit 81444b2

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

compiler/rustc_codegen_ssa/src/base.rs

-2
Original file line numberDiff line numberDiff line change
@@ -860,8 +860,6 @@ pub fn provide_both(providers: &mut Providers) {
860860

861861
providers.dllimport_foreign_items = |tcx, krate| {
862862
let module_map = tcx.foreign_modules(krate);
863-
let module_map =
864-
module_map.iter().map(|(def_id, lib)| (def_id, lib)).collect::<FxHashMap<_, _>>();
865863

866864
let dllimports = tcx
867865
.native_libraries(krate)

compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -270,9 +270,10 @@ pub fn provide(providers: &mut Providers) {
270270
None => return false,
271271
};
272272
let map = tcx.foreign_modules(id.krate);
273-
let module =
274-
tcx.prof.generic_activity("finding_foreign_module").run(|| map.get(&fm_id));
275-
module.expect("failed to find foreign module").foreign_items.contains(&id)
273+
map.get(&fm_id)
274+
.expect("failed to find foreign module")
275+
.foreign_items
276+
.contains(&id)
276277
})
277278
.map(|l| l.kind)
278279
},

0 commit comments

Comments
 (0)