Rollup of 6 pull requests#68305

Dylan-DPC-zz · 2020-01-17T05:46:43Z

Successful merges:

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

Failed merges:

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`

found via clippy

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.

@estebank

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.

@oli-obk

Fix some of the rustfmt fallout in Miri re-post of rust-lang#67833 without the `rustfmt::skip` r? @oli-obk

@eddyb

don't clone types that are copy Found via clippy. r? @eddyb

@alexcrichton

… 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 · 2020-01-17T05:47:47Z

@bors r+ rollup=never p=6

bors · 2020-01-17T05:47:49Z

📌 Commit 98347cd has been approved by Dylan-DPC

bors · 2020-01-17T07:43:56Z

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

rust-highfive · 2020-01-17T07:46:30Z

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 · 2020-01-17T07:46:43Z

💔 Test failed - checks-azure

Dylan-DPC-zz · 2020-01-17T08:43:52Z

@bors retry

bors · 2020-01-17T09:17:28Z

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

@ghost

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 · 2020-01-17T12:24:59Z

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

rust-highfive · 2020-01-17T12:26:25Z

📣 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).

@Xanewok

Tested on commit rust-lang/rust@2480c9e. Direct link to PR: <rust-lang/rust#68305> 🎉 rls on linux: test-fail → test-pass (cc @Xanewok, @rust-lang/infra).

varkor and others added 30 commits January 7, 2020 02:16

Detail transitive containment in E0588 diagnostic

3ab95ce

Specific error for unsized dyn Trait return type

6fd5641

Suggest `impl Trait` when possible, and `Box<dyn Trait>` otherwise.

Account for diverging types in return impl Trait

75eabb1

Elide E0308 errors in favor of E0746

ea7e885

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.

Make impl Trait suggestion in E0746 MachineApplicable

b4bbe78

When trait bounds are missing for return values, point at them

e1dd8a9

fmt

93293c5

Add E0746 explanation to the index

4c13d25

fix rustfmt fallout

9dee5d5

Split librustc/traits/error_reporting.rs

00c8272

fix error code index comment

4a75ef9

review comments

5b36c18

review comments

509cb33

Fix error index test

c305ac3

review comments

d7a6212

Account for object safety when suggesting Box<dyn Trait>

00e2626

let rustfmt undo most of my edits :(

3fd1af5

adjust Deref comment

c781d15

resolve: Move privacy error reporting into a separate method

0f70daa

Give named fields to `struct PrivacyError` Move `fn report_ambiguity_error` to `diagnostics.rs`

resolve: Point at the private item definitions in privacy errors

28c3f6e

resolve: Say "import" when reporting private imports

c84efe9

Ignore some tests on platforms without libstd spans

0b60f1f

review comments

029a9c6

don't clone types that are copy

7fbd30b

found via clippy

Don't propagate __RUST_TEST_INVOKE to subprocess

6246f7e

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.

Rollup merge of rust-lang#67956 - varkor:E0588-provide-context, r=est…

9f4b328

…ebank Detail transitive containment in E0588 diagnostic Fixes rust-lang#67383.

Rollup merge of rust-lang#68153 - petrochenkov:privdiag, r=estebank

ecf42a3

resolve: Point at the private item definitions in privacy errors A basic version of rust-lang#67951. r? @estebank

Rollup merge of rust-lang#68288 - RalfJung:fmt, r=oli-obk

c411c22

Fix some of the rustfmt fallout in Miri re-post of rust-lang#67833 without the `rustfmt::skip` r? @oli-obk

Rollup merge of rust-lang#68292 - matthiaskrgr:clone_on_copy, r=eddyb

5d55877

don't clone types that are copy Found via clippy. r? @eddyb

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 added the rollup A PR which is a rollup label Jan 17, 2020

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

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 added the merged-by-bors This PR was explicitly merged by bors. label Jan 17, 2020

bors merged commit 98347cd into rust-lang:master Jan 17, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 6 pull requests#68305