Rollup of 7 pull requests #27512
Merged
Rollup of 7 pull requests #27512
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
Manishearth
commented
Aug 4, 2015
- Successful merges: Clarifications for Hello, Cargo! #27397, doc: prelude nits #27398, Fix "Ignoring variants" in "Patterns" chapter #27460, Add diagnostic messages for E0074-E0077 #27470, Improve E0423 error message #27491, Post merge changes to #27488 #27498, small fix in RELEASES #27502
- Failed merges:
Just a few minor changes to clarify a few things for someone new to Rust and Cargo.
Guessing Game states that "Rust only imports a few things into every program, the ‘prelude’". That isn't strictly true. That is all it imports by default and the change clarifies that point.
- Fix rust-lang#26968 by noting the difference between ".." and "_" more explicitly - Change one of the examples to show the match-all behaviour of ".." - Merge "Ignoring variants" and "Ignoring bindings" sections into the latter
this grammar isn't correct
Clarifications for those new to Rust and Cargo: * It's a good idea to get rid of the original `main.exe` in project root * Slight clarification on the use of `main.rs` vs `lib.rs` * Clarify that the TOML file needs to be in project root
- Fix rust-lang#26968 by noting the difference between ".." and "_" more explicitly - Change one of the examples to show the match-all behaviour of ".." - Merge "Ignoring variants" and "Ignoring bindings" sections into the latter r? @steveklabnik
this grammar isn't correct this should also get backported to beta /cc @brson
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ p=5 force |
|
📌 Commit 614f640 has been approved by |
|
⌛ Testing commit 614f640 with merge 4b79add... |
bors
added a commit
that referenced
this pull request
Aug 4, 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.