1
Fork 0

remove unused field from VariantDef::new and convert debug to instrument

This commit is contained in:
klensy 2025-02-24 12:25:17 +03:00
parent cede9029fd
commit 8467a76581
3 changed files with 1 additions and 9 deletions

View file

@ -1075,7 +1075,6 @@ fn lower_variant<'tcx>(
def.ctor().map(|(kind, _, def_id)| (kind, def_id.to_def_id())), def.ctor().map(|(kind, _, def_id)| (kind, def_id.to_def_id())),
discr, discr,
fields, fields,
adt_kind,
parent_did.to_def_id(), parent_did.to_def_id(),
recovered, recovered,
adt_kind == AdtKind::Struct && tcx.has_attr(parent_did, sym::non_exhaustive) adt_kind == AdtKind::Struct && tcx.has_attr(parent_did, sym::non_exhaustive)

View file

@ -1118,7 +1118,6 @@ impl<'a> CrateMetadataRef<'a> {
value: self.get_default_field(did.index), value: self.get_default_field(did.index),
}) })
.collect(), .collect(),
adt_kind,
parent_did, parent_did,
None, None,
data.is_non_exhaustive, data.is_non_exhaustive,

View file

@ -1183,23 +1183,17 @@ impl VariantDef {
/// ///
/// If someone speeds up attribute loading to not be a performance concern, they can /// If someone speeds up attribute loading to not be a performance concern, they can
/// remove this hack and use the constructor `DefId` everywhere. /// remove this hack and use the constructor `DefId` everywhere.
#[instrument(level = "debug")]
pub fn new( pub fn new(
name: Symbol, name: Symbol,
variant_did: Option<DefId>, variant_did: Option<DefId>,
ctor: Option<(CtorKind, DefId)>, ctor: Option<(CtorKind, DefId)>,
discr: VariantDiscr, discr: VariantDiscr,
fields: IndexVec<FieldIdx, FieldDef>, fields: IndexVec<FieldIdx, FieldDef>,
adt_kind: AdtKind,
parent_did: DefId, parent_did: DefId,
recover_tainted: Option<ErrorGuaranteed>, recover_tainted: Option<ErrorGuaranteed>,
is_field_list_non_exhaustive: bool, is_field_list_non_exhaustive: bool,
) -> Self { ) -> Self {
debug!(
"VariantDef::new(name = {:?}, variant_did = {:?}, ctor = {:?}, discr = {:?},
fields = {:?}, adt_kind = {:?}, parent_did = {:?})",
name, variant_did, ctor, discr, fields, adt_kind, parent_did,
);
let mut flags = VariantFlags::NO_VARIANT_FLAGS; let mut flags = VariantFlags::NO_VARIANT_FLAGS;
if is_field_list_non_exhaustive { if is_field_list_non_exhaustive {
flags |= VariantFlags::IS_FIELD_LIST_NON_EXHAUSTIVE; flags |= VariantFlags::IS_FIELD_LIST_NON_EXHAUSTIVE;