Skip to content

Commit 4d8b25c

Browse files
committed
Update patch disabling portable-simd
1 parent 0e8e60c commit 4d8b25c

File tree

7 files changed

+24
-16
lines changed

7 files changed

+24
-16
lines changed

.github/workflows/ci.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ jobs:
9999
- name: Build
100100
run: |
101101
./y.sh prepare --only-libcore
102-
./y.sh build
102+
# TODO: remove --features master when it is back to the default.
103+
./y.sh build --features master
103104
cargo test
104105
./clean_all.sh
105106
@@ -121,7 +122,8 @@ jobs:
121122

122123
- name: Run tests
123124
run: |
124-
./test.sh --release --clean --build-sysroot ${{ matrix.commands }}
125+
# TODO: remove --features master when it is back to the default.
126+
./test.sh --features master --release --clean --build-sysroot ${{ matrix.commands }}
125127
126128
duplicates:
127129
runs-on: ubuntu-latest

.github/workflows/failures.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -125,5 +125,6 @@ jobs:
125125
- name: Run tests
126126
id: tests
127127
run: |
128-
${{ matrix.libgccjit_version.env_extra }} ./test.sh --release --clean --build-sysroot --test-failing-rustc ${{ matrix.libgccjit_version.extra }} | tee output_log
128+
# TODO: remove --features master when it is back to the default.
129+
${{ matrix.libgccjit_version.env_extra }} ./test.sh --release --features master --clean --build-sysroot --test-failing-rustc ${{ matrix.libgccjit_version.extra }} | tee output_log
129130
rg --text "test result" output_log >> $GITHUB_STEP_SUMMARY

.github/workflows/m68k.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ jobs:
114114
- name: Build
115115
run: |
116116
./y.sh prepare --only-libcore --cross
117-
./y.sh build --target-triple m68k-unknown-linux-gnu
117+
# TODO: remove --features master when it is back to the default.
118+
./y.sh build --target-triple m68k-unknown-linux-gnu --features master
118119
CG_GCC_TEST_TARGET=m68k-unknown-linux-gnu cargo test
119120
./clean_all.sh
120121
@@ -136,4 +137,5 @@ jobs:
136137

137138
- name: Run tests
138139
run: |
139-
./test.sh --release --clean --build-sysroot ${{ matrix.commands }}
140+
# TODO: remove --features master when it is back to the default.
141+
./test.sh --release --features master --clean --build-sysroot ${{ matrix.commands }}

.github/workflows/release.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ jobs:
7878
- name: Build
7979
run: |
8080
./y.sh prepare --only-libcore
81-
EMBED_LTO_BITCODE=1 ./y.sh build --release --release-sysroot
81+
# TODO: remove --features master when it is back to the default.
82+
EMBED_LTO_BITCODE=1 ./y.sh build --release --release-sysroot --features master
8283
cargo test
8384
./clean_all.sh
8485
@@ -102,4 +103,5 @@ jobs:
102103

103104
- name: Run tests
104105
run: |
105-
EMBED_LTO_BITCODE=1 ./test.sh --release --clean --release-sysroot --build-sysroot ${{ matrix.commands }}
106+
# TODO: remove --features master when it is back to the default.
107+
EMBED_LTO_BITCODE=1 ./test.sh --release --clean --release-sysroot --build-sysroot ${{ matrix.commands }} --features master

.github/workflows/stdarch.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ jobs:
9292
- name: Build
9393
run: |
9494
./y.sh prepare --only-libcore
95-
./y.sh build --release --release-sysroot
95+
# TODO: remove --features master when it is back to the default.
96+
./y.sh build --release --release-sysroot --features master
9697
cargo test
9798
9899
- name: Clean
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
From 7bcd24ec6d4a96121874cb1ae5a23ea274aeff34 Mon Sep 17 00:00:00 2001
1+
From a5663265f797a43c502915c356fe7899c16cee92 Mon Sep 17 00:00:00 2001
22
From: None <[email protected]>
3-
Date: Thu, 19 Oct 2023 13:12:51 -0400
3+
Date: Sat, 18 Nov 2023 10:50:36 -0500
44
Subject: [PATCH] [core] Disable portable-simd test
55

66
---
77
library/core/tests/lib.rs | 2 --
88
1 file changed, 2 deletions(-)
99

1010
diff --git a/library/core/tests/lib.rs b/library/core/tests/lib.rs
11-
index 5814ed4..194ad4c 100644
11+
index d0a119c..76fdece 100644
1212
--- a/library/core/tests/lib.rs
1313
+++ b/library/core/tests/lib.rs
14-
@@ -90,7 +90,6 @@
14+
@@ -89,7 +89,6 @@
15+
#![feature(never_type)]
1516
#![feature(unwrap_infallible)]
16-
#![feature(pointer_byte_offsets)]
1717
#![feature(pointer_is_aligned)]
1818
-#![feature(portable_simd)]
1919
#![feature(ptr_metadata)]
2020
#![feature(lazy_cell)]
2121
#![feature(unsized_tuple_coercion)]
22-
@@ -157,7 +156,6 @@ mod pin;
22+
@@ -155,7 +154,6 @@ mod pin;
2323
mod pin_macro;
2424
mod ptr;
2525
mod result;
@@ -28,5 +28,5 @@ index 5814ed4..194ad4c 100644
2828
mod str;
2929
mod str_lossy;
3030
--
31-
2.42.0
31+
2.42.1
3232

rust-toolchain

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "nightly-2023-10-21"
2+
channel = "nightly-2023-11-17"
33
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]

0 commit comments

Comments
 (0)