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

Resolve vars in result from scrape_region_constraints #112196

Merged
merged 1 commit into from
Jun 6, 2023

Conversation

compiler-errors
Copy link
Member

@compiler-errors compiler-errors commented Jun 2, 2023

Since we perform type_op::Normalize in the local infcx when the new solver is enabled, vars aren't necessarily resolved, which triggers this ICE:

if D::forbid_inference_vars() {

There are more tests that go from ICE -> pass due to this change, but I just added revisions to a few for CI.

r? @lcnr

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 2, 2023
@@ -1,6 +1,6 @@
// run-pass
// If `Index` used an associated type for its output, this test would
Copy link
Member Author

Choose a reason for hiding this comment

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

Index does use an associated type in the ... 8? years since this test was written 😁

Copy link
Contributor

@lcnr lcnr left a comment

Choose a reason for hiding this comment

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

r=me after a style nit

Comment on lines 63 to 64
Op: super::TypeOp<'tcx, Output = R>,
R: TypeFoldable<TyCtxt<'tcx>>,
Copy link
Contributor

Choose a reason for hiding this comment

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

can you move that to where bounds instead?

@compiler-errors
Copy link
Member Author

moved bounds to where clauses

@bors r=lcnr

@bors
Copy link
Contributor

bors commented Jun 5, 2023

📌 Commit 979379a has been approved by lcnr

It is now in the queue for this repository.

@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 Jun 5, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 5, 2023
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#112081 (Avoid ICE on `#![doc(test(...)]` with literal parameter)
 - rust-lang#112196 (Resolve vars in result from `scrape_region_constraints`)
 - rust-lang#112303 (Normalize in infcx instead of globally for `Option::as_deref` suggestion)
 - rust-lang#112316 (Ensure space is inserted after keyword in `unused_delims`)
 - rust-lang#112318 (Merge method, type and const object safety checks)
 - rust-lang#112322 (Don't mention `IMPLIED_BOUNDS_ENTAILMENT` if signatures reference error)

Failed merges:

 - rust-lang#112251 (rustdoc: convert `if let Some()` that always matches to variable)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9ce0c79 into rust-lang:master Jun 6, 2023
11 checks passed
@rustbot rustbot added this to the 1.72.0 milestone Jun 6, 2023
@compiler-errors compiler-errors deleted the new-solver-resolv branch August 11, 2023 20:09
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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants