diff options
| author | bors <bors@rust-lang.org> | 2024-06-08 17:34:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-06-08 17:34:01 +0000 |
| commit | 565cadb514d35e7b851540edbc172af0f606014f (patch) | |
| tree | 2dd9a7501fbab3909a0eaccaf7c81d662820be78 /src | |
| parent | cfdb6175c2286acdd0c7d71a2ac9eefb777eec09 (diff) | |
| parent | 7fd9b1ffd4d993826aa0580973aa9957855198ab (diff) | |
| download | rust-565cadb514d35e7b851540edbc172af0f606014f.tar.gz rust-565cadb514d35e7b851540edbc172af0f606014f.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/mk/Makefile.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in index fc433bc5843..cab37e0da47 100644 --- a/src/bootstrap/mk/Makefile.in +++ b/src/bootstrap/mk/Makefile.in @@ -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:: |