Skip to content

Commit ea37e80

Browse files
borsbors
committed
Auto merge of #117372 - Amanieu:stdarch_update, r=Mark-Simulacrum
Update stdarch submodule Splits up #27731 into multiple tracking issues. Closes #27731
2 parents 86eaa89 + ab8b661 commit ea37e80

File tree

12 files changed

+105
-32
lines changed

12 files changed

+105
-32
lines changed

‎Cargo.lock

+6-6
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ dependencies = [
3737

3838
[[package]]
3939
name = "ahash"
40-
version = "0.8.6"
40+
version = "0.8.7"
4141
source = "registry+https://github.com/rust-lang/crates.io-index"
42-
checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
42+
checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
4343
dependencies = [
4444
"cfg-if",
4545
"once_cell",
@@ -6406,18 +6406,18 @@ dependencies = [
64066406

64076407
[[package]]
64086408
name = "zerocopy"
6409-
version = "0.7.28"
6409+
version = "0.7.32"
64106410
source = "registry+https://github.com/rust-lang/crates.io-index"
6411-
checksum = "7d6f15f7ade05d2a4935e34a457b936c23dc70a05cc1d97133dc99e7a3fe0f0e"
6411+
checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
64126412
dependencies = [
64136413
"zerocopy-derive",
64146414
]
64156415

64166416
[[package]]
64176417
name = "zerocopy-derive"
6418-
version = "0.7.28"
6418+
version = "0.7.32"
64196419
source = "registry+https://github.com/rust-lang/crates.io-index"
6420-
checksum = "dbbad221e3f78500350ecbd7dfa4e63ef945c05f4c61cb7f4d3f84cd0bba649b"
6420+
checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
64216421
dependencies = [
64226422
"proc-macro2",
64236423
"quote",

‎compiler/rustc_codegen_cranelift/Cargo.lock

+58-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ version = 3
44

55
[[package]]
66
name = "ahash"
7-
version = "0.8.3"
7+
version = "0.8.7"
88
source = "registry+https://github.com/rust-lang/crates.io-index"
9-
checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
9+
checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
1010
dependencies = [
1111
"cfg-if",
1212
"once_cell",
1313
"version_check",
14+
"zerocopy",
1415
]
1516

1617
[[package]]
@@ -293,6 +294,24 @@ version = "1.18.0"
293294
source = "registry+https://github.com/rust-lang/crates.io-index"
294295
checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
295296

297+
[[package]]
298+
name = "proc-macro2"
299+
version = "1.0.75"
300+
source = "registry+https://github.com/rust-lang/crates.io-index"
301+
checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
302+
dependencies = [
303+
"unicode-ident",
304+
]
305+
306+
[[package]]
307+
name = "quote"
308+
version = "1.0.35"
309+
source = "registry+https://github.com/rust-lang/crates.io-index"
310+
checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
311+
dependencies = [
312+
"proc-macro2",
313+
]
314+
296315
[[package]]
297316
name = "regalloc2"
298317
version = "0.9.3"
@@ -360,12 +379,29 @@ version = "1.2.0"
360379
source = "registry+https://github.com/rust-lang/crates.io-index"
361380
checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
362381

382+
[[package]]
383+
name = "syn"
384+
version = "2.0.47"
385+
source = "registry+https://github.com/rust-lang/crates.io-index"
386+
checksum = "1726efe18f42ae774cc644f330953a5e7b3c3003d3edcecf18850fe9d4dd9afb"
387+
dependencies = [
388+
"proc-macro2",
389+
"quote",
390+
"unicode-ident",
391+
]
392+
363393
[[package]]
364394
name = "target-lexicon"
365395
version = "0.12.12"
366396
source = "registry+https://github.com/rust-lang/crates.io-index"
367397
checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a"
368398

399+
[[package]]
400+
name = "unicode-ident"
401+
version = "1.0.12"
402+
source = "registry+https://github.com/rust-lang/crates.io-index"
403+
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
404+
369405
[[package]]
370406
name = "version_check"
371407
version = "0.9.4"
@@ -536,3 +572,23 @@ name = "windows_x86_64_msvc"
536572
version = "0.52.0"
537573
source = "registry+https://github.com/rust-lang/crates.io-index"
538574
checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
575+
576+
[[package]]
577+
name = "zerocopy"
578+
version = "0.7.32"
579+
source = "registry+https://github.com/rust-lang/crates.io-index"
580+
checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
581+
dependencies = [
582+
"zerocopy-derive",
583+
]
584+
585+
[[package]]
586+
name = "zerocopy-derive"
587+
version = "0.7.32"
588+
source = "registry+https://github.com/rust-lang/crates.io-index"
589+
checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
590+
dependencies = [
591+
"proc-macro2",
592+
"quote",
593+
"syn",
594+
]

‎library/core/src/lib.rs

-4
Original file line numberDiff line numberDiff line change
@@ -428,10 +428,6 @@ pub mod primitive;
428428
deprecated_in_future
429429
)]
430430
#[allow(rustdoc::bare_urls)]
431-
// FIXME: This annotation should be moved into rust-lang/stdarch after clashing_extern_declarations is
432-
// merged. It currently cannot because bootstrap fails as the lint hasn't been defined yet.
433-
#[allow(clashing_extern_declarations)]
434-
#[unstable(feature = "stdsimd", issue = "48556")]
435431
mod core_arch;
436432

437433
#[stable(feature = "simd_arch", since = "1.27.0")]

‎library/portable-simd/crates/core_simd/src/vendor/arm.rs

+6-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@ use core::arch::arm::*;
77
#[cfg(target_arch = "aarch64")]
88
use core::arch::aarch64::*;
99

10-
#[cfg(any(
11-
target_arch = "aarch64",
12-
all(target_arch = "arm", target_feature = "v7"),
10+
#[cfg(all(
11+
any(
12+
target_arch = "aarch64",
13+
all(target_arch = "arm", target_feature = "v7"),
14+
),
15+
target_endian = "little"
1316
))]
1417
mod neon {
1518
use super::*;

‎library/std/src/lib.rs

+14-6
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@
262262
)]
263263
#![cfg_attr(any(windows, target_os = "uefi"), feature(round_char_boundary))]
264264
#![cfg_attr(target_os = "xous", feature(slice_ptr_len))]
265+
#![cfg_attr(target_family = "wasm", feature(stdarch_wasm_atomic_wait))]
265266
//
266267
// Language features:
267268
// tidy-alphabetical-start
@@ -364,6 +365,11 @@
364365
#![feature(panic_unwind)]
365366
// tidy-alphabetical-end
366367
//
368+
// Library features (std_detect):
369+
// tidy-alphabetical-start
370+
#![feature(stdarch_internal)]
371+
// tidy-alphabetical-end
372+
//
367373
// Only for re-exporting:
368374
// tidy-alphabetical-start
369375
#![feature(assert_matches)]
@@ -379,7 +385,6 @@
379385
#![feature(get_many_mut)]
380386
#![feature(lazy_cell)]
381387
#![feature(log_syntax)]
382-
#![feature(stdsimd)]
383388
#![feature(test)]
384389
#![feature(trace_macros)]
385390
// tidy-alphabetical-end
@@ -618,13 +623,16 @@ pub mod arch {
618623

619624
#[stable(feature = "simd_aarch64", since = "1.60.0")]
620625
pub use std_detect::is_aarch64_feature_detected;
626+
#[unstable(feature = "stdarch_arm_feature_detection", issue = "111190")]
627+
pub use std_detect::is_arm_feature_detected;
628+
#[unstable(feature = "is_riscv_feature_detected", issue = "111192")]
629+
pub use std_detect::is_riscv_feature_detected;
621630
#[stable(feature = "simd_x86", since = "1.27.0")]
622631
pub use std_detect::is_x86_feature_detected;
623-
#[unstable(feature = "stdsimd", issue = "48556")]
624-
pub use std_detect::{
625-
is_arm_feature_detected, is_mips64_feature_detected, is_mips_feature_detected,
626-
is_powerpc64_feature_detected, is_powerpc_feature_detected, is_riscv_feature_detected,
627-
};
632+
#[unstable(feature = "stdarch_mips_feature_detection", issue = "111188")]
633+
pub use std_detect::{is_mips64_feature_detected, is_mips_feature_detected};
634+
#[unstable(feature = "stdarch_powerpc_feature_detection", issue = "111191")]
635+
pub use std_detect::{is_powerpc64_feature_detected, is_powerpc_feature_detected};
628636
}
629637

