Rollup of 8 pull requests #31305
Merged
Rollup of 8 pull requests #31305
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
Member
Manishearth
commented
Jan 30, 2016
Manishearth
commented
- Successful merges: 1.7 release notes #31099, rustfmt syntax::parse #31244, Fix link to Installing Rust section of the book #31280, mk: Fix compiling powerpc64/armv7 #31290, std: Ignore dtors_in_dtors_in_dtors on OSX #31292, Fix number of methods in guessing game #31294, Make note that this is different in std #31295, Add main() so that examples work #31296
- Failed merges:
We forgot to pass down the `-m64` flag to gcc, so we were actually compiling powerpc code which would then later fail to link!
The cross prefix was not likely the actual compiler that needed to be used, but rather the standard `arm-linux-gnueabihf-gcc` compiler can just be used with `-march=armv7`.
This test has been deadlocking and causing problems on the bots basically since its inception. Some memory safety issues were fixed in 987dc84, but the deadlocks remained afterwards unfortunately. After some investigation, I've concluded that this is just a situation where OSX is not guaranteed to run destructors. The fix in 987dc84 observed that OSX was rewriting the backing TLS memory to its initial state during destruction while we weren't looking, and this would have the effect of canceling the destructors of any other initialized TLS slots. While very difficult to pin down, this is basically what I assume is happening here, so there doesn't seem to really be anythig we can do to ensure the test robustly passes on OSX, so just ignore it for now.
This code was refactored, but the words were not Fixes rust-lang#31284
These are free functions in the text, but methods in the standard library. Fixes rust-lang#31266
Rustdoc will automatically wrap things in main, but this doesn't work here. Fixes rust-lang#31249
Perhaps, it makes more sense to link straight to [Installing on Linux or Mac](https://doc.rust-lang.org/book/getting-started.html#installing-on-linux-or-mac) and [Installing on Windows](https://doc.rust-lang.org/book/getting-started.html#installing-on-windows) sections. Platform Support section could be skipped in case of *quick* start.
We forgot to pass down the `-m64` flag to gcc, so we were actually compiling powerpc code which would then later fail to link!
…dtors, r=aturon This test has been deadlocking and causing problems on the bots basically since its inception. Some memory safety issues were fixed in 987dc84, but the deadlocks remained afterwards unfortunately. After some investigation, I've concluded that this is just a situation where OSX is not guaranteed to run destructors. The fix in 987dc84 observed that OSX was rewriting the backing TLS memory to its initial state during destruction while we weren't looking, and this would have the effect of canceling the destructors of any other initialized TLS slots. While very difficult to pin down, this is basically what I assume is happening here, so there doesn't seem to really be anythig we can do to ensure the test robustly passes on OSX, so just ignore it for now.
This code was refactored, but the words were not Fixes rust-lang#31284
These are free functions in the text, but methods in the standard library. Fixes rust-lang#31266
Rustdoc will automatically wrap things in main, but this doesn't work here. Fixes rust-lang#31249
|
@bors r+ p=10 |
|
📌 Commit f66d3c5 has been approved by |
bors
added a commit
that referenced
this pull request
Jan 30, 2016
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.