Rollup of 8 pull requests #25624
Merged
Rollup of 8 pull requests #25624
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
steveklabnik
commented
May 19, 2015
steveklabnik
commented
- Successful merges: Add example for from_str_radix #25583, Change default gender in the dining philosophers project #25585, fmt.rs: add note about lack of padding support for some types #25602, Fix lifetimes trpl typo #25604, trpl/macros: Fix description of assert! #25607, doc: add missing fences #25611, doc: fix a broken link #25614, mk: Report the prerelease version on beta again. Fixes #25618 #25620
- Failed merges:
This commits adds a method to the `std::process` module to get the process identifier of the child as a `u32`. On Windows the underlying identifier is already a `u32`, and on Unix the type is typically defined as `c_int` (`i32` for almost all our supported platforms), but the actually pid is normally a small positive number. Eventually we may add functions to load information about a process based on its identifier or the ability to terminate a process based on its identifier, but for now this function should enable this sort of functionality to exist outside the standard library.
This commits adds a method to the `std::process` module to get the process identifier of the child as a `u32`. On Windows the underlying identifier is already a `u32`, and on Unix the type is typically defined as `c_int` (`i32` for almost all our supported platforms), but the actually pid is normally a small positive number. Eventually we may add functions to load information about a process based on its identifier or the ability to terminate a process based on its identifier, but for now this function should enable this sort of functionality to exist outside the standard library.
…veklabnik The paper from which this example was taken made the mistake of assuming that all five philosophers are men. This it is a hypothetical example—there are no actual philosophers eating 🍝—so there is no good reason to make this assumption. Since women make up about half of the human population, all things being equal, women should represent about half of the philosophers. However, because this mistake has stood since 1985, I have changed *all* of the pronouns to be female, to make up for lost time. If someone would like to revert this patch or switch to neutral pronouns after 30 years, feel free to set your alarm clock for 2045. r? @steveklabnik, since this is a documentation change and was created after reading http://words.steveklabnik.com/ouroboros, where I noticed this mistake.
Padding and alignment are often not implemented by types and can cause confusion in the user. Per discussion with @alexcrichton, here is my PR. /cc time-rs/time#98
…teveklabnik "Truth passes, success `panic!`s" seems to be a typo. The closest fix would be something like "Success passes, failure `panic!`s" but to me a "comparison failure" suggests that we couldn't compare the two values at all, not that we could successfully compare them and that the result was non-equality. So I opted to rewrite the paragraph a bit. If there's a better alternative please let me know. r? @steveklabnik
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: r+ p=1337 |
|
📌 Commit ed3c644 has been approved by |
|
⌛ Testing commit ed3c644 with merge 55fe958... |
|
💔 Test failed - auto-mac-64-opt |
|
@bors: r+ p=100000 |
|
📌 Commit 55da4c6 has been approved by |
|
⌛ Testing commit 55da4c6 with merge 19bb3b9... |
|
💔 Test failed - auto-mac-64-opt |
|
@bors: r+ p=100 force |
|
📌 Commit 395d01c has been approved by |
|
@bors: force |
bors
added a commit
that referenced
this pull request
May 20, 2015
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.