Highlight conflicting param-env candidates by compiler-errors · Pull Request #98794 · rust-lang/rust

compiler-errors · 2022-07-02T02:21:34Z

This could probably be further improved by noting why equivalent param-env candidates (modulo regions) leads to ambiguity.

Fixes #98786

rust-highfive · 2022-07-02T02:21:38Z

r? @michaelwoerister

(rust-highfive has picked a reviewer for you, use r? to override)

cjgillot · 2022-07-02T08:50:31Z

compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs

Suggested change

Ok(span) => spans.push(self.tcx.sess.source_map().guess_head_span(span)),

Ok(span) => spans.push(span),

You shouldn't need guess_head_span any more.

Why isn't it needed anymore?

@michaelwoerister, cjgillot changed the def_span (and thus span_of_impl) to point to the head span by default, so guess_head_span is redundant.

michaelwoerister · 2022-07-06T14:55:05Z

Is this blocked on #98869?

michaelwoerister · 2022-07-06T14:59:38Z

Feel free to r=me, otherwise.

bors · 2022-07-06T23:36:01Z

☔ The latest upstream changes (presumably #98987) made this pull request unmergeable. Please resolve the merge conflicts.

compiler-errors · 2022-07-08T02:53:03Z

@bors r=michaelwoerister

bors · 2022-07-08T02:53:05Z

📌 Commit 424a0e66bb12d1aa3d121d4d00afbdb244677297 has been approved by michaelwoerister

It is now in the queue for this repository.

compiler-errors · 2022-07-08T03:25:30Z

Shoot, mixed two of my PRs, lol.

@bors r-

compiler-errors · 2022-07-08T03:27:39Z

There we go.

@bors r=michaelwoerister

bors · 2022-07-08T03:27:41Z

📌 Commit b869997c4ca2a0e516ff0567bfdbfbeddc956443 has been approved by michaelwoerister

It is now in the queue for this repository.

compiler-errors · 2022-07-08T03:34:09Z

@bors r-

compiler-errors · 2022-07-08T03:53:36Z

I will be patient and wait until CI is green.

michaelwoerister · 2022-07-08T08:18:01Z

@bors r+

bors · 2022-07-08T08:18:02Z

📌 Commit 0813525 has been approved by michaelwoerister

It is now in the queue for this repository.

Rollup of 4 pull requests Successful merges: - rust-lang#98533 (Add a `-Zdump-drop-tracking-cfg` debugging flag) - rust-lang#98654 (An optimization for `pest-2.1.3`) - rust-lang#98657 (Migrate some diagnostics from `rustc_const_eval` to `SessionDiagnostic`) - rust-lang#98794 (Highlight conflicting param-env candidates) Failed merges: - rust-lang#98957 ( don't allow ZST in ScalarInt ) r? `@ghost` `@rustbot` modify labels: rollup

Revert "Highlight conflicting param-env candidates" This reverts rust-lang#98794, commit 0813525. Seems to have caused an incremental compilation bug. The root cause of the incr comp bug is somewhat unrelated but is triggered by this PR, so I don't feel comfortable with having this PR in the codebase until it can be investigated further. Fixes rust-lang#99233.

…env-2, r=estebank Highlight conflicting param-env candidates, again Un-reverts rust-lang#98794 (i.e. reverts rust-lang#99290). The previous time I attempted to land this PR, it was because of an incremental issue (rust-lang#99233). The repro instructions in the issue is no longer manifest the ICE -- I think it's because this ambiguity code was refactored (I think by `@lcnr)` to no longer store the ambiguities in the fulfillment error, but instead recompute them on the fly. The main motivation for trying to re-land this is that it fixes rust-lang#105131 by highlighting the root-cause of the issue, which is conflicting param-env candidates: ``` error[E0283]: type annotations needed: cannot satisfy `Self: Gen<'source>` | note: multiple `impl`s or `where` clauses satisfying `Self: Gen<'source>` found --> $DIR/conflicting-bounds.rs:3:1 | LL | pub trait Gen<'source> { | ^^^^^^^^^^^^^^^^^^^^^^ ... LL | Self: for<'s> Gen<'s, Output = T>; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error For more information about this error, try `rustc --explain E0283`. ``` Fixes rust-lang#105131. Fixes (again) rust-lang#98786

…env-2, r=estebank Highlight conflicting param-env candidates, again Un-reverts rust-lang#98794 (i.e. reverts rust-lang#99290). The previous time I attempted to land this PR, it was because of an incremental issue (rust-lang#99233). The repro instructions in the issue is no longer manifest the ICE -- I think it's because this ambiguity code was refactored (I think by ``@lcnr)`` to no longer store the ambiguities in the fulfillment error, but instead recompute them on the fly. The main motivation for trying to re-land this is that it fixes rust-lang#105131 by highlighting the root-cause of the issue, which is conflicting param-env candidates: ``` error[E0283]: type annotations needed: cannot satisfy `Self: Gen<'source>` | note: multiple `impl`s or `where` clauses satisfying `Self: Gen<'source>` found --> $DIR/conflicting-bounds.rs:3:1 | LL | pub trait Gen<'source> { | ^^^^^^^^^^^^^^^^^^^^^^ ... LL | Self: for<'s> Gen<'s, Output = T>; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error For more information about this error, try `rustc --explain E0283`. ``` Fixes rust-lang#105131. Fixes (again) rust-lang#98786

…env-2, r=estebank Highlight conflicting param-env candidates, again Un-reverts rust-lang#98794 (i.e. reverts rust-lang#99290). The previous time I attempted to land this PR, it was because of an incremental issue (rust-lang#99233). The repro instructions in the issue is no longer manifest the ICE -- I think it's because this ambiguity code was refactored (I think by `@lcnr)` to no longer store the ambiguities in the fulfillment error, but instead recompute them on the fly. The main motivation for trying to re-land this is that it fixes rust-lang#105131 by highlighting the root-cause of the issue, which is conflicting param-env candidates: ``` error[E0283]: type annotations needed: cannot satisfy `Self: Gen<'source>` | note: multiple `impl`s or `where` clauses satisfying `Self: Gen<'source>` found --> $DIR/conflicting-bounds.rs:3:1 | LL | pub trait Gen<'source> { | ^^^^^^^^^^^^^^^^^^^^^^ ... LL | Self: for<'s> Gen<'s, Output = T>; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error For more information about this error, try `rustc --explain E0283`. ``` Fixes rust-lang#105131. Fixes (again) rust-lang#98786

…env-2, r=estebank Highlight conflicting param-env candidates, again Un-reverts rust-lang#98794 (i.e. reverts rust-lang#99290). The previous time I attempted to land this PR, it was because of an incremental issue (rust-lang#99233). The repro instructions in the issue is no longer manifest the ICE -- I think it's because this ambiguity code was refactored (I think by ``@lcnr)`` to no longer store the ambiguities in the fulfillment error, but instead recompute them on the fly. The main motivation for trying to re-land this is that it fixes rust-lang#105131 by highlighting the root-cause of the issue, which is conflicting param-env candidates: ``` error[E0283]: type annotations needed: cannot satisfy `Self: Gen<'source>` | note: multiple `impl`s or `where` clauses satisfying `Self: Gen<'source>` found --> $DIR/conflicting-bounds.rs:3:1 | LL | pub trait Gen<'source> { | ^^^^^^^^^^^^^^^^^^^^^^ ... LL | Self: for<'s> Gen<'s, Output = T>; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error For more information about this error, try `rustc --explain E0283`. ``` Fixes rust-lang#105131. Fixes (again) rust-lang#98786

…env-2, r=estebank Highlight conflicting param-env candidates, again Un-reverts rust-lang#98794 (i.e. reverts rust-lang#99290). The previous time I attempted to land this PR, it was because of an incremental issue (rust-lang#99233). The repro instructions in the issue is no longer manifest the ICE -- I think it's because this ambiguity code was refactored (I think by ```@lcnr)``` to no longer store the ambiguities in the fulfillment error, but instead recompute them on the fly. The main motivation for trying to re-land this is that it fixes rust-lang#105131 by highlighting the root-cause of the issue, which is conflicting param-env candidates: ``` error[E0283]: type annotations needed: cannot satisfy `Self: Gen<'source>` | note: multiple `impl`s or `where` clauses satisfying `Self: Gen<'source>` found --> $DIR/conflicting-bounds.rs:3:1 | LL | pub trait Gen<'source> { | ^^^^^^^^^^^^^^^^^^^^^^ ... LL | Self: for<'s> Gen<'s, Output = T>; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error For more information about this error, try `rustc --explain E0283`. ``` Fixes rust-lang#105131. Fixes (again) rust-lang#98786

…env-2, r=estebank Highlight conflicting param-env candidates, again Un-reverts rust-lang#98794 (i.e. reverts rust-lang#99290). The previous time I attempted to land this PR, it was because of an incremental issue (rust-lang#99233). The repro instructions in the issue is no longer manifest the ICE -- I think it's because this ambiguity code was refactored (I think by ````@lcnr)```` to no longer store the ambiguities in the fulfillment error, but instead recompute them on the fly. The main motivation for trying to re-land this is that it fixes rust-lang#105131 by highlighting the root-cause of the issue, which is conflicting param-env candidates: ``` error[E0283]: type annotations needed: cannot satisfy `Self: Gen<'source>` | note: multiple `impl`s or `where` clauses satisfying `Self: Gen<'source>` found --> $DIR/conflicting-bounds.rs:3:1 | LL | pub trait Gen<'source> { | ^^^^^^^^^^^^^^^^^^^^^^ ... LL | Self: for<'s> Gen<'s, Output = T>; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error For more information about this error, try `rustc --explain E0283`. ``` Fixes rust-lang#105131. Fixes (again) rust-lang#98786

…v-2, r=estebank Highlight conflicting param-env candidates, again Un-reverts rust-lang#98794 (i.e. reverts rust-lang#99290). The previous time I attempted to land this PR, it was because of an incremental issue (rust-lang#99233). The repro instructions in the issue is no longer manifest the ICE -- I think it's because this ambiguity code was refactored (I think by `@lcnr)` to no longer store the ambiguities in the fulfillment error, but instead recompute them on the fly. The main motivation for trying to re-land this is that it fixes rust-lang#105131 by highlighting the root-cause of the issue, which is conflicting param-env candidates: ``` error[E0283]: type annotations needed: cannot satisfy `Self: Gen<'source>` | note: multiple `impl`s or `where` clauses satisfying `Self: Gen<'source>` found --> $DIR/conflicting-bounds.rs:3:1 | LL | pub trait Gen<'source> { | ^^^^^^^^^^^^^^^^^^^^^^ ... LL | Self: for<'s> Gen<'s, Output = T>; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error For more information about this error, try `rustc --explain E0283`. ``` Fixes rust-lang#105131. Fixes (again) rust-lang#98786

rust-highfive assigned michaelwoerister Jul 2, 2022

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 2, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 2, 2022

compiler-errors force-pushed the conflicting-param-env branch from 5216d07 to 937fda5 Compare July 2, 2022 02:22

cjgillot reviewed Jul 2, 2022

View reviewed changes

compiler-errors mentioned this pull request Jul 4, 2022

Remove some usages of guess_head_span #98869

Merged

compiler-errors force-pushed the conflicting-param-env branch from 937fda5 to 424a0e6 Compare July 8, 2022 02:52

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 Jul 8, 2022

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 8, 2022

compiler-errors force-pushed the conflicting-param-env branch from 424a0e6 to b869997 Compare July 8, 2022 03:27

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 8, 2022

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 8, 2022

Highlight conflicting param-env candidates

0813525

compiler-errors force-pushed the conflicting-param-env branch from b869997 to 0813525 Compare July 8, 2022 03:51

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 8, 2022

Dylan-DPC mentioned this pull request Jul 8, 2022

Rollup of 4 pull requests #99054

Merged

bors merged commit 54dde86 into rust-lang:master Jul 8, 2022

rustbot added this to the 1.64.0 milestone Jul 8, 2022

lqd mentioned this pull request Jul 15, 2022

ICE: Failed to extract DefId: local_def_id_to_hir_id #99233

Closed

compiler-errors mentioned this pull request Jul 15, 2022

Revert "Highlight conflicting param-env candidates" #99290

Merged

compiler-errors mentioned this pull request Dec 5, 2022

Highlight conflicting param-env candidates, again #105285

Merged

compiler-errors deleted the conflicting-param-env branch August 11, 2023 19:57

	Ok(span) => spans.push(self.tcx.sess.source_map().guess_head_span(span)),
	Ok(span) => spans.push(span),

Uh oh!

Conversation

compiler-errors commented Jul 2, 2022

Uh oh!

rust-highfive commented Jul 2, 2022

Uh oh!

cjgillot Jul 2, 2022

Choose a reason for hiding this comment

Uh oh!

michaelwoerister Jul 4, 2022

Choose a reason for hiding this comment

Uh oh!

compiler-errors Jul 4, 2022

Choose a reason for hiding this comment

Uh oh!

michaelwoerister commented Jul 6, 2022

Uh oh!

michaelwoerister commented Jul 6, 2022

Uh oh!

bors commented Jul 6, 2022

Uh oh!

compiler-errors commented Jul 8, 2022

Uh oh!

bors commented Jul 8, 2022

Uh oh!

compiler-errors commented Jul 8, 2022

Uh oh!

compiler-errors commented Jul 8, 2022

Uh oh!

bors commented Jul 8, 2022

Uh oh!

compiler-errors commented Jul 8, 2022

Uh oh!

compiler-errors commented Jul 8, 2022

Uh oh!

michaelwoerister commented Jul 8, 2022

Uh oh!

bors commented Jul 8, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants