finish trait solver skeleton work #106718

lcnr · 2023-01-11T12:53:08Z

648d661b4e0fcf55f7082894f577377eb451db4b

The previous implementation didn't remove provisional entries which depended on the current goal if we're forced to rerun in case the provisional result of that entry is different from the new result. For reference, see https://rust-lang.github.io/chalk/book/recursive/search_graph.html.

We should also treat inductive cycles as overflow, not ordinary ambiguity.

219a5de2517cebfe20a2c3417bd302f7c12db70c 6a1912be539dd5a3b3c10be669787c4bf0c1868a

These two commits move canonicalization to the start of the queries which simplifies a bunch of stuff. I originally intended to keep stuff canonicalized for a while because I expected us to add a additional caches the trait solver, either for candidate assembly or for projections. We ended up not adding (and expect to not need) any of them so this just ends up being easier to understand.

d78d5ad0979e965afde6500bccfa119b47063506

adds a special eq for the solver which doesn't care about obligations or spans

18704e6a78b7703e1bbb3856f015cb76c0a07a06

implements https://rust-lang.zulipchat.com/#narrow/stream/364551-t-types.2Ftrait-system-refactor/topic/projection.20cache

r? @compiler-errors

rustbot · 2023-01-11T12:53:16Z

Some changes occurred to the core trait solver

cc @lcnr, @compiler-errors

bors · 2023-01-15T18:15:46Z

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

compiler-errors · 2023-01-17T17:37:54Z

@bors r+

bors · 2023-01-17T17:37:56Z

📌 Commit 98700cf481bce946bff316b56836cfffd885127b has been approved by compiler-errors

It is now in the queue for this repository.

compiler-errors · 2023-01-18T00:06:24Z

compiler/rustc_trait_selection/Cargo.toml

@@ -19,6 +19,7 @@ rustc_infer = { path = "../rustc_infer" }
 rustc_lint_defs = { path = "../rustc_lint_defs" }
 rustc_macros = { path = "../rustc_macros" }
 rustc_query_system = { path = "../rustc_query_system" }
+rustc_serialize = { path = "../rustc_serialize" }


Not blocking, but but what's this crate dependency for?

for rustc_index::newtype_index!

bors · 2023-01-18T00:23:53Z

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

lcnr · 2023-01-18T07:12:29Z

@bors r=compiler-errors rollup=always

bors · 2023-01-18T07:12:31Z

📌 Commit 369f9aa has been approved by compiler-errors

It is now in the queue for this repository.

Rollup of 5 pull requests Successful merges: - rust-lang#103702 (Lift `T: Sized` bounds from some `strict_provenance` pointer methods) - rust-lang#106441 (relax reference requirement on SocketAddrExt::from_abstract_name) - rust-lang#106718 (finish trait solver skeleton work) - rust-lang#106950 (Don't do pointer arithmetic on pointers to deallocated memory) - rust-lang#107014 (rustdoc: remove deprecated / unused code from main.js) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

lcnr · 2023-01-18T13:05:28Z

compiler/rustc_trait_selection/src/solve/project_goals.rs


 impl<'tcx> EvalCtxt<'_, 'tcx> {
    pub(super) fn compute_projection_goal(
        &mut self,
        goal: Goal<'tcx, ProjectionPredicate<'tcx>>,
    ) -> QueryResult<'tcx> {
-        let candidates = self.assemble_and_evaluate_candidates(goal);
-        self.merge_project_candidates(candidates)
+        // To only compute normalization ones for each projection we only


"to only compute ones", fixme: once.

bors · 2023-01-18T13:06:58Z

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

…didates-2, r=lcnr Implement some candidates for the new solver (redux) Based on rust-lang#106718, so the diff is hard to read without it. See [here](rust-lang/rust@98700cf...compiler-errors:rust:new-solver-new-candidates-2) for an easier view until that one lands. Of note: * 44af916020fb43c12070125c45b6dee4ec303bbc fixes a bug where we need to make the query response *inside* of a probe, or else we make no inference progress (I think) * 50daad5acd2f163d03e7ffab942534f09bc36e2e implements `consider_assumption` for traits and predicates. I'm not sure if using `sup` here is necessary or if `eq` is fine. * We decided that all of the `instantiate_constituent_tys_for_*` functions are verbose but ok, since they need to be exhaustive and the logic between each of them is not similar enough, right? r? `@lcnr`

Correct typo rust-lang#106718 (comment)

…didates-2, r=lcnr Implement some candidates for the new solver (redux) Based on rust-lang#106718, so the diff is hard to read without it. See [here](rust-lang/rust@98700cf...compiler-errors:rust:new-solver-new-candidates-2) for an easier view until that one lands. Of note: * 44af916020fb43c12070125c45b6dee4ec303bbc fixes a bug where we need to make the query response *inside* of a probe, or else we make no inference progress (I think) * 50daad5acd2f163d03e7ffab942534f09bc36e2e implements `consider_assumption` for traits and predicates. I'm not sure if using `sup` here is necessary or if `eq` is fine. * We decided that all of the `instantiate_constituent_tys_for_*` functions are verbose but ok, since they need to be exhaustive and the logic between each of them is not similar enough, right? r? ``@lcnr``

