Skip to content

Rollup of 7 pull requests - #37289

Merged
bors merged 14 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup
Oct 20, 2016
Merged

Rollup of 7 pull requests#37289
bors merged 14 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup

Conversation

GuillaumeGomezand 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
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @eddyb

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

@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors: r+ p=1

@bors

bors commented Oct 19, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit dd3a014 has been approved by GuillaumeGomez

@bors

bors commented Oct 20, 2016

Copy link
Copy Markdown
Collaborator

⌛ 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:masterOct 20, 2016
@GuillaumeGomez
GuillaumeGomez deleted the rollup branch October 20, 2016 09:30
@CentrilCentril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollup

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

@GuillaumeGomez@rust-highfive@bors@eddyb@Centril@frewsxcv@zackmdavis@posborne@srinivasreddy