diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2021-12-07 18:22:44 +0100 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2021-12-07 18:22:44 +0100 |
| commit | ff0b8347cade9a1e0ce5edd9d7fb492926fdcdb3 (patch) | |
| tree | 44c0af3ffb98752d72b347a5847e8e077d9c8623 | |
| parent | 7d34d3ad78ca3db6197eee8d4f5d9e7b8876ff20 (diff) | |
| download | rust-ff0b8347cade9a1e0ce5edd9d7fb492926fdcdb3.tar.gz rust-ff0b8347cade9a1e0ce5edd9d7fb492926fdcdb3.zip | |
Rustup to rustc 1.59.0-nightly (0fb1c371d 2021-12-06)
| -rw-r--r-- | patches/0028-sysroot-Disable-long-running-tests.patch | 4 | ||||
| -rw-r--r-- | rust-toolchain | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/patches/0028-sysroot-Disable-long-running-tests.patch b/patches/0028-sysroot-Disable-long-running-tests.patch index f09d4b47e43..bf74a74c7c4 100644 --- a/patches/0028-sysroot-Disable-long-running-tests.patch +++ b/patches/0028-sysroot-Disable-long-running-tests.patch @@ -11,12 +11,12 @@ diff --git a/library/core/tests/slice.rs b/library/core/tests/slice.rs index 2c8f00a..44847ee 100644 --- a/library/core/tests/slice.rs +++ b/library/core/tests/slice.rs -@@ -2332,6 +2332,8 @@ macro_rules! empty_max_mut { +@@ -2332,7 +2332,8 @@ macro_rules! empty_max_mut { }; } -+// These tests take way too long without optimizations +/* + #[cfg(not(miri))] // Comparing usize::MAX many elements takes forever in Miri (and in rustc without optimizations) take_tests! { slice: &[(); usize::MAX], method: take, (take_in_bounds_max_range_to, (..usize::MAX), Some(EMPTY_MAX), &[(); 0]), diff --git a/rust-toolchain b/rust-toolchain index f4f8fafa5be..d85e5a0cbfa 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2021-12-02" +channel = "nightly-2021-12-07" components = ["rust-src", "rustc-dev", "llvm-tools-preview"] |