Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 2b3cef8

Browse files
committedFeb 26, 2025
Auto merge of #137651 - fmease:rollup-s3s7m6f, r=fmease
Rollup of 14 pull requests Successful merges: - #136576 (pass optimization level to llvm-bitcode-linker) - #137154 (Add UTF-8 validation fast paths in `Wtf8Buf`) - #137311 (Enable `f16` for MIPS) - #137320 (fix(rustdoc): Fixed stability version in rustdoc) - #137529 (remove few unused args) - #137544 (tests: Add regression test for derive token invalidation (#81099)) - #137559 (run some tests on emscripten again) - #137601 (ssa/mono: deduplicate `type_has_metadata`) - #137603 (codegen_llvm: avoid `Deref` impls w/ extern type) - #137604 (trait_sel: resolve vars in host effects) - #137609 (Complete the list of resources used in rustdoc output) - #137613 (hir_analysis: skip self type of host effect preds in variances_of) - #137614 (fix doc in library/core/src/pin.rs) - #137622 (fix attribute-related ICE when parsing macro on the rhs of a name-value attribute) r? `@ghost` `@rustbot` modify labels: rollup
2 parents a46c755 + 1bb4319 commit 2b3cef8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+487
-119
lines changed
 

‎compiler/rustc_metadata/src/rmeta/decoder.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1116,7 +1116,6 @@ impl<'a> CrateMetadataRef<'a> {
11161116
value: self.get_default_field(did.index),
11171117
})
11181118
.collect(),
1119-
adt_kind,
11201119
parent_did,
11211120
None,
11221121
data.is_non_exhaustive,

‎compiler/rustc_middle/src/ty/mod.rs

+1-7
Original file line numberDiff line numberDiff line change
@@ -1184,23 +1184,17 @@ impl VariantDef {
11841184
///
11851185
/// If someone speeds up attribute loading to not be a performance concern, they can
11861186
/// remove this hack and use the constructor `DefId` everywhere.
1187+
#[instrument(level = "debug")]
11871188
pub fn new(
11881189
name: Symbol,
11891190
variant_did: Option<DefId>,
11901191
ctor: Option<(CtorKind, DefId)>,
11911192
discr: VariantDiscr,
11921193
fields: IndexVec<FieldIdx, FieldDef>,
1193-
adt_kind: AdtKind,
11941194
parent_did: DefId,
11951195
recover_tainted: Option<ErrorGuaranteed>,
11961196
is_field_list_non_exhaustive: bool,
11971197
) -> Self {
1198-
debug!(
1199-
"VariantDef::new(name = {:?}, variant_did = {:?}, ctor = {:?}, discr = {:?},
1200-
fields = {:?}, adt_kind = {:?}, parent_did = {:?})",
1201-
name, variant_did, ctor, discr, fields, adt_kind, parent_did,
1202-
);
1203-
12041198
let mut flags = VariantFlags::NO_VARIANT_FLAGS;
12051199
if is_field_list_non_exhaustive {
12061200
flags |= VariantFlags::IS_FIELD_LIST_NON_EXHAUSTIVE;
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.