give up on std strict provenance for now

Author: RalfJung

ci-test.sh

@@ -60,15 +60,17 @@ std)
     # These are the most OS-specific (among the modules we do not skip).
     CORE="time:: sync:: thread:: env::"
 
+    # FIXME: strict provenance should be possible, but needs
+    # <https://github.com/rust-lang/rust/pull/104658> and a getrandom bump.
     for TARGET in x86_64-unknown-linux-gnu aarch64-apple-darwin; do
-        echo "::group::Testing std core ($CORE on $TARGET, strict provenance)"
-        MIRIFLAGS="$DEFAULTFLAGS -Zmiri-disable-isolation -Zmiri-strict-provenance" \
+        echo "::group::Testing std core ($CORE on $TARGET)"
+        MIRIFLAGS="$DEFAULTFLAGS -Zmiri-disable-isolation" \
             ./run-test.sh std --target $TARGET --lib --tests \
             -- $CORE \
             2>&1 | ts -i '%.s  '
         echo "::endgroup::"
-        echo "::group::Testing std core docs ($CORE on $TARGET, strict provenance)"
-        MIRIFLAGS="$DEFAULTFLAGS -Zmiri-ignore-leaks -Zmiri-disable-isolation -Zmiri-strict-provenance" \
+        echo "::group::Testing std core docs ($CORE on $TARGET)"
+        MIRIFLAGS="$DEFAULTFLAGS -Zmiri-ignore-leaks -Zmiri-disable-isolation" \
             ./run-test.sh std --target $TARGET --doc \
             -- $CORE \
             2>&1 | ts -i '%.s  '

rust-src.diff

