mirror of https://github.com/rust-lang/rust.git
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
This commit is contained in:
commit
565cadb514
|
@ -196,6 +196,11 @@ impl<Prov> Scalar<Prov> {
|
|||
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]
|
||||
pub fn from_target_isize(i: i64, cx: &impl HasDataLayout) -> Self {
|
||||
Self::from_int(i, cx.data_layout().pointer_size)
|
||||
|
|
|
@ -389,8 +389,8 @@
|
|||
# a Nix toolchain on non-NixOS distributions.
|
||||
#patch-binaries-for-nix = false
|
||||
|
||||
# Collect information and statistics about the current build and writes it to
|
||||
# disk. Enabling this or not has no impact on the resulting build output. The
|
||||
# Collect information and statistics about the current build, and write it to
|
||||
# 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
|
||||
# this is not intended to be used during local development.
|
||||
#metrics = false
|
||||
|
|
|
@ -59,17 +59,18 @@ check-aux:
|
|||
library/alloc \
|
||||
--no-doc
|
||||
# Some doctests have intentional memory leaks.
|
||||
# Some use file system operations to demonstrate dealing with `Result`.
|
||||
$(Q)MIRIFLAGS="-Zmiri-ignore-leaks -Zmiri-disable-isolation" \
|
||||
$(BOOTSTRAP) miri --stage 2 \
|
||||
library/core \
|
||||
library/alloc \
|
||||
--doc
|
||||
# In `std` we cannot test everything.
|
||||
$(Q)MIRIFLAGS="-Zmiri-disable-isolation" BOOTSTRAP_SKIP_TARGET_SANITY=1 \
|
||||
# In `std` we cannot test everything, so we skip some modules.
|
||||
$(Q)MIRIFLAGS="-Zmiri-disable-isolation" \
|
||||
$(BOOTSTRAP) miri --stage 2 library/std \
|
||||
--no-doc -- \
|
||||
--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 \
|
||||
--doc -- \
|
||||
--skip fs:: --skip net:: --skip process:: --skip sys::pal::
|
||||
|
|
Loading…
Reference in New Issue