Skip to content

Rollup of 7 pull requests #37514

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 15 commits into from
Nov 2, 2016
Merged

Rollup of 7 pull requests #37514

merged 15 commits into from
Nov 2, 2016

Conversation

diwic and others added 15 commits September 30, 2016 06:13
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
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
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
@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=1

@bors
Copy link
Collaborator

bors commented Nov 1, 2016

📌 Commit f5c192a has been approved by GuillaumeGomez

@rust-highfive
Copy link
Contributor

r? @pnkfelix

(rust_highfive has picked a reviewer for you, use r? to override)

@bors
Copy link
Collaborator

bors commented Nov 2, 2016

⌛ Testing commit f5c192a with merge 3fba503...

bors added a commit that referenced this pull request Nov 2, 2016
Rollup of 7 pull requests

- Successful merges: #36849, #37059, #37296, #37316, #37484, #37485, #37495
- Failed merges:
@bors bors merged commit f5c192a into rust-lang:master Nov 2, 2016
@GuillaumeGomez GuillaumeGomez deleted the rollup branch November 2, 2016 10:48
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.