Uh oh!
There was an error while loading. Please reload this page.
Rollup of 9 pull requests - #32172
Closed
steveklabnik wants to merge 21 commits into
Closed
Conversation
steveklabnik
commented
Mar 10, 2016
Contributor
- Successful merges: Prefer 'associated function' over 'static method' in msg. #31830, Clarify documentation of hash::SipHasher #32091, Remove final note from testing chapter. #32125, Add missing documentation examples for BTreeSet. #32136, Add missing documentation examples for BinaryHeap. #32137, Clarify that try_unwrap needs exactly one #32147, Small grammar fix in Guessing Game #32148, Add other primitive types to the reference #32149, Remove inaccurate claim about inline assembly #32150
- Failed merges:
The docs were making assertions/recommendations they shouldn't have. This clarifies them and adds some helpful links. Fixesrust-lang#32043.
The information that documentation tests cannot be run in binary crates is already given at the beginning of the section.
As part of the ongoing effort to document all methods with examples, this commit adds the missing examples for the `BTreeSet` collection type. This is part of issue rust-lang#29348.
As part of the ongoing effort to document all methods with examples, this commit adds the missing examples for the `BinaryHeap` collection type. This is part of issue rust-lang#29348.
When it was Option.expect(), there was an .ok().expect(), but now that it uses Result.expect(), there's only one method, not two. Fixesrust-lang#31912
It's not like GCC's. Fixesrust-lang#20213
TRPL seems to refer to 'static functions' as 'associated functions'. This terminology should be used consistently.
Prefer 'associated function' over 'static method' in msg. TRPL seems to refer to 'static functions' as 'associated functions'. This terminology should be used consistently.
…ion, r=alexcrichton Clarify documentation of hash::SipHasher The docs were making assertions/recommendations they shouldn't have. This clarifies them and adds some helpful links. Fixesrust-lang#32043. r? @sfackler
Remove final note from testing chapter. The information that documentation tests cannot be run in binary crates is already given at the beginning of the section.
…et, r=steveklabnik Add missing documentation examples for BTreeSet. As part of the ongoing effort to document all methods with examples, this commit adds the missing examples for the `BTreeSet` collection type. This is part of issue rust-lang#29348. r? @steveklabnik
…heap, r=steveklabnik Add missing documentation examples for BinaryHeap. As part of the ongoing effort to document all methods with examples, this commit adds the missing examples for the `BinaryHeap` collection type. This is part of issue rust-lang#29348. r? @steveklabnik
Clarify that try_unwrap needs exactly one Fixesrust-lang#31950
Small grammar fix in Guessing Game When it was Option.expect(), there was an .ok().expect(), but now that it uses Result.expect(), there's only one method, not two. Fixesrust-lang#31912
Add other primitive types to the reference Fixesrust-lang#31628
Remove inaccurate claim about inline assembly It's not like GCC's. Fixesrust-lang#20213
steveklabnik
commented
Mar 10, 2016
ContributorAuthor
@bors: r+ p=1 |
bors
commented
Mar 10, 2016
Collaborator
📌 Commit ce16a5d has been approved by |
bors
commented
Mar 10, 2016
Collaborator
⌛ Testing commit ce16a5d with merge 2548f5e... |
bors
commented
Mar 10, 2016
Collaborator
💔 Test failed - auto-mac-64-opt |
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
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
7 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.