Skip to content

Detect mistyped associated consts in Instance::resolve.#70970

Merged
bors merged 2 commits intorust-lang:masterfrom
eddyb:trait-vs-impl-mismatch
Apr 22, 2020
Merged

Detect mistyped associated consts in Instance::resolve.#70970
bors merged 2 commits intorust-lang:masterfrom
eddyb:trait-vs-impl-mismatch

Conversation

@eddyb
Copy link
Member

@eddyb eddyb commented Apr 10, 2020 •
edited
Loading

Based on #71049 to prevent redundant/misleading downstream errors.

Fixes #70942 by refusing to resolve an associated const if it doesn't have the same type in the impl that it does in the trait (which we assume had errored, and delay_span_bug guards against bugs).

@rust-highfive
Copy link
Contributor

rust-highfive commented Apr 10, 2020

r? @petrochenkov

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 10, 2020
@eddyb eddyb force-pushed the trait-vs-impl-mismatch branch from e522c8a to 65ce098 Compare April 10, 2020 02:26
@eddyb
Copy link
Member Author

eddyb commented Apr 10, 2020

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

rust-timer commented Apr 10, 2020

Awaiting bors try build completion

@bors
Copy link
Collaborator

bors commented Apr 10, 2020

⌛ Trying commit 65ce0985c9462170b4ee97b1f9af493ac6d2976b with merge 2ffb9a054b7827a50003601cf5c67a1f483cc0c1...

@bors
Copy link
Collaborator

bors commented Apr 10, 2020

☀️ Try build successful - checks-azure
Build commit: 2ffb9a054b7827a50003601cf5c67a1f483cc0c1 (2ffb9a054b7827a50003601cf5c67a1f483cc0c1)

@rust-timer
Copy link
Collaborator

rust-timer commented Apr 10, 2020

Queued 2ffb9a054b7827a50003601cf5c67a1f483cc0c1 with parent 0c835b0, future comparison URL.

@rust-timer
Copy link
Collaborator

rust-timer commented Apr 10, 2020

Finished benchmarking try commit 2ffb9a054b7827a50003601cf5c67a1f483cc0c1, comparison URL.

@eddyb
Copy link
Member Author

eddyb commented Apr 10, 2020

Huh, I guess this is fast enough.

r? @oli-obk cc @nikomatsakis

This was referenced Apr 10, 2020
Closed
Merged
@RalfJung
Copy link
Member

RalfJung commented Apr 10, 2020 •
edited
Loading

Thanks! I take it we still need to keep the TransmuteSizeDiff hack?

The testcase for that is ui/consts/transmute-size-mismatch-before-typeck.rs. It looks superficially related in the "we are evaluating ill-typed MIR" sense, but maybe that's just me being naive.

eddyb
eddyb commented Apr 10, 2020
View reviewed changes
@eddyb eddyb mentioned this pull request Apr 11, 2020
Merged
@eddyb eddyb force-pushed the trait-vs-impl-mismatch branch from 65ce098 to 1dd0d8a Compare April 12, 2020 04:13
@eddyb eddyb changed the title Detect mistyped associated consts in Instance::resolve. Detect mistyped associated consts in Instance::resolve. Apr 12, 2020
@eddyb eddyb force-pushed the trait-vs-impl-mismatch branch from 1dd0d8a to a8819dc Compare April 12, 2020 04:22
@eddyb eddyb added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Apr 12, 2020
@eddyb
Copy link
Member Author

eddyb commented Apr 12, 2020

Blocked on #71049.

@eddyb eddyb force-pushed the trait-vs-impl-mismatch branch from a8819dc to e5bcc6b Compare April 12, 2020 18:59
@eddyb eddyb mentioned this pull request Apr 13, 2020
Merged
@eddyb eddyb force-pushed the trait-vs-impl-mismatch branch from e5bcc6b to 2a52cd5 Compare April 14, 2020 21:26
@bors
Copy link
Collaborator

bors commented Apr 15, 2020

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

nikomatsakis
nikomatsakis approved these changes Apr 15, 2020
View reviewed changes
Copy link
Contributor

@nikomatsakis nikomatsakis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(All looks good to me, from a quick read)

@eddyb eddyb force-pushed the trait-vs-impl-mismatch branch from 2a52cd5 to eb4b503 Compare April 16, 2020 18:48
@eddyb eddyb force-pushed the trait-vs-impl-mismatch branch from eb4b503 to 289f46a Compare April 18, 2020 15:40
@oli-obk
Copy link
Contributor

oli-obk commented Apr 22, 2020

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 22, 2020

📌 Commit 289f46a has been approved by oli-obk

@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-blocked Status: Blocked on something else such as an RFC or other implementation work. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 22, 2020
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Apr 22, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 22, 2020
@bors
Auto merge of rust-lang#71424 - Dylan-DPC:rollup-iunh61a, r=Dylan-DPC
00f677d 
Rollup of 6 pull requests

Successful merges:

 - rust-lang#70970 (Detect mistyped associated consts in `Instance::resolve`.)
 - rust-lang#71203 (Correct await span for async-await error reporting)
 - rust-lang#71214 (Add error code for inner doc error)
 - rust-lang#71337 (Moving all rustdoc-ui tests to check-pass)
 - rust-lang#71412 (Clarify unused_doc_comments note on macro invocations)
 - rust-lang#71414 (More diagnostic items for Clippy usage)

Failed merges:

r? @ghost
@bors bors merged commit 707004c into rust-lang:master Apr 22, 2020
@eddyb eddyb deleted the trait-vs-impl-mismatch branch April 27, 2020 01:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nikomatsakis nikomatsakis nikomatsakis approved these changes

Assignees

@oli-obk oli-obk

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[trait constants] thread 'rustc' panicked at 'assertion failed: (left == right) ...'

8 participants

@eddyb @rust-highfive @rust-timer @bors @RalfJung @oli-obk @nikomatsakis @petrochenkov