diff options
| author | marmeladema <xademax@gmail.com> | 2020-06-12 18:13:10 +0100 |
|---|---|---|
| committer | marmeladema <xademax@gmail.com> | 2020-06-20 11:03:53 +0100 |
| commit | 936b6bfa646c90b0533cc33bbbc03d890d0780f1 (patch) | |
| tree | 93ca05ca76317953c53bb35e2ec4a43eaa1ea5fd /src/librustc_middle/ty | |
| parent | 033013cab3a861224fd55f494c8be1cb0349eb49 (diff) | |
| download | rust-936b6bfa646c90b0533cc33bbbc03d890d0780f1.tar.gz rust-936b6bfa646c90b0533cc33bbbc03d890d0780f1.zip | |
Move `trait_map` into `hir::Crate`
Diffstat (limited to 'src/librustc_middle/ty')
| -rw-r--r-- | src/librustc_middle/ty/context.rs | 4 | ||||
| -rw-r--r-- | src/librustc_middle/ty/mod.rs | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/librustc_middle/ty/context.rs b/src/librustc_middle/ty/context.rs index 6380f8be98d..5b44ffe8caf 100644 --- a/src/librustc_middle/ty/context.rs +++ b/src/librustc_middle/ty/context.rs @@ -1101,9 +1101,9 @@ impl<'tcx> TyCtxt<'tcx> { }; let mut trait_map: FxHashMap<_, FxHashMap<_, _>> = FxHashMap::default(); - for (hir_id, v) in resolutions.trait_map.into_iter() { + for (hir_id, v) in krate.trait_map.iter() { let map = trait_map.entry(hir_id.owner).or_default(); - map.insert(hir_id.local_id, StableVec::new(v)); + map.insert(hir_id.local_id, StableVec::new(v.to_vec())); } GlobalCtxt { diff --git a/src/librustc_middle/ty/mod.rs b/src/librustc_middle/ty/mod.rs index ca0a1ac71c6..56fb3b58d3f 100644 --- a/src/librustc_middle/ty/mod.rs +++ b/src/librustc_middle/ty/mod.rs @@ -121,7 +121,6 @@ pub struct ResolverOutputs { pub definitions: rustc_hir::definitions::Definitions, pub cstore: Box<CrateStoreDyn>, pub extern_crate_map: FxHashMap<LocalDefId, CrateNum>, - pub trait_map: FxHashMap<hir::HirId, Vec<hir::TraitCandidate>>, pub maybe_unused_trait_imports: FxHashSet<LocalDefId>, pub maybe_unused_extern_crates: Vec<(LocalDefId, Span)>, pub export_map: ExportMap<LocalDefId>, |