mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #83082 - cjgillot:defkey-ii, r=oli-obk

Browse Source 
Iterate on crate_inherent_impls for metadata.

Split from #80347

r? `@oli-obk`
This commit is contained in:
bors 2021-03-14 14:16:21 +00:00
commit 9320b121b5
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
compiler/rustc_metadata/src/rmeta/encoder.rs
View File

@ -865,6 +865,17 @@ impl EncodeContext<'a, 'tcx> {
self.encode_deprecation(def_id); self.encode_deprecation(def_id);
} }
} }
let inherent_impls = tcx.crate_inherent_impls(LOCAL_CRATE);
for (def_id, implementations) in inherent_impls.inherent_impls.iter() {
assert!(def_id.is_local());
if implementations.is_empty() {
continue;
}
record!(self.tables.inherent_impls[def_id] <- implementations.iter().map(|&def_id| {
assert!(def_id.is_local());
def_id.index
}));
}
} }
fn encode_variances_of(&mut self, def_id: DefId) { fn encode_variances_of(&mut self, def_id: DefId) {
@ -1237,18 +1248,6 @@ impl EncodeContext<'a, 'tcx> {
} }
} }
// Encodes the inherent implementations of a structure, enumeration, or trait.
fn encode_inherent_implementations(&mut self, def_id: DefId) {
debug!("EncodeContext::encode_inherent_implementations({:?})", def_id);
let implementations = self.tcx.inherent_impls(def_id);
if !implementations.is_empty() {
record!(self.tables.inherent_impls[def_id] <- implementations.iter().map(|&def_id| {
assert!(def_id.is_local());
def_id.index
}));
}
}
fn encode_stability(&mut self, def_id: DefId) { fn encode_stability(&mut self, def_id: DefId) {
debug!("EncodeContext::encode_stability({:?})", def_id); debug!("EncodeContext::encode_stability({:?})", def_id);
@ -1459,7 +1458,6 @@ impl EncodeContext<'a, 'tcx> {
record!(self.tables.impl_trait_ref[def_id] <- trait_ref); record!(self.tables.impl_trait_ref[def_id] <- trait_ref);
} }
} }
self.encode_inherent_implementations(def_id);
match item.kind { match item.kind {
hir::ItemKind::Enum(..) hir::ItemKind::Enum(..)
| hir::ItemKind::Struct(..) | hir::ItemKind::Struct(..)
@ -1822,7 +1820,6 @@ impl EncodeContext<'a, 'tcx> {
} }
self.encode_ident_span(def_id, nitem.ident); self.encode_ident_span(def_id, nitem.ident);
self.encode_item_type(def_id); self.encode_item_type(def_id);
self.encode_inherent_implementations(def_id);
if let hir::ForeignItemKind::Fn(..) = nitem.kind { if let hir::ForeignItemKind::Fn(..) = nitem.kind {
record!(self.tables.fn_sig[def_id] <- tcx.fn_sig(def_id)); record!(self.tables.fn_sig[def_id] <- tcx.fn_sig(def_id));
self.encode_variances_of(def_id); self.encode_variances_of(def_id);