mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #126167 - matthiaskrgr:rollup-r717w0s, r=matthiaskrgr

Browse Source 
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
This commit is contained in:
bors 2024-06-08 17:34:01 +00:00
commit 565cadb514
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/rustc_middle/src/mir/interpret/value.rs
View File

@ -196,6 +196,11 @@ pub fn from_i64(i: i64) -> Self {
Self::from_int(i, Size::from_bits(64)) Self::from_int(i, Size::from_bits(64))
} }
#[inline]
pub fn from_i128(i: i128) -> Self {
Self::from_int(i, Size::from_bits(128))
}
#[inline] #[inline]
pub fn from_target_isize(i: i64, cx: &impl HasDataLayout) -> Self { pub fn from_target_isize(i: i64, cx: &impl HasDataLayout) -> Self {
Self::from_int(i, cx.data_layout().pointer_size) Self::from_int(i, cx.data_layout().pointer_size)

4
config.example.toml
View File

@ -389,8 +389,8 @@
# a Nix toolchain on non-NixOS distributions. # a Nix toolchain on non-NixOS distributions.
#patch-binaries-for-nix = false #patch-binaries-for-nix = false
# Collect information and statistics about the current build and writes it to # Collect information and statistics about the current build, and write it to
# disk. Enabling this or not has no impact on the resulting build output. The # disk. Enabling this has no impact on the resulting build output. The
# schema of the file generated by the build metrics feature is unstable, and # schema of the file generated by the build metrics feature is unstable, and
# this is not intended to be used during local development. # this is not intended to be used during local development.
#metrics = false #metrics = false

7
src/bootstrap/mk/Makefile.in
View File

@ -59,17 +59,18 @@ check-aux:
library/alloc \ library/alloc \
--no-doc --no-doc
# Some doctests have intentional memory leaks. # Some doctests have intentional memory leaks.
# Some use file system operations to demonstrate dealing with `Result`.
$(Q)MIRIFLAGS="-Zmiri-ignore-leaks -Zmiri-disable-isolation" \ $(Q)MIRIFLAGS="-Zmiri-ignore-leaks -Zmiri-disable-isolation" \
$(BOOTSTRAP) miri --stage 2 \ $(BOOTSTRAP) miri --stage 2 \
library/core \ library/core \
library/alloc \ library/alloc \
--doc --doc
# In `std` we cannot test everything. # In `std` we cannot test everything, so we skip some modules.
$(Q)MIRIFLAGS="-Zmiri-disable-isolation" BOOTSTRAP_SKIP_TARGET_SANITY=1 \ $(Q)MIRIFLAGS="-Zmiri-disable-isolation" \
$(BOOTSTRAP) miri --stage 2 library/std \ $(BOOTSTRAP) miri --stage 2 library/std \
--no-doc -- \ --no-doc -- \
--skip fs:: --skip net:: --skip process:: --skip sys::pal:: --skip fs:: --skip net:: --skip process:: --skip sys::pal::
$(Q)MIRIFLAGS="-Zmiri-ignore-leaks -Zmiri-disable-isolation" BOOTSTRAP_SKIP_TARGET_SANITY=1 \ $(Q)MIRIFLAGS="-Zmiri-ignore-leaks -Zmiri-disable-isolation" \
$(BOOTSTRAP) miri --stage 2 library/std \ $(BOOTSTRAP) miri --stage 2 library/std \
--doc -- \ --doc -- \
--skip fs:: --skip net:: --skip process:: --skip sys::pal:: --skip fs:: --skip net:: --skip process:: --skip sys::pal::