Skip to content

Commit 617d3d6

Browse files
committed
Auto merge of #112127 - matthiaskrgr:rollup-77pt893, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #112031 (Migrate `item_proc_macro` to Askama) - #112053 (Remove `-Zcgu-partitioning-strategy`.) - #112069 (offset_of: don't require type to be `Sized`) - #112084 (enhancements on build_helper utilization and rustdoc-gui-test) - #112096 (Remove array_zip) - #112108 (Fix re-export of doc hidden item inside private item not displayed) - #112113 (rustdoc: simplify `clean` by removing `FnRetTy`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents f51fca3 + 77bbfbc commit 617d3d6

File tree

37 files changed

+1413
-1558
lines changed

37 files changed

+1413
-1558
lines changed

Diff for: Cargo.lock

+1
Original file line numberDiff line numberDiff line change
@@ -4289,6 +4289,7 @@ dependencies = [
42894289
name = "rustdoc-gui-test"
42904290
version = "0.1.0"
42914291
dependencies = [
4292+
"build_helper",
42924293
"compiletest",
42934294
"getopts",
42944295
"walkdir",

Diff for: compiler/rustc_codegen_ssa/src/mir/rvalue.rs

+8-3
Original file line numberDiff line numberDiff line change
@@ -668,11 +668,16 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
668668

669669
mir::Rvalue::NullaryOp(ref null_op, ty) => {
670670
let ty = self.monomorphize(ty);
671-
assert!(bx.cx().type_is_sized(ty));
672671
let layout = bx.cx().layout_of(ty);
673672
let val = match null_op {
674-
mir::NullOp::SizeOf => layout.size.bytes(),
675-
mir::NullOp::AlignOf => layout.align.abi.bytes(),
673+
mir::NullOp::SizeOf => {
674+
assert!(bx.cx().type_is_sized(ty));
675+
layout.size.bytes()
676+
}
677+
mir::NullOp::AlignOf => {
678+
assert!(bx.cx().type_is_sized(ty));
679+
layout.align.abi.bytes()
680+
}
676681
mir::NullOp::OffsetOf(fields) => {
677682
layout.offset_of_subfield(bx.cx(), fields.iter().map(|f| f.index())).bytes()
678683
}

Diff for: compiler/rustc_monomorphize/src/partitioning.rs

+1,182
Large diffs are not rendered by default.

Diff for: compiler/rustc_monomorphize/src/partitioning/default.rs

-644
This file was deleted.

0 commit comments

Comments
 (0)