630638
// This was stabilized in the crate root so we have to keep it there.

‎library/std/tests/run-time-detect.rs

+10-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
//! These tests just check that the macros are available in std.
22
33
#![cfg_attr(
4-
any(
5-
all(target_arch = "arm", any(target_os = "linux", target_os = "android")),
6-
all(target_arch = "powerpc", target_os = "linux"),
7-
all(target_arch = "powerpc64", target_os = "linux"),
8-
),
9-
feature(stdsimd)
4+
all(target_arch = "arm", any(target_os = "linux", target_os = "android")),
5+
feature(stdarch_arm_feature_detection)
6+
)]
7+
#![cfg_attr(
8+
all(target_arch = "powerpc", target_os = "linux"),
9+
feature(stdarch_powerpc_feature_detection)
10+
)]
11+
#![cfg_attr(
12+
all(target_arch = "powerpc64", target_os = "linux"),
13+
feature(stdarch_powerpc_feature_detection)
1014
)]
1115

1216
#[test]

‎library/stdarch

Submodule stdarch updated 119 files

‎src/tools/miri/tests/pass/intrinsics-x86-aes-vaes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//@ignore-target-wasm32
1010
//@compile-flags: -C target-feature=+aes,+vaes,+avx512f
1111

12-
#![feature(avx512_target_feature, stdsimd)]
12+
#![feature(avx512_target_feature, stdarch_x86_avx512)]
1313

