Skip to content

Commit 0cb0e43

Browse files
authored
Merge pull request #40 from RalfJung/rustup
rustup
2 parents 0a9a418 + 80bdd12 commit 0cb0e43

File tree

2 files changed

+1
-53
lines changed

2 files changed

+1
-53
lines changed

rust-src.diff

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +0,0 @@
1-
diff --git a/library/portable-simd/crates/core_simd/src/lib.rs b/library/portable-simd/crates/core_simd/src/lib.rs
2-
index 64ba9705ef5..c1f19a6ca98 100644
3-
--- a/library/portable-simd/crates/core_simd/src/lib.rs
4-
+++ b/library/portable-simd/crates/core_simd/src/lib.rs
5-
@@ -1,6 +1,7 @@
6-
#![no_std]
7-
#![feature(
8-
const_refs_to_cell,
9-
+ const_intrinsic_copy,
10-
const_maybe_uninit_as_mut_ptr,
11-
const_mut_refs,
12-
convert_float_to_int,
13-
@@ -11,7 +12,6 @@
14-
repr_simd,
15-
simd_ffi,
16-
staged_api,
17-
- stdsimd,
18-
strict_provenance,
19-
ptr_metadata
20-
)]
21-
diff --git a/library/portable-simd/crates/test_helpers/src/lib.rs b/library/portable-simd/crates/test_helpers/src/lib.rs
22-
index b80c745aaf2..eea9ba5baba 100644
23-
--- a/library/portable-simd/crates/test_helpers/src/lib.rs
24-
+++ b/library/portable-simd/crates/test_helpers/src/lib.rs
25-
@@ -1,4 +1,4 @@
26-
-#![feature(stdsimd, powerpc_target_feature)]
27-
+#![feature(powerpc_target_feature)]
28-
29-
pub mod array;
30-
31-
32-
diff --git a/crates/std_detect/src/lib.rs b/crates/std_detect/src/lib.rs
33-
index 19cc0217..d19128c2 100644
34-
--- a/library/stdarch/crates/std_detect/src/lib.rs
35-
+++ b/library/stdarch/crates/std_detect/src/lib.rs
36-
@@ -20,15 +20,8 @@
37-
#![cfg_attr(test, allow(unused_imports))]
38-
#![no_std]
39-
#![allow(internal_features)]
40-
-// Temporary hack: needed to build against toolchains from before the mass feature renaming.
41-
-// Remove this as soon as the stdarch submodule is updated on nightly.
42-
-#![allow(stable_features)]
43-
-#![cfg_attr(not(feature = "rustc-dep-of-std"), feature(stdsimd))]
44-
#![cfg_attr(
45-
- all(
46-
- any(target_arch = "x86", target_arch = "x86_64"),
47-
- feature = "rustc-dep-of-std"
48-
- ),
49-
+ any(target_arch = "x86", target_arch = "x86_64"),
50-
feature(stdarch_x86_has_cpuid)
51-
)]
52-

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2024-02-10
1+
nightly-2024-02-20

0 commit comments

Comments
 (0)