Correct typo rust-lang#106718 (comment)

Signed-off-by: Yuki Okushi <jtitor@2k36.org>

rustbot assigned compiler-errors Jan 11, 2023

lcnr added the WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) label Jan 11, 2023

lcnr force-pushed the solver-cycles branch from f2a85f5 to 58767bf Compare January 16, 2023 09:32

This comment has been minimized.

Sign in to view

lcnr force-pushed the solver-cycles branch 3 times, most recently from b003e9c to 6a1912b Compare January 17, 2023 10:47

lcnr changed the title ~~update provisional cache cycle handling~~ finish trait solver skeleton work Jan 17, 2023

This comment has been minimized.

Sign in to view

lcnr force-pushed the solver-cycles branch 4 times, most recently from 4fa544e to 98700cf Compare January 17, 2023 15:55

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 Jan 17, 2023

compiler-errors mentioned this pull request Jan 17, 2023

Implement some candidates for the new solver (redux) #107004

Merged

compiler-errors reviewed Jan 18, 2023

View reviewed changes

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 Jan 18, 2023

lcnr added 3 commits January 18, 2023 08:09

update cache

b738b06

instantiate canonical vars eagerly

bf7dbff

remove assembly context and impl a bit more

660c283

lcnr added 4 commits January 18, 2023 08:11

add eq to InferCtxtExt

9a757d6

update project to emulate a projection cache

31ac29d

add note about indirect cycles

415aa66

add comment

369f9aa

lcnr force-pushed the solver-cycles branch from 98700cf to 369f9aa Compare January 18, 2023 07:11

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 Jan 18, 2023

This comment was marked as off-topic.

Sign in to view

rustbot removed the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Jan 18, 2023

Dylan-DPC mentioned this pull request Jan 18, 2023

Rollup of 5 pull requests #107026

Merged

lcnr commented Jan 18, 2023

View reviewed changes

bors merged commit 6f5c3c9 into rust-lang:master Jan 18, 2023

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 Jan 18, 2023

rustbot added this to the 1.68.0 milestone Jan 18, 2023

lcnr deleted the solver-cycles branch January 18, 2023 13:08

albertlarsan68 mentioned this pull request Jan 18, 2023

Correct typo #107030

Merged

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 18, 2023

Rollup merge of rust-lang#107030 - albertlarsan68:patch-3, r=lcnr

ff83043

Correct typo rust-lang#106718 (comment)

compiler-errors added a commit to compiler-errors/rust that referenced this pull request Jan 18, 2023

Rollup merge of rust-lang#107030 - albertlarsan68:patch-3, r=lcnr

5d562be

Correct typo rust-lang#106718 (comment)

JohnTitor added a commit to JohnTitor/rustc-dev-guide that referenced this pull request Feb 2, 2023

Address the change in rust-lang/rust#106718

57ed4e7

Signed-off-by: Yuki Okushi <jtitor@2k36.org>

tshepang pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Feb 3, 2023

Address the change in rust-lang/rust#106718

860162a

Signed-off-by: Yuki Okushi <jtitor@2k36.org>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

finish trait solver skeleton work #106718

finish trait solver skeleton work #106718

lcnr commented Jan 11, 2023 •

edited

Loading

rustbot commented Jan 11, 2023

bors commented Jan 15, 2023

This comment has been minimized.

This comment has been minimized.

compiler-errors commented Jan 17, 2023

bors commented Jan 17, 2023

compiler-errors Jan 18, 2023

lcnr Jan 18, 2023

bors commented Jan 18, 2023

lcnr commented Jan 18, 2023

bors commented Jan 18, 2023

This comment was marked as off-topic.

lcnr Jan 18, 2023

bors commented Jan 18, 2023

finish trait solver skeleton work #106718

finish trait solver skeleton work #106718

Conversation

lcnr commented Jan 11, 2023 • edited Loading

648d661b4e0fcf55f7082894f577377eb451db4b

219a5de2517cebfe20a2c3417bd302f7c12db70c 6a1912be539dd5a3b3c10be669787c4bf0c1868a

d78d5ad0979e965afde6500bccfa119b47063506

18704e6a78b7703e1bbb3856f015cb76c0a07a06

rustbot commented Jan 11, 2023

bors commented Jan 15, 2023

This comment has been minimized.

This comment has been minimized.

compiler-errors commented Jan 17, 2023

bors commented Jan 17, 2023

compiler-errors Jan 18, 2023

Choose a reason for hiding this comment

lcnr Jan 18, 2023

Choose a reason for hiding this comment

bors commented Jan 18, 2023

lcnr commented Jan 18, 2023

bors commented Jan 18, 2023

This comment was marked as off-topic.

lcnr Jan 18, 2023

Choose a reason for hiding this comment

bors commented Jan 18, 2023

lcnr commented Jan 11, 2023 •

edited

Loading