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

new solver: implement canonicalization and region constraints #107981

Merged
merged 1 commit into from
Mar 3, 2023
Merged

new solver: implement canonicalization and region constraints #107981

merged 1 commit into from
Mar 3, 2023

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Feb 13, 2023 •
edited
Loading

@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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Feb 13, 2023
@lcnr lcnr mentioned this pull request Feb 13, 2023
Merged
@bors
Copy link
Contributor

bors commented Feb 13, 2023

☔ The latest upstream changes (presumably #107924) made this pull request unmergeable. Please resolve the merge conflicts.

compiler-errors
compiler-errors reviewed Feb 16, 2023
View reviewed changes
Copy link
Member

@compiler-errors compiler-errors left a comment

Choose a reason for hiding this comment

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

just a couple of comments, haven't even read the big files yet so they might be out of context

compiler/rustc_trait_selection/src/solve/canonical/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_trait_selection/src/solve/canonical/canonicalize.rs
@@ -0,0 +1,384 @@
use std::cmp::Ordering;
Copy link
Member

Choose a reason for hiding this comment

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

Noting from our discussion that this probably will need to live in infer after all.

compiler/rustc_trait_selection/src/solve/project_goals.rs Outdated
@@ -148,10 +148,9 @@ impl<'tcx> EvalCtxt<'_, 'tcx> {
.infcx
.eq(goal.param_env, goal.predicate.term, normalized_alias.into())
.expect("failed to unify with unconstrained term");
let rhs_certainty =
self.evaluate_all(nested_goals).expect("failed to unify with unconstrained term");
assert!(nested_goals.is_empty(), "{nested_goals:?}");
Copy link
Member

Choose a reason for hiding this comment

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

Hm, yeah.

compiler/rustc_trait_selection/src/solve/mod.rs Show resolved Hide resolved
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@lcnr lcnr marked this pull request as ready for review February 20, 2023 11:43
@rustbot
Copy link
Collaborator

rustbot commented Feb 20, 2023

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

compiler-errors
compiler-errors approved these changes Feb 22, 2023
View reviewed changes
Copy link
Member

@compiler-errors compiler-errors 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 with nit

compiler/rustc_trait_selection/src/solve/canonical/mod.rs Outdated Show resolved Hide resolved
@lcnr
Copy link
Contributor Author

lcnr commented Feb 22, 2023

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 22, 2023

📌 Commit d2bbb1b36e0f00525c5a59ac8a36ba01ac9e3f0d 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 Feb 22, 2023
@compiler-errors
Copy link
Member

wrong approver

@bors r- 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 Feb 22, 2023
@bors
Copy link
Contributor

bors commented Feb 22, 2023

📌 Commit d2bbb1b36e0f00525c5a59ac8a36ba01ac9e3f0d has been approved by compiler-errors

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 Feb 22, 2023
@bors
Copy link
Contributor

bors commented Feb 22, 2023

☔ The latest upstream changes (presumably #108339) made this pull request unmergeable. Please resolve the merge conflicts.

@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 Feb 22, 2023
@lcnr
Copy link
Contributor Author

lcnr commented Mar 3, 2023

@bors r=compiler-errors rollup

@bors
Copy link
Contributor

bors commented Mar 3, 2023

📌 Commit a15abea has been approved by compiler-errors

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Mar 3, 2023

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@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 Mar 3, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 3, 2023
@matthiaskrgr
Rollup merge of rust-lang#107981 - lcnr:canonicalization-uwu, r=compi…
fdfff54 
…ler-errors

new solver: implement canonicalization and region constraints

see the corresponding rustc-dev-guide chapter: https://rustc-dev-guide.rust-lang.org/solve/canonicalization.html

r? `@compiler-errors`
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 3, 2023
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 3, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 3, 2023
@bors
Auto merge of rust-lang#108707 - matthiaskrgr:rollup-9a2l6pc, r=matth…
44cfafe 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#107981 (new solver: implement canonicalization and region constraints)
 - rust-lang#108553 (Deny capturing late-bound non-lifetime param in anon const)
 - rust-lang#108599 (Remove legacy PM leftovers)
 - rust-lang#108667 (Fix another ICE in `point_at_expr_source_of_inferred_type`)
 - rust-lang#108674 (Clippy Fix array-size-threshold config deserialization error)
 - rust-lang#108685 (Match unmatched backticks in compiler/)
 - rust-lang#108694 (Match unmatched backticks in compiler/ comments)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4f49352 into rust-lang:master Mar 3, 2023
@rustbot rustbot added this to the 1.69.0 milestone Mar 3, 2023
@lcnr lcnr deleted the canonicalization-uwu branch March 6, 2023 10:21
@lcnr lcnr mentioned this pull request Mar 6, 2023
Open
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compiler-errors compiler-errors compiler-errors approved these changes

Assignees

@compiler-errors compiler-errors

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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Milestone
1.69.0
Development

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