Skip to content

Rollup of 7 pull requests #124629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
May 2, 2024
Merged

Rollup of 7 pull requests #124629

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a51ad79
Refactor dlltool searching code into separate function
mati865 Apr 23, 2024
b1fd4a7
Skip dlltool tests on non `*windows-gnu` targets
mati865 Apr 23, 2024
1367827
remove extraneous note on `UnableToRunDsymutil` diagnostic
lqd Apr 26, 2024
65d7478
Align: add bytes_usize and bits_usize
RalfJung May 1, 2024
c4e882f
shallow resolve in orphan check
lcnr May 2, 2024
698d7a0
Inline & delete `Ty::new_unit`, since it's just a field access
WaffleLapkin May 2, 2024
1c9a61d
Don't use `Ty::new_unit` in miri
WaffleLapkin May 2, 2024
09aa772
Cleanup: Rid the `rmake` test runners of `extern crate run_make_suppo…
fmease May 2, 2024
dba1849
interpret: hide some reexports in rustdoc
RalfJung May 2, 2024
f01e99f
Rollup merge of #124138 - mati865:ignore-llvm-abi-in-dlltool-tests, r…
matthiaskrgr May 2, 2024
e9e2ebb
Rollup merge of #124414 - lqd:subdiagnostics, r=davidtwco
matthiaskrgr May 2, 2024
490c0d6
Rollup merge of #124579 - RalfJung:align-bytes-usize, r=fmease
matthiaskrgr May 2, 2024
6cc3959
Rollup merge of #124622 - fmease:yeet-extern-crate-run_make_support, …
matthiaskrgr May 2, 2024
fe62bc5
Rollup merge of #124623 - lcnr:coherence-uwu, r=compiler-errors
matthiaskrgr May 2, 2024
d6940fb
Rollup merge of #124624 - WaffleLapkin:old_unit, r=fmease
matthiaskrgr May 2, 2024
a248411
Rollup merge of #124627 - RalfJung:interpret-doc-no-inline, r=fmease
matthiaskrgr May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Don't use Ty::new_unit in miri
  • Loading branch information
@WaffleLapkin
WaffleLapkin committed May 2, 2024
commit 1c9a61d2111c93407018c99e15ddd78ea18a234e
2 changes: 1 addition & 1 deletion src/tools/miri/src/machine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ impl<'mir, 'tcx: 'mir> PrimitiveLayouts<'tcx> {
let mut_raw_ptr = Ty::new_mut_ptr(tcx, tcx.types.unit);
let const_raw_ptr = Ty::new_imm_ptr(tcx, tcx.types.unit);
Ok(Self {
unit: layout_cx.layout_of(Ty::new_unit(tcx))?,
unit: layout_cx.layout_of(tcx.types.unit)?,
i8: layout_cx.layout_of(tcx.types.i8)?,
i16: layout_cx.layout_of(tcx.types.i16)?,
i32: layout_cx.layout_of(tcx.types.i32)?,
Expand Down