Skip to content
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.

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

Specialize sleep_until implementation #118480

Open
wants to merge 19 commits into
base: master
Choose a base branch
from

Conversation

dvdsk
Copy link
Contributor

@dvdsk dvdsk commented Nov 30, 2023

Draft (I need the CI tests, which will probably fail)
related tracking issue: #113752

Replaces the generic catch all implementation with target_os specific ones for: linux/netbsd/freebsd/android/solaris/illumos, wasi, macos/ios/tvos/watchos and windows.

Points of attention:

  • Adds extern "C" calls to mach_wait_until and mach_timebase_info for macos etc. We could also import them from the mach2 crate, but then we depend on mach2 and we need to modify mach2 to work as an std dep (adding a feature rustc-dep-of-std).
  • The implementations need access to the target_os specific details of the Instant type. For that I added an into_inner and made some fields public. Is there a neater way?
  • All untested, I only have access to an linux install. I hope the CI catches any issues.

@rustbot
Copy link
Collaborator

rustbot commented Nov 30, 2023

r? @cuviper

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added O-hermit Operating System: Hermit O-itron Operating System: ITRON O-SGX Target: SGX O-unix Operating system: Unix-like O-wasi Operating system: Wasi, Webassembly System Interface O-windows Operating system: Windows S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Nov 30, 2023
@dvdsk
Copy link
Contributor Author

dvdsk commented Nov 30, 2023

Not ready for review, however I need CI to run.

@dvdsk dvdsk marked this pull request as ready for review November 30, 2023 16:03
@cuviper
Copy link
Member

cuviper commented Nov 30, 2023

We don't have a configured way to try full CI, but you can copy specific jobs from auto to pr here:

Then ./x.py run src/tools/expand-yaml-anchors to update the real config, and push that as a temporary commit.

Copy link
Member

@joboet joboet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested this on my local macOS machine. While the implementation works, the test currently fails because its success margin is too small.

library/std/tests/thread.rs Outdated Show resolved Hide resolved
library/std/src/thread/mod.rs Show resolved Hide resolved
@bors
Copy link
Contributor

bors commented Dec 7, 2023

