Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 1b75d11

Browse files
committed
Rustup to rustc 1.61.0-nightly (03918ba 2022-03-07)
1 parent 2577efb commit 1b75d11

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed
Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
1-
From 0ffdd8eda8df364391c8ac6e1ce92c73ba9254d4 Mon Sep 17 00:00:00 2001
1+
From eb703e627e7a84f1cd8d0d87f0f69da1f0acf765 Mon Sep 17 00:00:00 2001
22
From: bjorn3 <[email protected]>
33
Date: Fri, 3 Dec 2021 12:16:30 +0100
44
Subject: [PATCH] Disable long running tests
55

66
---
7-
library/core/tests/slice.rs | 3 +++
8-
1 file changed, 3 insertions(+)
7+
library/core/tests/slice.rs | 2 ++
8+
1 file changed, 2 insertions(+)
99

1010
diff --git a/library/core/tests/slice.rs b/library/core/tests/slice.rs
11-
index 2c8f00a..44847ee 100644
11+
index 8402833..84592e0 100644
1212
--- a/library/core/tests/slice.rs
1313
+++ b/library/core/tests/slice.rs
14-
@@ -2332,7 +2332,8 @@ macro_rules! empty_max_mut {
15-
};
16-
}
14+
@@ -2462,6 +2462,7 @@ take_tests! {
15+
#[cfg(not(miri))] // unused in Miri
16+
const EMPTY_MAX: &'static [()] = &[(); usize::MAX];
1717

1818
+/*
19-
#[cfg(not(miri))] // Comparing usize::MAX many elements takes forever in Miri (and in rustc without optimizations)
20-
take_tests! {
21-
slice: &[(); usize::MAX], method: take,
22-
(take_in_bounds_max_range_to, (..usize::MAX), Some(EMPTY_MAX), &[(); 0]),
23-
@@ -2345,3 +2347,4 @@ take_tests! {
19+
// can't be a constant due to const mutability rules
20+
#[cfg(not(miri))] // unused in Miri
21+
macro_rules! empty_max_mut {
22+
@@ -2485,6 +2486,7 @@ take_tests! {
2423
(take_mut_oob_max_range_to_inclusive, (..=usize::MAX), None, empty_max_mut!()),
2524
(take_mut_in_bounds_max_range_from, (usize::MAX..), Some(&mut [] as _), empty_max_mut!()),
2625
}
2726
+*/
27+
28+
#[test]
29+
fn test_slice_from_ptr_range() {
2830
--
2931
2.26.2.7.g19db9cfb68
3032

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "nightly-2022-02-23"
2+
channel = "nightly-2022-03-08"
33
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]

0 commit comments

Comments
 (0)