Rollup of 7 pull requests #37514
Merged
Rollup of 7 pull requests #37514
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
GuillaumeGomez
commented
Nov 1, 2016
GuillaumeGomez
commented
- Successful merges: str: Fix documentation typo #36849, Remove TypeOrigin::RangeExpression #37059, run rustfmt on librustc_driver folder #37296, Fix a few links in the docs #37316, Update "Testing" chapter for 1.12 #37484, Don't mention "*" dependency version in guessing game example #37485, Commented out final 'main' function in order to fit within pattern of… #37495
- Failed merges:
from_utf8 returns a Result, not an Option. Signed-off-by: David Henningsson <diwic@ubuntu.com>
This variant became unused in rust-lang#30884.
I followed the "Testing" chapter using Rust 1.12.1 but there are some differences. By default the `tests` module is now also generated by `cargo new`, and the console output is updated.
It's a bad practice as far [RFC 1241] is concerned, and introducing it in early tutorial may as well make it feel legitimate. [RFC 1241]: https://github.com/rust-lang/rfcs/blob/master/text/1241-no-wildcard-deps.md
… other examples and prevent incorrect indentation
…amples in the Closures section
str: Fix documentation typo from_utf8 returns a Result, not an Option. Signed-off-by: David Henningsson diwic@ubuntu.com
…r=alexcrichton Remove TypeOrigin::RangeExpression This variant became unused in rust-lang#30884.
…komatsakis run rustfmt on librustc_driver folder
Fix a few links in the docs r? @steveklabnik
Update "Testing" chapter for 1.12 I followed the "Testing" chapter using Rust 1.12.1 but there are some differences. By default the `tests` module is now also generated by `cargo new`, and the console output is updated.
Don't mention "*" dependency version in guessing game example It's a bad practice as far [RFC 1241](https://github.com/rust-lang/rfcs/blob/master/text/1241-no-wildcard-deps.md) is concerned, and introducing it in early tutorial may as well make it feel legitimate.
Commented out final 'main' function in order to fit within pattern of… … other examples and prevent incorrect indentation
|
@bors: r+ p=1 |
|
📌 Commit f5c192a has been approved by |
|
r? @pnkfelix (rust_highfive has picked a reviewer for you, use r? to override) |
bors
added a commit
that referenced
this pull request
Nov 2, 2016
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.