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

add regression tests for stalled_on const vars #72061

Merged
merged 1 commit into from
May 26, 2020

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented May 9, 2020

closes #70180

Afaict this has been fixed sometime after #70213

trait_ref_type_vars correctly adds const infers and I did not find any remaining FIXMEs which correspond to this issue.

.filter(|arg| arg.has_infer_types_or_consts())
.flat_map(|arg| arg.walk())
.filter_map(TyOrConstInferVar::maybe_from_generic_arg)

Added both examples from the issue as regression tests and renamed trait_ref_type_vars -> trait_ref_infer_vars.

r? @eddyb

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 9, 2020
@lcnr lcnr changed the title add regression tests add regression tests for stalled_on const vars May 9, 2020
@joelpalmer joelpalmer added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 19, 2020
@eddyb
Copy link
Member

eddyb commented May 25, 2020

@lcnr According to #70213, #70164 fixed this. Oh but I forgot to add "fixes #70180" to #70164 (which is older than #70213). Juggling PRs can get tricky!

@bors r+

@bors
Copy link
Contributor

bors commented May 25, 2020

📌 Commit a8c152d has been approved by eddyb

@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 May 25, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request May 25, 2020
add regression tests for stalled_on const vars

closes rust-lang#70180

Afaict this has been fixed sometime after rust-lang#70213

`trait_ref_type_vars` correctly adds const infers and I did not find any remaining `FIXME`s which correspond to this issue.
https://github.com/rust-lang/rust/blob/7c59a81a5fcbaaca311f744cd7c68d99bfbb05d3/src/librustc_trait_selection/traits/fulfill.rs#L555-L557

Added both examples from the issue as regression tests and renamed `trait_ref_type_vars` -> `trait_ref_infer_vars`.

r? @eddyb
This was referenced May 25, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request May 25, 2020
Rollup of 5 pull requests

Successful merges:

 - rust-lang#72061 (add regression tests for stalled_on const vars)
 - rust-lang#72424 (fix ICE when debug-printing MIR)
 - rust-lang#72450 (Fix ice-rust-lang#72442)
 - rust-lang#72451 (Perform MIR NRVO even if types don't match)
 - rust-lang#72538 (Removed all instances of const_field.)

Failed merges:

r? @ghost
@bors bors merged commit b3f1b95 into rust-lang:master May 26, 2020
@lcnr lcnr deleted the const-inference-test branch May 26, 2020 07:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

const generic inference variables not properly tracked by traits/fulfill.
5 participants