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 6 pull requests #68305

Merged
merged 31 commits into from
Jan 17, 2020
Merged

Rollup of 6 pull requests #68305

merged 31 commits into from
Jan 17, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

varkor and others added 30 commits January 7, 2020 02:16
Suggest `impl Trait` when possible, and `Box<dyn Trait>` otherwise.
When a type error involves a `dyn Trait` as the return type, do not emit
the type error, as the "return type is not `Sized`" error will provide
enough information to the user.
Give named fields to `struct PrivacyError`
Move `fn report_ambiguity_error` to `diagnostics.rs`
When -Z panic_abort_tests is enabled, we use an environment variable to
tell the subprocess which test to invoke. If that subprocess then
invokes another Rust test binary, chaos ensues.
…ebank

Detail transitive containment in E0588 diagnostic

Fixes rust-lang#67383.
resolve: Point at the private item definitions in privacy errors

A basic version of rust-lang#67951.
r? @estebank
Account for common `impl Trait`/`dyn Trait` return type errors

- When all return paths have the same type, suggest `impl Trait`.
- When all return paths implement the expected `trait`, suggest `Box<dyn Trait>` and mention using an `enum`.
- When multiple different types are returned and `impl Trait` is expected, extend the explanation.
- When return type is `impl Trait` and the return paths do not implement `Trait`, point at the returned values.
- Split `src/librustc/traits/error_reporting.rs` into multiple files to keep size under control.

Fix rust-lang#68110, cc rust-lang#66523.
Fix some of the rustfmt fallout in Miri

re-post of rust-lang#67833 without the `rustfmt::skip`

r? @oli-obk
don't clone types that are copy

Found via clippy.

r? @eddyb
… r=alexcrichton

Don't propagate __RUST_TEST_INVOKE to subprocess

When -Z panic_abort_tests is enabled, we use an environment variable to
tell the subprocess which test to invoke. If that subprocess then
invokes another Rust test binary, chaos ensues.

r? @alexcrichton
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=6

@bors
Copy link
Contributor

bors commented Jan 17, 2020

📌 Commit 98347cd has been approved by Dylan-DPC

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 17, 2020
@Dylan-DPC-zz Dylan-DPC-zz added the rollup A PR which is a rollup label Jan 17, 2020
@bors
Copy link
Contributor

bors commented Jan 17, 2020

⌛ Testing commit 98347cd with merge 53cd49a6cf7d9200112ac3e02b67e43b2db0b2d9...

@rust-highfive
Copy link
Collaborator

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Jan 17, 2020

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 17, 2020
@Dylan-DPC-zz
Copy link
Author

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 17, 2020
@bors
Copy link
Contributor

bors commented Jan 17, 2020

⌛ Testing commit 98347cd with merge 2480c9e...

bors added a commit that referenced this pull request Jan 17, 2020
Rollup of 6 pull requests

Successful merges:

 - #67956 (Detail transitive containment in E0588 diagnostic)
 - #68153 (resolve: Point at the private item definitions in privacy errors)
 - #68195 (Account for common `impl Trait`/`dyn Trait` return type errors)
 - #68288 (Fix some of the rustfmt fallout in Miri)
 - #68292 (don't clone types that are copy)
 - #68301 (Don't propagate __RUST_TEST_INVOKE to subprocess)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Jan 17, 2020

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing 2480c9e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 17, 2020
@bors bors merged commit 98347cd into rust-lang:master Jan 17, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #68305!

Tested on commit 2480c9e.
Direct link to PR: #68305

🎉 rls on linux: test-fail → test-pass (cc @Xanewok, @rust-lang/infra).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants