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.

Sign up for GitHub

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

Jump to bottom

Preserve substs in opaques recorded in typeck results #111980

Merged
merged 3 commits into from
Jun 1, 2023
Merged

Preserve substs in opaques recorded in typeck results #111980

merged 3 commits into from
Jun 1, 2023

Conversation

compiler-errors
Copy link
Member

This means that we now prepopulate MIR with opaques with the right substs.

The first commit is a hack that I think we discussed, having to do with DefiningAnchor::Bubble basically being equivalent to DefiningAnchor::Error in the new solver, so having to use DefiningAnchor::Bind instead, lol.

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 May 26, 2023
lcnr
lcnr reviewed May 26, 2023
View reviewed changes
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 nits

there's still the FIXME that the substs are wrong when calling register_predefined_opaques_in_new_solver, please remove that

compiler/rustc_borrowck/src/region_infer/opaque_types.rs Show resolved Hide resolved
compiler/rustc_hir_analysis/src/collect/type_of/opaque.rs Outdated Show resolved Hide resolved
compiler/rustc_hir_analysis/src/collect/type_of/opaque.rs Outdated Show resolved Hide resolved
@lcnr lcnr mentioned this pull request May 26, 2023
Closed
@compiler-errors
Copy link
Member Author

@bors r=lcnr

@bors
Copy link
Contributor

bors commented May 26, 2023

📌 Commit 3d09b99 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 May 26, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@compiler-errors
Copy link
Member Author

@bors r-

@bors 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 May 26, 2023
@lcnr lcnr mentioned this pull request May 26, 2023
Closed
@oli-obk oli-obk self-assigned this May 27, 2023
@oli-obk

This comment was marked as resolved.

Sign in to view
@compiler-errors
Copy link
Member Author

Addressed outstanding revert comment.

@bors r=lcnr

@bors
Copy link
Contributor

bors commented May 31, 2023

📌 Commit df1c1af 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 31, 2023
@Dylan-DPC Dylan-DPC mentioned this pull request Jun 1, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 1, 2023
@bors
Auto merge of rust-lang#112164 - Dylan-DPC:rollup-93zj7jw, r=Dylan-DPC
fabf929 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#108459 (rustdoc: Fix LinkReplacer link matching)
 - rust-lang#111318 (Add a distinct `OperandValue::ZeroSized` variant for ZSTs)
 - rust-lang#111892 (rustdoc: add interaction delays for tooltip popovers)
 - rust-lang#111980 (Preserve substs in opaques recorded in typeck results)
 - rust-lang#112024 (Don't suggest break through nested items)
 - rust-lang#112128 (Don't compute inlining status of mono items in advance.)
 - rust-lang#112141 (remove reference to Into in ? operator core/std docs, fix rust-lang#111655)

Failed merges:

 - rust-lang#112071 (Group rfcs tests)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ccf99bd into rust-lang:master Jun 1, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 1, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 2, 2023
Open
@compiler-errors compiler-errors deleted the unmapped-substs branch August 11, 2023 20:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oli-obk oli-obk oli-obk left review comments

@lcnr lcnr lcnr left review comments

Assignees

@oli-obk oli-obk

@lcnr lcnr

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
Milestone
1.72.0
Development

Successfully merging this pull request may close these issues.
6 participants
@compiler-errors @bors @rust-log-analyzer @oli-obk @lcnr @rustbot