1414
use core::mem::transmute;
1515
#[cfg(target_arch = "x86")]

‎src/tools/miri/tests/pass/intrinsics-x86-avx512.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//@compile-flags: -C target-feature=+avx512f,+avx512vl,+avx512bitalg,+avx512vpopcntdq
1111

1212
#![feature(avx512_target_feature)]
13-
#![feature(stdsimd)]
13+
#![feature(stdarch_x86_avx512)]
1414

1515
#[cfg(target_arch = "x86")]
1616
use std::arch::x86::*;

‎src/tools/tidy/src/deps.rs

+6
Original file line numberDiff line numberDiff line change
@@ -459,13 +459,17 @@ const PERMITTED_CRANELIFT_DEPENDENCIES: &[&str] = &[
459459
"mach",
460460
"memchr",
461461
"object",
462+
"proc-macro2",
463+
"quote",
462464
"regalloc2",
463465
"region",
464466
"rustc-hash",
465467
"slice-group-by",
466468
"smallvec",
467469
"stable_deref_trait",
470+
"syn",
468471
"target-lexicon",
472+
"unicode-ident",
469473
"version_check",
470474
"wasmtime-jit-icache-coherence",
471475
"winapi",
@@ -480,6 +484,8 @@ const PERMITTED_CRANELIFT_DEPENDENCIES: &[&str] = &[
480484
"windows_x86_64_gnu",
481485
"windows_x86_64_gnullvm",
482486
"windows_x86_64_msvc",
487+
"zerocopy",
488+
"zerocopy-derive",
483489
// tidy-alphabetical-end
484490
];
485491

‎tests/ui/asm/aarch64/type-check-3.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// only-aarch64
22
// compile-flags: -C target-feature=+neon
33

4-
#![feature(repr_simd, stdsimd, asm_const)]
4+
#![feature(repr_simd, asm_const)]
55

66
use std::arch::aarch64::float64x2_t;
77
use std::arch::{asm, global_asm};

‎tests/ui/asm/aarch64/type-check-4.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// only-aarch64
22
// compile-flags: -C target-feature=+neon
33

4-
#![feature(repr_simd, stdsimd, asm_const)]
4+
#![feature(repr_simd, asm_const)]
55

66
use std::arch::aarch64::float64x2_t;
77
use std::arch::{asm, global_asm};

0 commit comments

Comments
 (0)