Fix compiling CondVar::wait_timeout on 32-bit Apple platforms
#148072
+10
−8
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
madsmtm
added
O-Arm
rustbot
added
O-unix
joboet
approved these changes
Oct 24, 2025
|
@bors delegate+ |
|
Tested and updated the PR description. @bors r=joboet rollup |
bors
added
S-waiting-on-bors
rustbot
added
the
S-waiting-on-review
jhpratt
added a commit
to jhpratt/rust
that referenced
this pull request
Oct 25, 2025
…=joboet Fix compiling `CondVar::wait_timeout` on 32-bit Apple platforms Fixes rust-lang#147776. I feel like there's a cleaner way to write this, but that probably requires further refactoring. The build can be tested with `./x build --target arm64_32-apple-watchos` (or with any other 32-bit Apple target). Tested it works at runtime on an Intel Macbook Pro with macOS 10.12.6, in x86 emulation mode with something similar to `./x test library/std --target x86_64-apple-darwin,i686-apple-darwin`, as well as with a custom test with a timeout of `Duration::from_secs((u32::MAX as u64) + 1)` (which the naive fix would have treated as a duration of 1 second). r? libs CC `@joboet`
bors
added a commit
that referenced
this pull request
Oct 25, 2025
Rollup of 6 pull requests Successful merges: - #147406 (Remove needs-asm-support directive in tests with explicit targets) - #147790 (constify comparison traits on slices) - #148056 (refactor(rustdoc): Remove redundant langstr checks) - #148065 (compiletest: Add concrete examples for some config/test path fields) - #148072 (Fix compiling `CondVar::wait_timeout` on 32-bit Apple platforms) - #148073 (test(frontmatter): Rename tests to make coverage more obvious) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
that referenced
this pull request
Oct 25, 2025
Rollup of 5 pull requests Successful merges: - #147406 (Remove needs-asm-support directive in tests with explicit targets) - #148056 (refactor(rustdoc): Remove redundant langstr checks) - #148065 (compiletest: Add concrete examples for some config/test path fields) - #148072 (Fix compiling `CondVar::wait_timeout` on 32-bit Apple platforms) - #148073 (test(frontmatter): Rename tests to make coverage more obvious) r? `@ghost` `@rustbot` modify labels: rollup
jieyouxu
removed
the
S-waiting-on-review
rust-timer
added a commit
that referenced
this pull request
Oct 25, 2025
Rollup merge of #148072 - madsmtm:fix-apple-condvar-32bit, r=joboet Fix compiling `CondVar::wait_timeout` on 32-bit Apple platforms Fixes #147776. I feel like there's a cleaner way to write this, but that probably requires further refactoring. The build can be tested with `./x build --target arm64_32-apple-watchos` (or with any other 32-bit Apple target). Tested it works at runtime on an Intel Macbook Pro with macOS 10.12.6, in x86 emulation mode with something similar to `./x test library/std --target x86_64-apple-darwin,i686-apple-darwin`, as well as with a custom test with a timeout of `Duration::from_secs((u32::MAX as u64) + 1)` (which the naive fix would have treated as a duration of 1 second). r? libs CC ``@joboet``
github-actions bot
pushed a commit
to rust-lang/rustc-dev-guide
that referenced
this pull request
Oct 27, 2025
Rollup of 5 pull requests Successful merges: - rust-lang/rust#147406 (Remove needs-asm-support directive in tests with explicit targets) - rust-lang/rust#148056 (refactor(rustdoc): Remove redundant langstr checks) - rust-lang/rust#148065 (compiletest: Add concrete examples for some config/test path fields) - rust-lang/rust#148072 (Fix compiling `CondVar::wait_timeout` on 32-bit Apple platforms) - rust-lang/rust#148073 (test(frontmatter): Rename tests to make coverage more obvious) r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #147776. I feel like there's a cleaner way to write this, but that probably requires further refactoring.
The build can be tested with
./x build --target arm64_32-apple-watchos(or with any other 32-bit Apple target).Tested it works at runtime on an Intel Macbook Pro with macOS 10.12.6, in x86 emulation mode with something similar to
./x test library/std --target x86_64-apple-darwin,i686-apple-darwin, as well as with a custom test with a timeout ofDuration::from_secs((u32::MAX as u64) + 1)(which the naive fix would have treated as a duration of 1 second).r? libs
CC @joboet