From 4a33460c24c7f3789e493a77ad544fac10562953 Mon Sep 17 00:00:00 2001
From: Florian Bartels <Florian.Bartels@elektrobit.com>
Date: Wed, 9 Nov 2022 10:21:00 +0100
Subject: [PATCH] Upgrade `rand` to v0.8

This allows using a more modern `getrandom` for tier3 targets.
---
 Cargo.lock                                    | 2 +-
 library/std/Cargo.toml                        | 2 +-
 library/std/src/collections/hash/map/tests.rs | 4 ++--
 library/std/tests/env.rs                      | 5 ++++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 544cb4faef222..4f21dd5838ad0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4687,7 +4687,7 @@ dependencies = [
  "panic_abort",
  "panic_unwind",
  "profiler_builtins",
- "rand 0.7.3",
+ "rand 0.8.5",
  "rustc-demangle",
  "std_detect",
  "unwind",
diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml
index daa6976c30143..5cc7bc57f4cf7 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 65634f2063f36..d68eb31268bc7 100644
--- a/library/std/src/collections/hash/map/tests.rs
+++ b/library/std/src/collections/hash/map/tests.rs
@@ -714,12 +714,12 @@ fn test_entry_take_doesnt_corrupt() {
 
     // 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 b095c2dde6285..c3d7decb1b777 100644
--- a/library/std/tests/env.rs
+++ b/library/std/tests/env.rs
@@ -6,7 +6,10 @@ use rand::{thread_rng, 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{}",
+        rng.sample_iter(&Alphanumeric).take(10).map(char::from).collect::<String>()
+    );
     let n = OsString::from(n);
     assert!(var_os(&n).is_none());
     n