@@ -1,143 +0,0 @@
-diff --git a/library/alloc/Cargo.toml b/library/alloc/Cargo.toml
-index 265020209eb..86e12f323d8 100644
---- a/library/alloc/Cargo.toml
-+++ b/library/alloc/Cargo.toml
-@@ -13,8 +13,8 @@ core = { path = "../core" }
- compiler_builtins = { version = "0.1.40", features = ['rustc-dep-of-std'] }
- 
- [dev-dependencies]
--rand = "0.7"
--rand_xorshift = "0.2"
-+rand = "0.8"
-+rand_xorshift = "0.3"
- 
- [[test]]
- name = "collectionstests"
-diff --git a/library/alloc/benches/slice.rs b/library/alloc/benches/slice.rs
-index bd6f38f2f10..ed586492663 100644
---- a/library/alloc/benches/slice.rs
-+++ b/library/alloc/benches/slice.rs
-@@ -1,6 +1,6 @@
- use std::{mem, ptr};
- 
--use rand::distributions::{Alphanumeric, Standard};
-+use rand::distributions::{Alphanumeric, Standard, DistString};
- use rand::Rng;
- use test::{black_box, Bencher};
- 
-@@ -218,7 +218,7 @@ fn gen_strings(len: usize) -> Vec<String> {
-     let mut v = vec![];
-     for _ in 0..len {
-         let n = rng.gen::<usize>() % 20 + 1;
--        v.push((&mut rng).sample_iter(&Alphanumeric).take(n).collect());
-+        v.push(Alphanumeric.sample_string(&mut rng, n));
-     }
-     v
- }
-diff --git a/library/alloc/tests/slice.rs b/library/alloc/tests/slice.rs
-index 21f894343be..a7bdf08055c 100644
---- a/library/alloc/tests/slice.rs
-+++ b/library/alloc/tests/slice.rs
-@@ -396,8 +396,11 @@ fn test_sort() {
-     for len in (2..25).chain(500..510) {
-         for &modulus in &[5, 10, 100, 1000] {
-             for _ in 0..10 {
--                let orig: Vec<_> =
--                    rng.sample_iter::<i32, _>(&Standard).map(|x| x % modulus).take(len).collect();
-+                let orig: Vec<_> = (&mut rng)
-+                    .sample_iter::<i32, _>(&Standard)
-+                    .map(|x| x % modulus)
-+                    .take(len)
-+                    .collect();
- 
-                 // Sort in default order.
-                 let mut v = orig.clone();
-diff --git a/library/core/Cargo.toml b/library/core/Cargo.toml
-index 2a7df9556cf..f636ac97dae 100644
---- a/library/core/Cargo.toml
-+++ b/library/core/Cargo.toml
-@@ -24,8 +24,8 @@ path = "benches/lib.rs"
- test = true
- 
- [dev-dependencies]
--rand = "0.7"
--rand_xorshift = "0.2"
-+rand = "0.8"
-+rand_xorshift = "0.3"
- 
- [features]
- # Make panics and failed asserts immediately abort without formatting any message
-diff --git a/library/core/benches/num/int_log/mod.rs b/library/core/benches/num/int_log/mod.rs
-index 3c01e2998cd..bb61224b5ba 100644
---- a/library/core/benches/num/int_log/mod.rs
-+++ b/library/core/benches/num/int_log/mod.rs
-@@ -21,7 +21,7 @@ fn $random(bench: &mut Bencher) {
-             /* Exponentially distributed random numbers from the whole range of the type.  */
-             let numbers: Vec<$t> = (0..256)
-                 .map(|_| {
--                    let x = rng.gen::<$t>() >> rng.gen_range(0, <$t>::BITS);
-+                    let x = rng.gen::<$t>() >> rng.gen_range(0..<$t>::BITS);
-                     if x != 0 { x } else { 1 }
-                 })
-                 .collect();
-@@ -38,7 +38,7 @@ fn $random_small(bench: &mut Bencher) {
-             /* Exponentially distributed random numbers from the range 0..256.  */
-             let numbers: Vec<$t> = (0..256)
-                 .map(|_| {
--                    let x = (rng.gen::<u8>() >> rng.gen_range(0, u8::BITS)) as $t;
-+                    let x = (rng.gen::<u8>() >> rng.gen_range(0..u8::BITS)) as $t;
-                     if x != 0 { x } else { 1 }
-                 })
-                 .collect();
-diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml
-index c10bfde4ddf..e727d3d57af 100644
---- a/library/std/Cargo.toml
-+++ b/library/std/Cargo.toml
-@@ -33,7 +33,7 @@ default-features = false
- features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive']
- 
- [dev-dependencies]
--rand = "0.7"
-+rand = "0.8"
- 
- [target.'cfg(any(all(target_family = "wasm", not(target_os = "emscripten")), all(target_vendor = "fortanix", target_env = "sgx")))'.dependencies]
- dlmalloc = { version = "0.2.3", features = ['rustc-dep-of-std'] }
-diff --git a/library/std/src/collections/hash/map/tests.rs b/library/std/src/collections/hash/map/tests.rs
-index 65634f2063f..d68eb31268b 100644
---- a/library/std/src/collections/hash/map/tests.rs
-+++ b/library/std/src/collections/hash/map/tests.rs
-@@ -714,12 +714,12 @@ fn check(m: &HashMap<i32, ()>) {
- 
-     // Populate the map with some items.
-     for _ in 0..50 {
--        let x = rng.gen_range(-10, 10);
-+        let x = rng.gen_range(-10..10);
-         m.insert(x, ());
-     }
- 
-     for _ in 0..1000 {
--        let x = rng.gen_range(-10, 10);
-+        let x = rng.gen_range(-10..10);
-         match m.entry(x) {
-             Vacant(_) => {}
-             Occupied(e) => {
-diff --git a/library/std/tests/env.rs b/library/std/tests/env.rs
-index b095c2dde62..c6667712c86 100644
---- a/library/std/tests/env.rs
-+++ b/library/std/tests/env.rs
-@@ -1,12 +1,11 @@
- use std::env::*;
- use std::ffi::{OsStr, OsString};
- 
--use rand::distributions::Alphanumeric;
--use rand::{thread_rng, Rng};
-+use rand::distributions::{Alphanumeric, DistString};
-+use rand::thread_rng;
- 
- fn make_rand_name() -> OsString {
--    let rng = thread_rng();
--    let n = format!("TEST{}", rng.sample_iter(&Alphanumeric).take(10).collect::<String>());
-+    let n = format!("TEST{}", Alphanumeric.sample_string(&mut thread_rng(), 10));
-     let n = OsString::from(n);
-     assert!(var_os(&n).is_none());
-     n