Rollup of 6 pull requests #27544
Merged
Rollup of 6 pull requests #27544
+168
−19
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
Aug 5, 2015
steveklabnik
commented
- Successful merges: Show impl<T> and explain it for trait bounds and operators #27285, Clarify claims about PhantomData<T>. #27524, Make note of Hash in Borrow's docs #27533, work -> compile in Guessing Game #27535, Expand further on <> syntax in TRPL. #27538, Add more infor about function pointers to TRPL #27539
- Failed merges:
This includes a new example with Rectangle, instead of reusing HasArea, because fn area would require the Mul trait, and the added complexity of that would be better left for the Operators and Overloading chapter. Squashed at reviewer's request: Move teaser for trait bounds to bottom
Squashed at reviewer's request: Add heading at the end of the introductory material Spice up introductory paragraphs a bit Use quotes instead of <code> for phrase Remove "other" in "other restrictions" (it's not obvious that any other restrictions have been mentioned) "Default methods" is a second-level heading, but is not a subsection of "Where clause" Reword "Default methods" introduction: it's not the "last feature" on this page
'work' can refer to the game itself, ie, 'this compiles but the game isn't finished,' so 'compile' is a more clear way to describe the problem. Thanks jhun on irc
This should be a bit more prominent. Fixes rust-lang#27109
We haven't discussed this syntax yet, so provide a basic explanation and link up to later chapters. Fixes rust-lang#26917
This wording was too strong. Fixes rust-lang#27523
…eveklabnik I also included some smaller trait-related changes. Fixes rust-lang#26991. r? @shepmaster r? @steveklabnik
This wording was too strong. Fixes rust-lang#27523
This should be a bit more prominent. Fixes rust-lang#27109
'work' can refer to the game itself, ie, 'this compiles but the game isn't finished,' so 'compile' is a more clear way to describe the problem. Thanks jhun on irc
We haven't discussed this syntax yet, so provide a basic explanation and link up to later chapters. Fixes rust-lang#26917
1. mention them in the function chapter 2. mention their coercion to closures in the closures chapter Fixes rust-lang#26746
|
r? @pcwalton (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: r+ p=10 |
|
📌 Commit 4280507 has been approved by |
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.