Skip to content

Rollup of 4 pull requests #35971

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 10 commits into from
Aug 25, 2016
Merged

Rollup of 4 pull requests #35971

merged 10 commits into from
Aug 25, 2016

Conversation

matthew-piziak and others added 10 commits August 22, 2016 17:20
These examples are exactly analogous to those in PRs rust-lang#35709 and rust-lang#35806. I'll probably remove the `fn main` wrappers for `Add` and `Sub` once this is merged in.

Part of rust-lang#29365.

r? @steveklabnik
…laumeGomez

more evocative examples for `Sub` and `SubAssign`

These examples are exactly analogous to those in PRs rust-lang#35709 and rust-lang#35806. I'll probably remove the `fn main` wrappers for `Add` and `Sub` once this is merged in.

Part of rust-lang#29365.

r? @steveklabnik
… r=GuillaumeGomez

Update E0445 and E0454 to new error format

Fixes rust-lang#35922.
Fixes rust-lang#35930.
Part of rust-lang#35233.

r? @GuillaumeGomez
@sophiajt
Copy link
Contributor Author

@bors r+ p=1

@bors
Copy link
Collaborator

bors commented Aug 24, 2016

📌 Commit 2932db1 has been approved by jonathandturner

@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 Aug 25, 2016

⌛ Testing commit 2932db1 with merge 0ccd5c8...

bors added a commit that referenced this pull request Aug 25, 2016
Rollup of 4 pull requests

- Successful merges: #35876, #35920, #35948, #35961
- Failed merges: #35395
@bors bors merged commit 2932db1 into rust-lang:master Aug 25, 2016
@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.

9 participants