Skip to content

Commit 66d47d4

Browse files
committed
Auto merge of #124629 - matthiaskrgr:rollup-gttvzrg, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #124138 (Ignore LLVM ABI in dlltool tests since those targets don't use dlltool) - #124414 (remove extraneous note on `UnableToRunDsymutil` diagnostic) - #124579 (Align: add bytes_usize and bits_usize) - #124622 (Cleanup: Rid the `rmake` test runners of `extern crate run_make_support;`) - #124623 (shallow resolve in orphan check) - #124624 (Use `tcx.types.unit` instead of `Ty::new_unit(tcx)`) - #124627 (interpret: hide some reexports in rustdoc) r? `@ghost` `@rustbot` modify labels: rollup
2 parents f087ecb + e80896e commit 66d47d4

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,10 @@ mod shims;
8989
// Establish a "crate-wide prelude": we often import `crate::*`.
9090

9191
// Make all those symbols available in the same place as our own.
92+
#[doc(no_inline)]
9293
pub use rustc_const_eval::interpret::*;
9394
// Resolve ambiguity.
95+
#[doc(no_inline)]
9496
pub use rustc_const_eval::interpret::{self, AllocMap, PlaceTy, Provenance as _};
9597

9698
pub use crate::shims::env::{EnvVars, EvalContextExt as _};

src/machine.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ impl<'mir, 'tcx: 'mir> PrimitiveLayouts<'tcx> {
380380
let mut_raw_ptr = Ty::new_mut_ptr(tcx, tcx.types.unit);
381381
let const_raw_ptr = Ty::new_imm_ptr(tcx, tcx.types.unit);
382382
Ok(Self {
383-
unit: layout_cx.layout_of(Ty::new_unit(tcx))?,
383+
unit: layout_cx.layout_of(tcx.types.unit)?,
384384
i8: layout_cx.layout_of(tcx.types.i8)?,
385385
i16: layout_cx.layout_of(tcx.types.i16)?,
386386
i32: layout_cx.layout_of(tcx.types.i32)?,

0 commit comments

Comments
 (0)