1
Fork 0

Rustup to rustc 1.61.0-nightly (03918badd 2022-03-07)

This commit is contained in:
bjorn3 2022-03-08 11:29:17 +01:00
parent 2577efb434
commit 1b75d1146f
2 changed files with 15 additions and 13 deletions

View file

@ -1,30 +1,32 @@
From 0ffdd8eda8df364391c8ac6e1ce92c73ba9254d4 Mon Sep 17 00:00:00 2001 From eb703e627e7a84f1cd8d0d87f0f69da1f0acf765 Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com> From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Fri, 3 Dec 2021 12:16:30 +0100 Date: Fri, 3 Dec 2021 12:16:30 +0100
Subject: [PATCH] Disable long running tests Subject: [PATCH] Disable long running tests
--- ---
library/core/tests/slice.rs | 3 +++ library/core/tests/slice.rs | 2 ++
1 file changed, 3 insertions(+) 1 file changed, 2 insertions(+)
diff --git a/library/core/tests/slice.rs b/library/core/tests/slice.rs diff --git a/library/core/tests/slice.rs b/library/core/tests/slice.rs
index 2c8f00a..44847ee 100644 index 8402833..84592e0 100644
--- a/library/core/tests/slice.rs --- a/library/core/tests/slice.rs
+++ b/library/core/tests/slice.rs +++ b/library/core/tests/slice.rs
@@ -2332,7 +2332,8 @@ macro_rules! empty_max_mut { @@ -2462,6 +2462,7 @@ take_tests! {
}; #[cfg(not(miri))] // unused in Miri
} const EMPTY_MAX: &'static [()] = &[(); usize::MAX];
+/* +/*
#[cfg(not(miri))] // Comparing usize::MAX many elements takes forever in Miri (and in rustc without optimizations) // can't be a constant due to const mutability rules
take_tests! { #[cfg(not(miri))] // unused in Miri
slice: &[(); usize::MAX], method: take, macro_rules! empty_max_mut {
(take_in_bounds_max_range_to, (..usize::MAX), Some(EMPTY_MAX), &[(); 0]), @@ -2485,6 +2486,7 @@ take_tests! {
@@ -2345,3 +2347,4 @@ take_tests! {
(take_mut_oob_max_range_to_inclusive, (..=usize::MAX), None, empty_max_mut!()), (take_mut_oob_max_range_to_inclusive, (..=usize::MAX), None, empty_max_mut!()),
(take_mut_in_bounds_max_range_from, (usize::MAX..), Some(&mut [] as _), empty_max_mut!()), (take_mut_in_bounds_max_range_from, (usize::MAX..), Some(&mut [] as _), empty_max_mut!()),
} }
+*/ +*/
#[test]
fn test_slice_from_ptr_range() {
-- --
2.26.2.7.g19db9cfb68 2.26.2.7.g19db9cfb68

View file

@ -1,3 +1,3 @@
[toolchain] [toolchain]
channel = "nightly-2022-02-23" channel = "nightly-2022-03-08"
components = ["rust-src", "rustc-dev", "llvm-tools-preview"] components = ["rust-src", "rustc-dev", "llvm-tools-preview"]