Skip to content

add regression tests for stalled_on const vars - #72061

Merged
bors merged 1 commit into
rust-lang:masterfrom
lcnr:const-inference-test
May 26, 2020
Merged

add regression tests for stalled_on const vars#72061
bors merged 1 commit into
rust-lang:masterfrom
lcnr:const-inference-test

Conversation

@lcnr

@lcnrlcnr commented May 9, 2020

Copy link
Copy Markdown
Contributor

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.

rust/src/librustc_trait_selection/traits/fulfill.rs

Lines 555 to 557 in 7c59a81

.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-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 9, 2020
@lcnrlcnr changed the title add regression testsadd regression tests for stalled_on const varsMay 9, 2020
@joelpalmerjoelpalmer 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

eddyb commented May 25, 2020

Copy link
Copy Markdown
Contributor

@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

bors commented May 25, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit a8c152d has been approved by eddyb

@borsbors 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
@Dylan-DPC
Rollup merge ofrust-lang#72061- lcnr:const-inference-test, r=eddyb
04daee2
add regression tests for stalled_on const vars
closesrust-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
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 25, 2020
@bors
Auto merge ofrust-lang#72589- Dylan-DPC:rollup-7l2a2bo, r=Dylan-DPC
698c5c6
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:masterMay 26, 2020
@lcnr
lcnr deleted the const-inference-test branch May 26, 2020 07:19
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@eddybeddyb

Labels

S-waiting-on-borsStatus: 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.

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

5 participants

@lcnr@eddyb@bors@rust-highfive@joelpalmer