Rollup of other PRs in the queue; Friday #24759
Merged
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
Consistency. The book also refers to it as trait objects.
'win32' -> 'windows', added 'ios'
(And other kinds of items).
* Add two missing keywords, `Self` and `proc` * Fix some mis-alphabetized keywords
This was merged back into the regular macros chapter, but a few references lingered and caused broken links.
1) Moved 'while' section below 'loop', 'break', and 'continue'; 2) Added information to 'while' and 'for' loops that they interact with 'break' and 'continue' and may have a lifetime label. 3) Clarified labeling syntax on the infinite loops.
Updated sample code to updated syntax (now compiles). Also tweaked the text to reflect the change.
Add section for range expressions.
Consistency. The book also refers to it as trait objects.
'win32' -> 'windows', added 'ios'
(And other kinds of items). This brings trait/impl items in line with top-level items in this respect. It means we don't get the attributes when showing error messages for methods, etc. (a good thing, I think). Since attributes have spans it is still easy to create a span for the item + all attributes.
* Add two missing keywords, `Self` and `proc` * Fix some mis-alphabetized keywords r? @steveklabnik
1) Moved 'while' section below 'loop', 'break', and 'continue'; 2) Added information to 'while' and 'for' loops that they interact with 'break' and 'continue' and may have a lifetime label. 3) Clarified labeling syntax on the infinite loops.
Updated sample code to updated syntax (now compiles). Also tweaked the text to reflect the change.
Add section for range expressions.
|
@bors: r+ p=20 |
|
📌 Commit a33b5d3 has been approved by |
|
@bors: r+ p=20 |
|
📌 Commit 131b5ac has been approved by |
bors
added a commit
that referenced
this pull request
Apr 24, 2015
This was referenced Apr 24, 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.
r? @Manishearth