Skip to content

attempt a different patch for stdarch #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RalfJung merged 1 commit into from
Feb 10, 2024
Merged

attempt a different patch for stdarch #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions rust-src.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,20 @@ diff --git a/crates/std_detect/src/lib.rs b/crates/std_detect/src/lib.rs
index 19cc0217..d19128c2 100644
--- a/library/stdarch/crates/std_detect/src/lib.rs
+++ b/library/stdarch/crates/std_detect/src/lib.rs
@@ -23,7 +23,7 @@
// Temporary hack: needed to build against toolchains from before the mass feature renaming.
// Remove this as soon as the stdarch submodule is updated on nightly.
#![allow(stable_features)]
@@ -20,15 +20,8 @@
#![cfg_attr(test, allow(unused_imports))]
#![no_std]
#![allow(internal_features)]
-// Temporary hack: needed to build against toolchains from before the mass feature renaming.
-// Remove this as soon as the stdarch submodule is updated on nightly.
-#![allow(stable_features)]
-#![cfg_attr(not(feature = "rustc-dep-of-std"), feature(stdsimd))]
+#![cfg_attr(not(feature = "rustc-dep-of-std"), feature(stdarch_internal))]
#![cfg_attr(
all(
any(target_arch = "x86", target_arch = "x86_64"),
- all(
- any(target_arch = "x86", target_arch = "x86_64"),
- feature = "rustc-dep-of-std"
- ),
+ any(target_arch = "x86", target_arch = "x86_64"),
feature(stdarch_x86_has_cpuid)
)]