EntryKind::AssocConst(
container,
- ConstQualif { mir: Default::default() },
+ Default::default(),
rendered_const,
)
}
record!(self.per_def.kind[def_id] <- match impl_item.kind {
ty::AssocKind::Const => {
if let hir::ImplItemKind::Const(_, body_id) = ast_item.kind {
- let mir = self.tcx.at(ast_item.span).mir_const_qualif(def_id);
+ let qualifs = self.tcx.at(ast_item.span).mir_const_qualif(def_id);
- EntryKind::AssocConst(container,
- ConstQualif { mir },
+ EntryKind::AssocConst(
+ container,
+ qualifs,
self.encode_rendered_const_for_body(body_id))
} else {
bug!()
hir::ItemKind::Static(_, hir::Mutability::Mutable, _) => EntryKind::MutStatic,
hir::ItemKind::Static(_, hir::Mutability::Immutable, _) => EntryKind::ImmStatic,
hir::ItemKind::Const(_, body_id) => {
- let mir = self.tcx.at(item.span).mir_const_qualif(def_id);
+ let qualifs = self.tcx.at(item.span).mir_const_qualif(def_id);
EntryKind::Const(
- ConstQualif { mir },
+ qualifs,
self.encode_rendered_const_for_body(body_id)
)
}
let id = self.tcx.hir().as_local_hir_id(def_id).unwrap();
let body_id = self.tcx.hir().body_owned_by(id);
let const_data = self.encode_rendered_const_for_body(body_id);
- let mir = self.tcx.mir_const_qualif(def_id);
+ let qualifs = self.tcx.mir_const_qualif(def_id);
- record!(self.per_def.kind[def_id] <- EntryKind::Const(ConstQualif { mir }, const_data));
+ record!(self.per_def.kind[def_id] <- EntryKind::Const(qualifs, const_data));
record!(self.per_def.visibility[def_id] <- ty::Visibility::Public);
record!(self.per_def.span[def_id] <- self.tcx.def_span(def_id));
self.encode_item_type(def_id);
#[derive(Copy, Clone, RustcEncodable, RustcDecodable)]
enum EntryKind<'tcx> {
- Const(ConstQualif, Lazy<RenderedConst>),
+ Const(mir::ConstQualifs, Lazy<RenderedConst>),
ImmStatic,
MutStatic,
ForeignImmStatic,
Method(Lazy<MethodData>),
AssocType(AssocContainer),
AssocOpaqueTy(AssocContainer),
- AssocConst(AssocContainer, ConstQualif, Lazy<RenderedConst>),
+ AssocConst(AssocContainer, mir::ConstQualifs, Lazy<RenderedConst>),
TraitAlias,
}
-/// Additional data for EntryKind::Const and EntryKind::AssocConst
-#[derive(Clone, Copy, RustcEncodable, RustcDecodable)]
-struct ConstQualif {
- mir: mir::ConstQualifs,
-}
-
/// Contains a constant which has been rendered to a String.
/// Used by rustdoc.
#[derive(RustcEncodable, RustcDecodable)]