Skip to content

Commit 565cadb

Browse files
committed
Auto merge of #126167 - matthiaskrgr:rollup-r717w0s, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - #126132 (config.example.toml: minor improves) - #126149 (Miri std tests: don't set BOOTSTRAP_SKIP_TARGET_SANITY unnecessarily) - #126157 (add missing Scalar::from_i128) r? `@ghost` `@rustbot` modify labels: rollup
2 parents cfdb617 + 7fd9b1f commit 565cadb

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

compiler/rustc_middle/src/mir/interpret/value.rs

+5
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,11 @@ impl<Prov> Scalar<Prov> {
196196
Self::from_int(i, Size::from_bits(64))
197197
}
198198

199+
#[inline]
200+
pub fn from_i128(i: i128) -> Self {
201+
Self::from_int(i, Size::from_bits(128))
202+
}
203+
199204
#[inline]
200205
pub fn from_target_isize(i: i64, cx: &impl HasDataLayout) -> Self {
201206
Self::from_int(i, cx.data_layout().pointer_size)

config.example.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -389,8 +389,8 @@
389389
# a Nix toolchain on non-NixOS distributions.
390390
#patch-binaries-for-nix = false
391391

392-
# Collect information and statistics about the current build and writes it to
393-
# disk. Enabling this or not has no impact on the resulting build output. The
392+
# Collect information and statistics about the current build, and write it to
393+
# disk. Enabling this has no impact on the resulting build output. The
394394
# schema of the file generated by the build metrics feature is unstable, and
395395
# this is not intended to be used during local development.
396396
#metrics = false

src/bootstrap/mk/Makefile.in

+4-3
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,18 @@ check-aux:
5959
library/alloc \
6060
--no-doc
6161
# Some doctests have intentional memory leaks.
62+
# Some use file system operations to demonstrate dealing with `Result`.
6263
$(Q)MIRIFLAGS="-Zmiri-ignore-leaks -Zmiri-disable-isolation" \
6364
$(BOOTSTRAP) miri --stage 2 \
6465
library/core \
6566
library/alloc \
6667
--doc
67-
# In `std` we cannot test everything.
68-
$(Q)MIRIFLAGS="-Zmiri-disable-isolation" BOOTSTRAP_SKIP_TARGET_SANITY=1 \
68+
# In `std` we cannot test everything, so we skip some modules.
69+
$(Q)MIRIFLAGS="-Zmiri-disable-isolation" \
6970
$(BOOTSTRAP) miri --stage 2 library/std \
7071
--no-doc -- \
7172
--skip fs:: --skip net:: --skip process:: --skip sys::pal::
72-
$(Q)MIRIFLAGS="-Zmiri-ignore-leaks -Zmiri-disable-isolation" BOOTSTRAP_SKIP_TARGET_SANITY=1 \
73+
$(Q)MIRIFLAGS="-Zmiri-ignore-leaks -Zmiri-disable-isolation" \
7374
$(BOOTSTRAP) miri --stage 2 library/std \
7475
--doc -- \
7576
--skip fs:: --skip net:: --skip process:: --skip sys::pal::

0 commit comments

Comments
 (0)