☔ The latest upstream changes (presumably #116565) made this pull request unmergeable. Please resolve the merge conflicts.

@dvdsk dvdsk force-pushed the sleep_until_os_specific_impl branch 2 times, most recently from 7ace020 to 1e36e08 Compare December 24, 2023 14:44
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Dec 24, 2023
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@dvdsk dvdsk force-pushed the sleep_until_os_specific_impl branch from 5470a7c to a0f50b6 Compare December 24, 2023 16:44
@dvdsk dvdsk marked this pull request as draft December 24, 2023 16:47
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Jan 13, 2024

☔ The latest upstream changes (presumably #117285) made this pull request unmergeable. Please resolve the merge conflicts.

@cuviper
Copy link
Member

cuviper commented Jan 25, 2024

I'm clearing this from my queue while it's in draft, but you can use ready when you are.

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 25, 2024
@Dylan-DPC
Copy link
Member

@dvdsk any updates on this pr? thanks

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Oct 26, 2024

☔ The latest upstream changes (presumably #132148) made this pull request unmergeable. Please resolve the merge conflicts.

@dvdsk dvdsk force-pushed the sleep_until_os_specific_impl branch from 2c4f02f to 0a45de6 Compare October 26, 2024 12:21
@rust-log-analyzer
Copy link
Collaborator

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
#16 2.674 Building wheels for collected packages: reuse
#16 2.675   Building wheel for reuse (pyproject.toml): started
#16 2.916   Building wheel for reuse (pyproject.toml): finished with status 'done'
#16 2.917   Created wheel for reuse: filename=reuse-4.0.3-cp310-cp310-manylinux_2_35_x86_64.whl size=132720 sha256=026f3bb0f1aa8090b861fd0a0939cb1a782396d84c8aab7875096557d637a0f6
#16 2.917   Stored in directory: /tmp/pip-ephem-wheel-cache-f9crtrnh/wheels/3d/8d/0a/e0fc6aba4494b28a967ab5eaf951c121d9c677958714e34532
#16 2.920 Installing collected packages: boolean-py, binaryornot, tomlkit, reuse, python-debian, markupsafe, license-expression, jinja2, chardet, attrs
#16 3.298 Successfully installed attrs-23.2.0 binaryornot-0.4.4 boolean-py-4.0 chardet-5.2.0 jinja2-3.1.4 license-expression-30.3.0 markupsafe-2.1.5 python-debian-0.1.49 reuse-4.0.3 tomlkit-0.13.0
#16 3.298 WARNING: Running pip as the 'root' user can result in broken permissions and conflicting behaviour with the system package manager. It is recommended to use a virtual environment instead: https://pip.pypa.io/warnings/venv
#16 DONE 3.4s
---
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
    |
52  |  / macro_rules! types {
53  |  |     ($(
54  |  |         $(#[$doc:meta])*
55  |  |         pub struct $name:ident($($fields:tt)*);
...    |
62  |  |         pub struct $name($($fields)*);
63  |  |     )*)
64  |  | }
    |  |_- in this expansion of `types!`
    |
    |
   ::: core/src/../../stdarch/crates/core_arch/src/arm_shared/neon/mod.rs:19:1
    |
19  | /  types! {
20  | |      /// ARM-specific 64-bit wide vector of eight packed `i8`.
21  | |      #[cfg_attr(not(target_arch = "arm"), stable(feature = "neon_intrinsics", since = "1.59.0"))]
22  | |      #[cfg_attr(target_arch = "arm", unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800"))]
23  | |      pub struct int8x8_t(pub(crate) i8, pub(crate) i8, pub(crate) i8, pub(crate) i8, pub(crate) i8, pub(crate) i8, pub(crate) i8, pub(crat...
...   |
...   |
129 | |      pub struct poly64x2_t(pub(crate) p64, pub(crate) p64);
    | |__- in this macro invocation

error[E0076]: SIMD vector's only field must be an array
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
    |
52  |  / macro_rules! types {
53  |  |     ($(
54  |  |         $(#[$doc:meta])*
55  |  |         pub struct $name:ident($($fields:tt)*);
...    |
62  |  |         pub struct $name($($fields)*);
63  |  |     )*)
64  |  | }
    |  |_- in this expansion of `types!`
    |
    |
   ::: core/src/../../stdarch/crates/core_arch/src/arm_shared/neon/mod.rs:19:1
    |
19  | /  types! {
20  | |      /// ARM-specific 64-bit wide vector of eight packed `i8`.
21  | |      #[cfg_attr(not(target_arch = "arm"), stable(feature = "neon_intrinsics", since = "1.59.0"))]
22  | |      #[cfg_attr(target_arch = "arm", unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800"))]
...   |
27  | |      pub struct uint8x8_t(pub(crate) u8, pub(crate) u8, pub(crate) u8, pub(crate) u8, pub(crate) u8, pub(crate) u8, pub(crate) u8, pub(cra...
...   |
...   |
129 | |      pub struct poly64x2_t(pub(crate) p64, pub(crate) p64);
    | |__- in this macro invocation

error[E0076]: SIMD vector's only field must be an array
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
    |
52  |  / macro_rules! types {
53  |  |     ($(
54  |  |         $(#[$doc:meta])*
55  |  |         pub struct $name:ident($($fields:tt)*);
...    |
62  |  |         pub struct $name($($fields)*);
63  |  |     )*)
64  |  | }
    |  |_- in this expansion of `types!`
    |
    |
   ::: core/src/../../stdarch/crates/core_arch/src/arm_shared/neon/mod.rs:19:1
    |
19  | /  types! {
20  | |      /// ARM-specific 64-bit wide vector of eight packed `i8`.
21  | |      #[cfg_attr(not(target_arch = "arm"), stable(feature = "neon_intrinsics", since = "1.59.0"))]
22  | |      #[cfg_attr(target_arch = "arm", unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800"))]
...   |
31  | |      pub struct poly8x8_t(pub(crate) p8, pub(crate) p8, pub(crate) p8, pub(crate) p8, pub(crate) p8, pub(crate) p8, pub(crate) p8, pub(cra...
...   |
...   |
129 | |      pub struct poly64x2_t(pub(crate) p64, pub(crate) p64);
    | |__- in this macro invocation

error[E0076]: SIMD vector's only field must be an array
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
    |
52  |  / macro_rules! types {
53  |  |     ($(
54  |  |         $(#[$doc:meta])*
55  |  |         pub struct $name:ident($($fields:tt)*);
...    |
62  |  |         pub struct $name($($fields)*);
63  |  |     )*)
64  |  | }
    |  |_- in this expansion of `types!`
    |
    |
   ::: core/src/../../stdarch/crates/core_arch/src/arm_shared/neon/mod.rs:19:1
    |
19  | /  types! {
20  | |      /// ARM-specific 64-bit wide vector of eight packed `i8`.
21  | |      #[cfg_attr(not(target_arch = "arm"), stable(feature = "neon_intrinsics", since = "1.59.0"))]
22  | |      #[cfg_attr(target_arch = "arm", unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800"))]
...   |
35  | |      pub struct int16x4_t(pub(crate) i16, pub(crate) i16, pub(crate) i16, pub(crate) i16);
...   |
...   |
129 | |      pub struct poly64x2_t(pub(crate) p64, pub(crate) p64);
    | |__- in this macro invocation

error[E0076]: SIMD vector's only field must be an array
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
    |
52  |  / macro_rules! types {
53  |  |     ($(
54  |  |         $(#[$doc:meta])*
55  |  |         pub struct $name:ident($($fields:tt)*);
...    |
62  |  |         pub struct $name($($fields)*);
63  |  |     )*)
64  |  | }
    |  |_- in this expansion of `types!`
    |
    |
   ::: core/src/../../stdarch/crates/core_arch/src/arm_shared/neon/mod.rs:19:1
    |
19  | /  types! {
20  | |      /// ARM-specific 64-bit wide vector of eight packed `i8`.
21  | |      #[cfg_attr(not(target_arch = "arm"), stable(feature = "neon_intrinsics", since = "1.59.0"))]
22  | |      #[cfg_attr(target_arch = "arm", unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800"))]
...   |
39  | |      pub struct uint16x4_t(pub(crate) u16, pub(crate) u16, pub(crate) u16, pub(crate) u16);
...   |
...   |
129 | |      pub struct poly64x2_t(pub(crate) p64, pub(crate) p64);
    | |__- in this macro invocation

error[E0076]: SIMD vector's only field must be an array
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
    |
52  |  / macro_rules! types {
53  |  |     ($(
54  |  |         $(#[$doc:meta])*
55  |  |         pub struct $name:ident($($fields:tt)*);
...    |
62  |  |         pub struct $name($($fields)*);
63  |  |     )*)
64  |  | }
    |  |_- in this expansion of `types!`
    |
    |
   ::: core/src/../../stdarch/crates/core_arch/src/arm_shared/neon/mod.rs:19:1
    |
19  | /  types! {
20  | |      /// ARM-specific 64-bit wide vector of eight packed `i8`.
21  | |      #[cfg_attr(not(target_arch = "arm"), stable(feature = "neon_intrinsics", since = "1.59.0"))]
22  | |      #[cfg_attr(target_arch = "arm", unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800"))]
...   |
45  | |      pub struct poly16x4_t(pub(crate) p16, pub(crate) p16, pub(crate) p16, pub(crate) p16);
...   |
...   |
129 | |      pub struct poly64x2_t(pub(crate) p64, pub(crate) p64);
    | |__- in this macro invocation

error[E0076]: SIMD vector's only field must be an array
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
    |
52  |  / macro_rules! types {
53  |  |     ($(
54  |  |         $(#[$doc:meta])*
55  |  |         pub struct $name:ident($($fields:tt)*);
...    |
62  |  |         pub struct $name($($fields)*);
63  |  |     )*)
64  |  | }
    |  |_- in this expansion of `types!`
    |
    |
   ::: core/src/../../stdarch/crates/core_arch/src/arm_shared/neon/mod.rs:19:1
    |
19  | /  types! {
20  | |      /// ARM-specific 64-bit wide vector of eight packed `i8`.
21  | |      #[cfg_attr(not(target_arch = "arm"), stable(feature = "neon_intrinsics", since = "1.59.0"))]
22  | |      #[cfg_attr(target_arch = "arm", unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800"))]
...   |
49  | |      pub struct int32x2_t(pub(crate) i32, pub(crate) i32);
...   |
...   |
129 | |      pub struct poly64x2_t(pub(crate) p64, pub(crate) p64);
    | |__- in this macro invocation

error[E0076]: SIMD vector's only field must be an array
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
    |
52  |  / macro_rules! types {
53  |  |     ($(
54  |  |         $(#[$doc:meta])*
55  |  |         pub struct $name:ident($($fields:tt)*);
...    |
62  |  |         pub struct $name($($fields)*);
63  |  |     )*)
64  |  | }
    |  |_- in this expansion of `types!`
    |
    |
   ::: core/src/../../stdarch/crates/core_arch/src/arm_shared/neon/mod.rs:19:1
    |
19  | /  types! {
20  | |      /// ARM-specific 64-bit wide vector of eight packed `i8`.
21  | |      #[cfg_attr(not(target_arch = "arm"), stable(feature = "neon_intrinsics", since = "1.59.0"))]
22  | |      #[cfg_attr(target_arch = "arm", unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800"))]
...   |
53  | |      pub struct uint32x2_t(pub(crate) u32, pub(crate) u32);
...   |
...   |
129 | |      pub struct poly64x2_t(pub(crate) p64, pub(crate) p64);
    | |__- in this macro invocation

error[E0076]: SIMD vector's only field must be an array
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
    |
52  |  / macro_rules! types {
53  |  |     ($(
54  |  |         $(#[$doc:meta])*
55  |  |         pub struct $name:ident($($fields:tt)*);
...    |
62  |  |         pub struct $name($($fields)*);
63  |  |     )*)
64  |  | }
    |  |_- in this expansion of `types!`
    |
    |
   ::: core/src/../../stdarch/crates/core_arch/src/arm_shared/neon/mod.rs:19:1
    |
19  | /  types! {
20  | |      /// ARM-specific 64-bit wide vector of eight packed `i8`.
21  | |      #[cfg_attr(not(target_arch = "arm"), stable(feature = "neon_intrinsics", since = "1.59.0"))]
22  | |      #[cfg_attr(target_arch = "arm", unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800"))]
...   |
57  | |      pub struct float32x2_t(pub(crate) f32, pub(crate) f32);
...   |
...   |
129 | |      pub struct poly64x2_t(pub(crate) p64, pub(crate) p64);
    | |__- in this macro invocation

error[E0076]: SIMD vector's only field must be an array
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
    |
52  |  / macro_rules! types {
53  |  |     ($(
54  |  |         $(#[$doc:meta])*
55  |  |         pub struct $name:ident($($fields:tt)*);
...    |
62  |  |         pub struct $name($($fields)*);
63  |  |     )*)
64  |  | }
    |  |_- in this expansion of `types!`
    |
    |
   ::: core/src/../../stdarch/crates/core_arch/src/arm_shared/neon/mod.rs:19:1
    |
19  | /  types! {
20  | |      /// ARM-specific 64-bit wide vector of eight packed `i8`.
21  | |      #[cfg_attr(not(target_arch = "arm"), stable(feature = "neon_intrinsics", since = "1.59.0"))]
22  | |      #[cfg_attr(target_arch = "arm", unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800"))]
...   |
61  | |      pub struct int64x1_t(pub(crate) i64);
...   |
...   |
129 | |      pub struct poly64x2_t(pub(crate) p64, pub(crate) p64);
    | |__- in this macro invocation

error[E0076]: SIMD vector's only field must be an array
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
    |
52  |  / macro_rules! types {
53  |  |     ($(
54  |  |         $(#[$doc:meta])*
55  |  |         pub struct $name:ident($($fields:tt)*);
...    |
62  |  |         pub struct $name($($fields)*);
63  |  |     )*)
64  |  | }
    |  |_- in this expansion of `types!`
    |
    |
   ::: core/src/../../stdarch/crates/core_arch/src/arm_shared/neon/mod.rs:19:1
    |
19  | /  types! {
20  | |      /// ARM-specific 64-bit wide vector of eight packed `i8`.
21  | |      #[cfg_attr(not(target_arch = "arm"), stable(feature = "neon_intrinsics", since = "1.59.0"))]
22  | |      #[cfg_attr(target_arch = "arm", unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800"))]
...   |
65  | |      pub struct uint64x1_t(pub(crate) u64);
...   |
...   |
129 | |      pub struct poly64x2_t(pub(crate) p64, pub(crate) p64);
    | |__- in this macro invocation

error[E0076]: SIMD vector's only field must be an array
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
    |
52  |  / macro_rules! types {
53  |  |     ($(
54  |  |         $(#[$doc:meta])*
55  |  |         pub struct $name:ident($($fields:tt)*);
...    |
62  |  |         pub struct $name($($fields)*);
63  |  |     )*)
64  |  | }
    |  |_- in this expansion of `types!`
    |
    |
   ::: core/src/../../stdarch/crates/core_arch/src/arm_shared/neon/mod.rs:19:1
    |
19  | /  types! {
20  | |      /// ARM-specific 64-bit wide vector of eight packed `i8`.
21  | |      #[cfg_attr(not(target_arch = "arm"), stable(feature = "neon_intrinsics", since = "1.59.0"))]
22  | |      #[cfg_attr(target_arch = "arm", unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800"))]
...   |
69  | |      pub struct poly64x1_t(pub(crate) p64);
...   |
...   |
129 | |      pub struct poly64x2_t(pub(crate) p64, pub(crate) p64);
    | |__- in this macro invocation

error[E0076]: SIMD vector's only field must be an array
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
    |
52  |  / macro_rules! types {
53  |  |     ($(
54  |  |         $(#[$doc:meta])*
55  |  |         pub struct $name:ident($($fields:tt)*);
...    |
62  |  |         pub struct $name($($fields)*);
63  |  |     )*)
64  |  | }
    |  |_- in this expansion of `types!`
    |
    |
   ::: core/src/../../stdarch/crates/core_arch/src/arm_shared/neon/mod.rs:19:1
    |
19  | /  types! {
20  | |      /// ARM-specific 64-bit wide vector of eight packed `i8`.
21  | |      #[cfg_attr(not(target_arch = "arm"), stable(feature = "neon_intrinsics", since = "1.59.0"))]
22  | |      #[cfg_attr(target_arch = "arm", unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800"))]
...   |
75  | |          pub(crate) i8, pub(crate) i8, pub(crate) i8, pub(crate) i8, pub(crate) i8, pub(crate) i8 , pub(crate) i8, pub(crate) i8,
...   |
...   |
129 | |      pub struct poly64x2_t(pub(crate) p64, pub(crate) p64);
    | |__- in this macro invocation

error[E0076]: SIMD vector's only field must be an array
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
    |
52  |  / macro_rules! types {
53  |  |     ($(
54  |  |         $(#[$doc:meta])*
55  |  |         pub struct $name:ident($($fields:tt)*);
...    |
62  |  |         pub struct $name($($fields)*);
63  |  |     )*)
64  |  | }
    |  |_- in this expansion of `types!`
    |
    |
   ::: core/src/../../stdarch/crates/core_arch/src/arm_shared/neon/mod.rs:19:1
    |
19  | /  types! {
20  | |      /// ARM-specific 64-bit wide vector of eight packed `i8`.
21  | |      #[cfg_attr(not(target_arch = "arm"), stable(feature = "neon_intrinsics", since = "1.59.0"))]
22  | |      #[cfg_attr(target_arch = "arm", unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800"))]
...   |
82  | |          pub(crate) u8, pub(crate) u8 , pub(crate) u8, pub(crate) u8, pub(crate) u8, pub(crate) u8 , pub(crate) u8, pub(crate) u8,
...   |
...   |
129 | |      pub struct poly64x2_t(pub(crate) p64, pub(crate) p64);
    | |__- in this macro invocation

error[E0076]: SIMD vector's only field must be an array
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
    |
52  |  / macro_rules! types {
53  |  |     ($(
54  |  |         $(#[$doc:meta])*
55  |  |         pub struct $name:ident($($fields:tt)*);
...    |
62  |  |         pub struct $name($($fields)*);
63  |  |     )*)
64  |  | }
    |  |_- in this expansion of `types!`
    |
    |
   ::: core/src/../../stdarch/crates/core_arch/src/arm_shared/neon/mod.rs:19:1
    |
19  | /  types! {
20  | |      /// ARM-specific 64-bit wide vector of eight packed `i8`.
21  | |      #[cfg_attr(not(target_arch = "arm"), stable(feature = "neon_intrinsics", since = "1.59.0"))]
22  | |      #[cfg_attr(target_arch = "arm", unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800"))]
...   |
89  | |           pub(crate) p8,  pub(crate) p8,  pub(crate) p8,  pub(crate) p8,  pub(crate) p8,  pub(crate) p8,  pub(crate) p8,  pub(crate) p8,
...   |
...   |
129 | |      pub struct poly64x2_t(pub(crate) p64, pub(crate) p64);
    | |__- in this macro invocation

error[E0076]: SIMD vector's only field must be an array
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
    |
52  |  / macro_rules! types {
53  |  |     ($(
54  |  |         $(#[$doc:meta])*
55  |  |         pub struct $name:ident($($fields:tt)*);
...    |
62  |  |         pub struct $name($($fields)*);
63  |  |     )*)
64  |  | }
    |  |_- in this expansion of `types!`
    |
    |
   ::: core/src/../../stdarch/crates/core_arch/src/arm_shared/neon/mod.rs:19:1
    |
19  | /  types! {
20  | |      /// ARM-specific 64-bit wide vector of eight packed `i8`.
21  | |      #[cfg_attr(not(target_arch = "arm"), stable(feature = "neon_intrinsics", since = "1.59.0"))]
22  | |      #[cfg_attr(target_arch = "arm", unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800"))]
...   |
95  | |      pub struct int16x8_t(pub(crate) i16, pub(crate) i16, pub(crate) i16, pub(crate) i16, pub(crate) i16, pub(crate) i16, pub(crate) i16, ...
...   |
...   |
129 | |      pub struct poly64x2_t(pub(crate) p64, pub(crate) p64);
    | |__- in this macro invocation

error[E0076]: SIMD vector's only field must be an array
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
    |
52  |  / macro_rules! types {
53  |  |     ($(
54  |  |         $(#[$doc:meta])*
55  |  |         pub struct $name:ident($($fields:tt)*);
...    |
62  |  |         pub struct $name($($fields)*);
63  |  |     )*)
64  |  | }
    |  |_- in this expansion of `types!`
    |
    |
   ::: core/src/../../stdarch/crates/core_arch/src/arm_shared/neon/mod.rs:19:1
    |
19  | /  types! {
20  | |      /// ARM-specific 64-bit wide vector of eight packed `i8`.
21  | |      #[cfg_attr(not(target_arch = "arm"), stable(feature = "neon_intrinsics", since = "1.59.0"))]
22  | |      #[cfg_attr(target_arch = "arm", unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800"))]
...   |
99  | |      pub struct uint16x8_t(pub(crate) u16, pub(crate) u16, pub(crate) u16, pub(crate) u16, pub(crate) u16, pub(crate) u16, pub(crate) u16,...
...   |
...   |
129 | |      pub struct poly64x2_t(pub(crate) p64, pub(crate) p64);
    | |__- in this macro invocation

error[E0076]: SIMD vector's only field must be an array
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
   --> core/src/../../stdarch/crates/core_arch/src/macros.rs:62:9
    |
52  |  / macro_rules! types {
53  |  |     ($(
54  |  |         $(#[$doc:meta])*
55  |  |         pub struct $name:ident($($fields:tt)*);
...    |
62  |  |         pub struct $name($($fields)*);
63  |  |     )*)
64  |  | }
    |  |_- in this expansion of `types!`
    |
    |
   ::: core/src/../../stdarch/crates/core_arch/src/arm_shared/neon/mod.rs:19:1
    |
19  | /  types! {
20  | |      /// ARM-specific 64-bit wide vector of eight packed `i8`.
21  | |      #[cfg_attr(not(target_arch = "arm"), stable(feature = "neon_intrinsics", since = "1.59.0"))]
22  | |      #[cfg_attr(target_arch = "arm", unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800"))]
...   |
105 | |      pub struct poly16x8_t(pub(crate) p16, pub(crate) p16, pub(crate) p16, pub(crate) p16, pub(crate) p16, pub(crate) p16, pub(crate) p16,...
...   |
...   |
129 | |      pub struct poly64x2_t(pub(crate) p64, pub(crate) p64);
    | |__- in this macro invocation

@dvdsk
Copy link
Contributor Author

dvdsk commented Oct 26, 2024

@rustbot ready

Is CI broken? I cant get it to pass but the error seems unrelated?

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 26, 2024
@bors
Copy link
Contributor

bors commented Oct 28, 2024

☔ The latest upstream changes (presumably #132145) made this pull request unmergeable. Please resolve the merge conflicts.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc F-sleep_until `#![feature(sleep_until)]` O-hermit Operating System: Hermit O-itron Operating System: ITRON O-SGX Target: SGX O-unix Operating system: Unix-like O-wasi Operating system: Wasi, Webassembly System Interface O-windows Operating system: Windows S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants