Rollup of 5 pull requests #29167
Closed
Rollup of 5 pull requests #29167
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
Member
steveklabnik
commented
Oct 19, 2015
steveklabnik
commented
- Successful merges: Properly link up iterator documentation #29027, Fix minor issues with std::io docs #29125, Document that Ordering::Relaxed is Monotonic #29132, Add a regression test for #29122 (fixed in #29134) #29151, Made the example capable of consistent deadlocking #29165
- Failed merges:
Due to the way iterators work, the std::iter module is chock full of structs that you, humble Rust programmer, will never actually use. However, they have URLs, and therefore get linked to, because they are real structs that do exist. So, rather than just have a tiny sentence about each one of them, this patch adds links back to the functions and methods on Iterator which actually create the structs, where helpful documentation already exists.
To augment the didactic effect, made placed the thread::sleep_ms call in the last example, so that there will be time for the other locks to happen; without this, I was unable to observe the deadlock in over 1,000 runs when there was no left-handed philosopher.
Due to the way iterators work, the std::iter module is chock full of structs that you, humble Rust programmer, will never actually use. However, they have URLs, and therefore get linked to, because they are real structs that do exist. So, rather than just have a tiny sentence about each one of them, this patch adds links back to the functions and methods on Iterator which actually create the structs, where helpful documentation already exists.
…chton Just a few minor spelling/grammar fixes.
…=alexcrichton I wasn't sure whether `Ordering::Relaxed` meant `Monotonic` or `Unordered`, so I checked the compiler sources and found https://github.com/rust-lang/rust/blob/206af38e74ce7fa4b0e781ece7f1067c018c580e/src/librustc_trans/trans/intrinsic.rs#L846 which appears conclusive. Adding this answer to the documentation.
I suspect this won't work on Windows, but let's be optimistic and try it before disabling.
To augment the didactic effect, made placed the thread::sleep_ms call in the last example, so that there will be time for the other locks to happen; without this, I was unable to observe the deadlock in over 1,000 runs when there was no left-handed philosopher.
|
@bors: r+ p=1 |
|
📌 Commit 81681f0 has been approved by |
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
⌛ Testing commit 81681f0 with merge 01f962d... |
|
💔 Test failed - auto-mac-64-opt |
|
@bors: retry |
|
⌛ Testing commit 81681f0 with merge aadb1a4... |
|
Failure looks legit. (I thought that would probably fail on Windows, but I guess Macs are different enough as well.) |
|
@wthrowe ah, i wasn't sure. I'll r- for now then. |
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.