bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove some cruft from foreign_modules refactor

Browse source
This commit is contained in:
Ryan Levick 2020-10-27 20:17:48 +01:00
parent 69dc98161a
commit 81444b2049
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_codegen_ssa/src/base.rs
View file

@ -860,8 +860,6 @@ pub fn provide_both(providers: &mut Providers) {
providers.dllimport_foreign_items = |tcx, krate| { providers.dllimport_foreign_items = |tcx, krate| {
let module_map = tcx.foreign_modules(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 let dllimports = tcx
.native_libraries(krate) .native_libraries(krate)

7
compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs
View file

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