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

remove bound var hack in resolve #101578

Merged
merged 2 commits into from
Sep 10, 2022
Merged

remove bound var hack in resolve #101578

merged 2 commits into from
Sep 10, 2022

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Sep 8, 2022

somehow dropped that change from #98900.

r? @jackh726

@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 8, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 8, 2022
@@ -35,8 +35,12 @@ pub fn codegen_fulfill_obligation<'tcx>(
let mut selcx = SelectionContext::new(&infcx);

let obligation_cause = ObligationCause::dummy();
let obligation =
Obligation::new(obligation_cause, param_env, trait_ref.to_poly_trait_predicate());
let predicate = ty::Binder::dummy(ty::TraitPredicate {
Copy link
Member

Choose a reason for hiding this comment

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

I think we should still be passing in a PolyTraitRef. Rather than using Binder::dummy here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

hmm, not sure if we will ever end up calling codegen_select_candidate with something higherranked, but changed it back ^^ it doesn't hurt

@jackh726
Copy link
Member

jackh726 commented Sep 9, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Sep 9, 2022

📌 Commit c63020a has been approved by jackh726

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 Sep 9, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 10, 2022
Rollup of 6 pull requests

Successful merges:

 - rust-lang#101578 (remove bound var hack in `resolve`)
 - rust-lang#101606 (doc: fix minor typo)
 - rust-lang#101614 (Equate fn outputs when inferring RPITIT hidden types)
 - rust-lang#101631 (rustdoc: avoid cleaning modules with duplicate names)
 - rust-lang#101635 (Move `Queries::new` out of the macro)
 - rust-lang#101641 (Update browser-ui-test version to 0.9.8)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 2386ed9 into rust-lang:master Sep 10, 2022
@rustbot rustbot added this to the 1.65.0 milestone Sep 10, 2022
@lcnr lcnr deleted the resolve-hack branch September 12, 2022 08:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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.

5 participants