about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbjorn3 <17426603+bjorn3@users.noreply.github.com>2024-01-26 18:08:00 +0000
committerbjorn3 <17426603+bjorn3@users.noreply.github.com>2024-01-26 18:08:00 +0000
commitf78617994aa921869858ec78ceb70b5d5078ada5 (patch)
tree43c3e4a809f3c3719e04a93a42b2bccacf2a25af
parent604c8a7cf80eca33bd078d6b45faaa808ef9ecd8 (diff)
downloadrust-f78617994aa921869858ec78ceb70b5d5078ada5.tar.gz
rust-f78617994aa921869858ec78ceb70b5d5078ada5.zip
Update rand test
This contains a fix for a recently introduced warning.
-rw-r--r--build_system/tests.rs4
-rw-r--r--patches/0001-rand-Allow-warnings.patch24
-rw-r--r--patches/rand-lock.toml23
3 files changed, 25 insertions, 26 deletions
diff --git a/build_system/tests.rs b/build_system/tests.rs
index 20f6d70a58b..818f3d6f08d 100644
--- a/build_system/tests.rs
+++ b/build_system/tests.rs
@@ -113,8 +113,8 @@ const BASE_SYSROOT_SUITE: &[TestCase] = &[
 pub(crate) static RAND_REPO: GitRepo = GitRepo::github(
     "rust-random",
     "rand",
-    "9a02c819cc1e4ec6959ae25eafbb5cf6acb68234",
-    "4934f0afb1d1c2ca",
+    "1f4507a8e1cf8050e4ceef95eeda8f64645b6719",
+    "981f8bf489338978",
     "rand",
 );
 
diff --git a/patches/0001-rand-Allow-warnings.patch b/patches/0001-rand-Allow-warnings.patch
deleted file mode 100644
index ae46e957efa..00000000000
--- a/patches/0001-rand-Allow-warnings.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 8330c138c91f71ad43b38c026ee14b154f34a1b8 Mon Sep 17 00:00:00 2001
-From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
-Date: Sun, 21 Jan 2024 11:12:19 +0000
-Subject: [PATCH] Allow warnings
-
----
- rand_core/src/lib.rs | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/rand_core/src/lib.rs b/rand_core/src/lib.rs
-index a5a7fb1..6c84068 100644
---- a/rand_core/src/lib.rs
-+++ b/rand_core/src/lib.rs
-@@ -34,7 +34,6 @@
- )]
- #![deny(missing_docs)]
- #![deny(missing_debug_implementations)]
--#![doc(test(attr(allow(unused_variables), deny(warnings))))]
- #![cfg_attr(doc_cfg, feature(doc_cfg))]
- #![no_std]
- 
--- 
-2.34.1
-
diff --git a/patches/rand-lock.toml b/patches/rand-lock.toml
index aacf3653c16..815b828a68b 100644
--- a/patches/rand-lock.toml
+++ b/patches/rand-lock.toml
@@ -487,6 +487,7 @@ dependencies = [
  "rand_pcg",
  "rayon",
  "serde",
+ "zerocopy",
 ]
 
 [[package]]
@@ -505,6 +506,7 @@ version = "0.7.0"
 dependencies = [
  "getrandom",
  "serde",
+ "zerocopy",
 ]
 
 [[package]]
@@ -525,6 +527,7 @@ name = "rand_pcg"
 version = "0.4.0"
 dependencies = [
  "bincode",
+ "rand",
  "rand_core",
  "serde",
 ]
@@ -823,3 +826,23 @@ name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "zerocopy"
+version = "0.7.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]