Skip to content

Commit e11af1c

Browse files
authored
Merge pull request #1954 from rust-lang/rustc-pull
Rustc pull update
2 parents 09a537e + d719fd9 commit e11af1c

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

crates/core_arch/src/lib.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
arm_target_feature,
2323
mips_target_feature,
2424
powerpc_target_feature,
25-
s390x_target_feature,
2625
loongarch_target_feature,
2726
wasm_target_feature,
2827
abi_unadjusted,
@@ -65,11 +64,7 @@
6564
)]
6665
#![cfg_attr(
6766
test,
68-
feature(
69-
stdarch_arm_feature_detection,
70-
stdarch_powerpc_feature_detection,
71-
stdarch_s390x_feature_detection
72-
)
67+
feature(stdarch_arm_feature_detection, stdarch_powerpc_feature_detection,)
7368
)]
7469

7570
#[cfg(test)]

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
73e6c9ebd9123154a196300ef58e30ec8928e74e
1+
8401398e1f14a24670ee1a3203713dc2f0f8b3a8

0 commit comments

Comments
 (0)