Remove dependency on the synchapi winapi feature
#70
Conversation
This file contains 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
Amanieu
requested changes
Apr 27, 2018
core/src/spinwait.rs
Outdated
| @@ -17,11 +17,14 @@ use std::sync::atomic::spin_loop_hint; | |||
| #[cfg(windows)] | |||
| #[inline] | |||
| fn thread_yield() { | |||
| extern "system" { | |||
| fn Sleep(a: winapi::shared::minwindef::DWORD); | |||
| } | |||
There was a problem hiding this comment.
Could you add a comment explaining why this is being pulled in directly?
Pulling in `parking_lot` to the Rust compiler unfortunately had adverse side effects on the binary dependencies of rustc -- rust-lang/rust#49438. It turns out this is due to a number of bugs happening all at once, and currently we're looking for ways to fix the beta/master branches of rustc to fix this for now (not necessarily in the best way). This commit removes the activation of the `synchapi` feature of `winapi` which prevents `libsynchronization.a` from being linked in (and prevents rustc from accidentally picking up a dependency on a missing DLL). The `synchapi` feature was only activated for access to the `Sleep` function, but that function actually resides in `kernel32.dll`. As a result this commit inlines the definition of `Sleep` into this crate to avoid needing to depend on an upstream definition.
|
Updated! |
|
Might be worth mentioning in the comment that this change was only done for the sake of building Rust itself as in any other situation |
Amanieu
approved these changes
Apr 27, 2018
|
Thanks @Amanieu! Could you also publish a new version so we can update rustc? |
|
Done! |
|
Awesome, thanks @Amanieu! |
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Apr 27, 2018
This commit updates `parking_lot` to pull in Amanieu/parking_lot#70 and... Closes rust-lang#49438
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Apr 27, 2018
…Mark-Simulacrum Update `parking_lot` dependencies This commit updates `parking_lot` to pull in Amanieu/parking_lot#70 and... Closes rust-lang#49438
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Pulling in
parking_lotto the Rust compiler unfortunately had adverse sideeffects on the binary dependencies of rustc -- rust-lang/rust#49438. It turns
out this is due to a number of bugs happening all at once, and currently we're
looking for ways to fix the beta/master branches of rustc to fix this for now
(not necessarily in the best way).
This commit removes the activation of the
synchapifeature ofwinapiwhichprevents
libsynchronization.afrom being linked in (and prevents rustc fromaccidentally picking up a dependency on a missing DLL). The
synchapifeaturewas only activated for access to the
Sleepfunction, but that functionactually resides in
kernel32.dll. As a result this commit inlines thedefinition of
Sleepinto this crate to avoid needing to depend on an upstreamdefinition.