Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Rollup of 7 pull requests #37289

Merged
merged 14 commits into from
Oct 20, 2016
Merged

Rollup of 7 pull requests #37289

merged 14 commits into from
Oct 20, 2016

Conversation

GuillaumeGomez and others added 14 commits October 14, 2016 15:34
In rust-lang#34268 (8531d58), we replaced matches of None to the unit value `()`
with `if let`s in places where it was deemed that this made the code
unambiguously clearer and more idiomatic. In rust-lang#34638 (d37edef), we did
the same for matches of None to the empty block `{}`.

A casual observer, upon seeing these commits fly by, might suppose that
the matter was then settled, that no further pull requests on this
utterly trivial point of style could or would be made. Unless ...

It turns out that sometimes people write the empty block with a space in
between the braces. Who knew?
…ster

Improve doc example for `std::borrow::Cow`.

None
…empty_block_arm, r=nikomatsakis

prefer `if let` to match with `None => { }` arm in some places

In rust-lang#34268 (8531d58), we replaced matches of None to the unit value `()`
with `if let`s in places where it was deemed that this made the code
unambiguously clearer and more idiomatic. In rust-lang#34638 (d37edef), we did
the same for matches of None to the empty block `{}`.

A casual observer, upon seeing these commits fly by, might suppose that
the matter was then settled, that no further pull requests on this
utterly trivial point of style could or would be made. Unless ...

It turns out that sometimes people write the empty block with a space in
between the braces. Who knew?
…es, r=steveklabnik

Fix grammatical errors in `tests` directory docs
run rustfmt on control_flow_graph folder
@rust-highfive
Copy link
Collaborator

r? @eddyb

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

@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented Oct 19, 2016

📌 Commit dd3a014 has been approved by GuillaumeGomez

@bors
Copy link
Contributor

bors commented Oct 20, 2016

⌛ Testing commit dd3a014 with merge dfd98eb...

bors added a commit that referenced this pull request Oct 20, 2016
Rollup of 7 pull requests

- Successful merges: #37165, #37187, #37241, #37283, #37285, #37287, #37288
- Failed merges:
@bors bors merged commit dd3a014 into rust-lang:master Oct 20, 2016
@GuillaumeGomez GuillaumeGomez deleted the rollup branch October 20, 2016 09:30
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants