Merge pull request #60 from RalfJung/rustup

rustup

Author: RalfJung

rust-src.diff

@@ -1,86 +0,0 @@
-diff --git a/library/alloc/benches/lib.rs b/library/alloc/benches/lib.rs
-index 638f343fb24..0561f49c967 100644
---- a/library/alloc/benches/lib.rs
-+++ b/library/alloc/benches/lib.rs
-@@ -1,6 +1,8 @@
- // Disabling on android for the time being
- // See https://github.com/rust-lang/rust/issues/73535#event-3477699747
- #![cfg(not(target_os = "android"))]
-+// Disabling in Miri as these would take too long.
-+#![cfg(not(miri))]
- #![feature(btree_extract_if)]
- #![feature(iter_next_chunk)]
- #![feature(repr_simd)]
-diff --git a/library/alloc/src/sync.rs b/library/alloc/src/sync.rs
-index 4dea27221b7..6ae52cc7827 100644
---- a/library/alloc/src/sync.rs
-+++ b/library/alloc/src/sync.rs
-@@ -1062,7 +1062,9 @@ pub fn try_unwrap(this: Self) -> Result<T, Self> {
-     ///
-     /// // Create a long list and clone it
-     /// let mut x = LinkedList::new();
--    /// for i in 0..100000 {
-+    /// let size = 100000;
-+    /// # let size = if cfg!(miri) { 100 } else { size };
-+    /// for i in 0..size {
-     ///     x.push(i); // Adds i to the front of x
-     /// }
-     /// let y = x.clone();
-diff --git a/library/core/benches/lib.rs b/library/core/benches/lib.rs
-index 4d14b930e41..32d15c386cb 100644
---- a/library/core/benches/lib.rs
-+++ b/library/core/benches/lib.rs
-@@ -1,5 +1,7 @@
- // wasm32 does not support benches (no time).
- #![cfg(not(target_arch = "wasm32"))]
-+// Disabling in Miri as these would take too long.
-+#![cfg(not(miri))]
- #![feature(flt2dec)]
- #![feature(test)]
- #![feature(trusted_random_access)]
-diff --git a/library/std/benches/lib.rs b/library/std/benches/lib.rs
-index 4d1cf7fab7b..1b21c230a0b 100644
---- a/library/std/benches/lib.rs
-+++ b/library/std/benches/lib.rs
-@@ -1,3 +1,5 @@
-+// Disabling in Miri as these would take too long.
-+#![cfg(not(miri))]
- #![feature(test)]
- 
- extern crate test;
-diff --git a/library/std/tests/process_spawning.rs b/library/std/tests/process_spawning.rs
-index 59f67f9901f..2b7997299c5 100644
---- a/library/std/tests/process_spawning.rs
-+++ b/library/std/tests/process_spawning.rs
-@@ -1,4 +1,6 @@
- #![cfg(not(target_env = "sgx"))]
-+// Process spawning does not work in Miri.
-+#![cfg(not(miri))]
- 
- use std::env;
- use std::fs;
-diff --git a/library/std/tests/switch-stdout.rs b/library/std/tests/switch-stdout.rs
-index 27f3e8a9b96..a80f24fcb19 100644
---- a/library/std/tests/switch-stdout.rs
-+++ b/library/std/tests/switch-stdout.rs
-@@ -1,4 +1,6 @@
- #![cfg(any(target_family = "unix", target_family = "windows"))]
-+// Calls functions that are not supported by Miri.
-+#![cfg(not(miri))]
- 
- use std::fs::File;
- use std::io::{Read, Write};
-diff --git a/library/std/tests/thread.rs b/library/std/tests/thread.rs
-index 4ce81f2846e..79a981d0b0d 100644
---- a/library/std/tests/thread.rs
-+++ b/library/std/tests/thread.rs
-@@ -5,7 +5,8 @@
- 
- #[test]
- #[cfg_attr(target_os = "emscripten", ignore)]
--fn sleep() {
-+#[cfg_attr(miri, ignore)] // Miri does not like the thread leak
-+fn sleep_very_long() {
-     let finished = Arc::new(Mutex::new(false));
-     let t_finished = finished.clone();
-     thread::spawn(move || {

rust-version

@@ -1 +1 @@
-nightly-2024-04-06
+nightly-2024-04-09