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 8 pull requests #37837

Merged
merged 19 commits into from
Nov 17, 2016
Merged

Rollup of 8 pull requests #37837

merged 19 commits into from
Nov 17, 2016

Conversation

arielb1 and others added 19 commits November 13, 2016 18:54
Impls with a erroneous trait ref are already ignored in the first part
of coherence, so ignore them in the second part too. This avoids
cascading coherence errors when 1 impl of a trait has an error.
Similar to pull request rust-lang#37430, this makes the message more copy-paste
friendly and aligns it with other messages like:

    help: you can import it into scope: use foo::Bar;
…sakis

coherence: skip impls with an erroneous trait ref

Impls with a erroneous trait ref are already ignored in the first part
of coherence, so ignore them in the second part too. This avoids
cascading coherence errors when 1 impl of a trait has an error.

r? @nikomatsakis
…olon, r=eddyb

Add semicolon to "perhaps add a `use` for one of them" help

Similar to pull request rust-lang#37430, this makes the message more copy-paste
friendly and aligns it with other messages like:

    help: you can import it into scope: use foo::Bar;

r? @eddyb
…ure, r=steveklabnik

Add sections about testing concurrency and stdout/err capture
add test for rust-lang#37765

Adds a test for rust-lang#37765, a path parsing fix which removes the need for a parenthesis workaround.

Closes rust-lang#37765.
cc rust-lang#37290 @withoutboats
r? @petrochenkov
…, r=nikomatsakis

ICH: Add test case for type alias definitions

r? @nikomatsakis
@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=1

@bors
Copy link
Collaborator

bors commented Nov 17, 2016

📌 Commit 850e355 has been approved by GuillaumeGomez

@rust-highfive
Copy link
Contributor

r? @alexcrichton

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

@bors
Copy link
Collaborator

bors commented Nov 17, 2016

⌛ Testing commit 850e355 with merge 89386d6...

bors added a commit that referenced this pull request Nov 17, 2016
Rollup of 8 pull requests

- Successful merges: #37752, #37757, #37759, #37766, #37772, #37799, #37806, #37821
- Failed merges: #37442
@bors bors merged commit 850e355 into rust-lang:master Nov 17, 2016
@GuillaumeGomez GuillaumeGomez deleted the rollup branch November 18, 2016 10:20
@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.

10 participants