-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #92471 - matthiaskrgr:rollup-lmduxwh, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #88310 (Lock bootstrap (x.py) build directory) - #92097 (Implement split_at_spare_mut without Deref to a slice so that the spare slice is valid) - #92412 (Fix double space in pretty printed TryBlock) - #92420 (Fix whitespace in pretty printed PatKind::Range) - #92457 (Sync rustc_codegen_gcc) - #92460 ([rustc_builtin_macros] add indices to format_foreign::printf::Substitution::Escape) - #92469 (Make tidy check for magic numbers that spell things) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
- Loading branch information
Showing
40 changed files
with
368 additions
and
259 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
compiler/rustc_codegen_gcc/patches/0024-core-Disable-portable-simd-test.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| From b1ae000f6da1abd3b8e9b80c40bc11c89b8ae93c Mon Sep 17 00:00:00 2001 | ||
| From: bjorn3 <[email protected]> | ||
| Date: Thu, 30 Dec 2021 16:54:40 +0100 | ||
| Subject: [PATCH] [core] Disable portable-simd test | ||
|
|
||
| --- | ||
| library/core/tests/lib.rs | 1 - | ||
| 1 file changed, 1 deletion(-) | ||
|
|
||
| diff --git a/library/core/tests/lib.rs b/library/core/tests/lib.rs | ||
| index ec70034..7cd9e21 100644 | ||
| --- a/library/core/tests/lib.rs | ||
| +++ b/library/core/tests/lib.rs | ||
| @@ -121,7 +121,6 @@ mod pattern; | ||
| mod pin; | ||
| mod ptr; | ||
| mod result; | ||
| -mod simd; | ||
| mod slice; | ||
| mod str; | ||
| mod str_lossy; | ||
| -- | ||
| 2.26.2.7.g19db9cfb68 | ||
|
|
30 changes: 30 additions & 0 deletions
30
compiler/rustc_codegen_gcc/patches/0028-core-Disable-long-running-tests.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| From 0ffdd8eda8df364391c8ac6e1ce92c73ba9254d4 Mon Sep 17 00:00:00 2001 | ||
| From: bjorn3 <[email protected]> | ||
| Date: Fri, 3 Dec 2021 12:16:30 +0100 | ||
| Subject: [PATCH] Disable long running tests | ||
|
|
||
| --- | ||
| library/core/tests/slice.rs | 3 +++ | ||
| 1 file changed, 3 insertions(+) | ||
|
|
||
| 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,7 +2332,8 @@ macro_rules! empty_max_mut { | ||
| }; | ||
| } | ||
|
|
||
| +/* | ||
| #[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]), | ||
| @@ -2345,3 +2347,4 @@ take_tests! { | ||
| (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!()), | ||
| } | ||
| +*/ | ||
| -- | ||
| 2.26.2.7.g19db9cfb68 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| nightly-2021-09-28 | ||
| nightly-2021-12-30 |
Oops, something went wrong.