Split `SolverDelegate` back out from `InferCtxtLike` #127333

compiler-errors · 2024-07-04T19:52:41Z

This is because in order to uplift things like the Generalizer and other TypeRelations, we want to be able to interface with InferCtxtLike (and InferCtxt as its implementation), rather that SolverDelegate, which only really exists as a hack to be able to define some downstream methods in rustc_type_ir.

r? lcnr

rustbot · 2024-07-04T19:52:50Z

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

Some changes occurred to the core trait solver

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

compiler/rustc_next_trait_solver/src/delegate.rs

compiler/rustc_infer/src/infer/context.rs

lcnr · 2024-07-05T11:20:56Z

compiler/rustc_infer/src/infer/context.rs

+    }
+
+    fn universe_of_ct(&self, ct: ty::ConstVid) -> Option<ty::UniverseIndex> {
+        // Same issue as with `universe_of_ty`


lcnr

r=me after nit

compiler-errors · 2024-07-05T15:59:03Z

@bors r=lcnr rollup

bors · 2024-07-05T15:59:06Z

📌 Commit 0edf69d has been approved by lcnr

It is now in the queue for this repository.

lcnr · 2024-07-05T18:37:15Z

@bors r- this has two submodule updates, are they intended?

compiler-errors · 2024-07-05T18:52:04Z

They very much are not. Why didn't rustbot comment that submodules were changed :(

compiler-errors · 2024-07-05T20:40:31Z

OK, reverted the submodule changes.

@bors r=lcnr

bors · 2024-07-05T20:40:33Z

📌 Commit 27588d1 has been approved by lcnr

It is now in the queue for this repository.

…ain, r=lcnr Split `SolverDelegate` back out from `InferCtxtLike` This is because in order to uplift things like the `Generalizer` and other `TypeRelation`s, we want to be able to interface with `InferCtxtLike` (and `InferCtxt` as its implementation), rather that `SolverDelegate`, which only really exists as a hack to be able to define some downstream methods in `rustc_type_ir`. r? lcnr

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#127333 (Split `SolverDelegate` back out from `InferCtxtLike`) - rust-lang#127363 (Improve readability of some fmt code examples) - rust-lang#127366 (Use `ControlFlow` results for visitors that are only looking for a single value) - rust-lang#127368 (Added dots at the sentence ends of rustc AST doc) - rust-lang#127369 (Match ergonomics 2024: align with RFC again) - rust-lang#127382 (Use verbose style when suggesting changing `const` with `let`) - rust-lang#127383 (Use verbose style for argument removal suggestion) r? `@ghost` `@rustbot` modify labels: rollup

…ain, r=lcnr Split `SolverDelegate` back out from `InferCtxtLike` This is because in order to uplift things like the `Generalizer` and other `TypeRelation`s, we want to be able to interface with `InferCtxtLike` (and `InferCtxt` as its implementation), rather that `SolverDelegate`, which only really exists as a hack to be able to define some downstream methods in `rustc_type_ir`. r? lcnr

…kingjubilee Rollup of 11 pull requests Successful merges: - rust-lang#123600 (impl PathBuf::add_extension and Path::with_added_extension) - rust-lang#126987 (out_of_scope_macro_calls: Detect calls inside attributes more precisely) - rust-lang#127107 (Improve dead code analysis) - rust-lang#127221 (Improve well known value check-cfg diagnostic for the standard library) - rust-lang#127333 (Split `SolverDelegate` back out from `InferCtxtLike`) - rust-lang#127363 (Improve readability of some fmt code examples) - rust-lang#127366 (Use `ControlFlow` results for visitors that are only looking for a single value) - rust-lang#127368 (Added dots at the sentence ends of rustc AST doc) - rust-lang#127369 (Match ergonomics 2024: align with RFC again) - rust-lang#127383 (Use verbose style for argument removal suggestion) - rust-lang#127393 (Remove clubby789 from review rotation) r? `@ghost` `@rustbot` modify labels: rollup

…mpiler-errors Rollup of 8 pull requests Successful merges: - rust-lang#123600 (impl PathBuf::add_extension and Path::with_added_extension) - rust-lang#127107 (Improve dead code analysis) - rust-lang#127221 (Improve well known value check-cfg diagnostic for the standard library) - rust-lang#127333 (Split `SolverDelegate` back out from `InferCtxtLike`) - rust-lang#127363 (Improve readability of some fmt code examples) - rust-lang#127366 (Use `ControlFlow` results for visitors that are only looking for a single value) - rust-lang#127368 (Added dots at the sentence ends of rustc AST doc) - rust-lang#127393 (Remove clubby789 from review rotation) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#127333 - compiler-errors:infer_ctxt_like-again, r=lcnr Split `SolverDelegate` back out from `InferCtxtLike` This is because in order to uplift things like the `Generalizer` and other `TypeRelation`s, we want to be able to interface with `InferCtxtLike` (and `InferCtxt` as its implementation), rather that `SolverDelegate`, which only really exists as a hack to be able to define some downstream methods in `rustc_type_ir`. r? lcnr

workingjubilee · 2024-07-06T06:17:41Z

@bors r-

…mitting-relation, r=lcnr uplift `PredicateEmittingRelation` Small follow-up to rust-lang#127333 r? lcnr

Rollup merge of rust-lang#127405 - compiler-errors:uplift-predicate-emitting-relation, r=lcnr uplift `PredicateEmittingRelation` Small follow-up to rust-lang#127333 r? lcnr

rustbot assigned lcnr Jul 4, 2024

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 Jul 4, 2024

compiler-errors commented Jul 4, 2024

View reviewed changes

compiler/rustc_next_trait_solver/src/delegate.rs Show resolved Hide resolved

lcnr reviewed Jul 5, 2024

View reviewed changes

compiler/rustc_infer/src/infer/context.rs Outdated Show resolved Hide resolved

lcnr reviewed Jul 5, 2024

View reviewed changes

compiler-errors force-pushed the infer_ctxt_like-again branch from 24071da to 0edf69d Compare July 5, 2024 15:58

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 Jul 5, 2024

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 Jul 5, 2024

Split SolverDelegate back out from InferCtxtLike

27588d1

compiler-errors force-pushed the infer_ctxt_like-again branch from 0edf69d to 27588d1 Compare July 5, 2024 20:39

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 Jul 5, 2024

matthiaskrgr mentioned this pull request Jul 5, 2024

Rollup of 7 pull requests #127394

Closed

workingjubilee mentioned this pull request Jul 5, 2024

Rollup of 11 pull requests #127400

Closed

This was referenced Jul 6, 2024

Rollup of 8 pull requests #127403

Merged

uplift PredicateEmittingRelation #127405

Merged

bors merged commit 16ba4b7 into rust-lang:master Jul 6, 2024
6 checks passed

rustbot added this to the 1.81.0 milestone Jul 6, 2024

matthiaskrgr mentioned this pull request Jul 6, 2024

Rollup of 7 pull requests #127408

Closed

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 Jul 6, 2024

compiler-errors added a commit to compiler-errors/rust that referenced this pull request Jul 6, 2024

Rollup merge of rust-lang#127405 - compiler-errors:uplift-predicate-e…

f664171

…mitting-relation, r=lcnr uplift `PredicateEmittingRelation` Small follow-up to rust-lang#127333 r? lcnr

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Split `SolverDelegate` back out from `InferCtxtLike` #127333

Split `SolverDelegate` back out from `InferCtxtLike` #127333

compiler-errors commented Jul 4, 2024

rustbot commented Jul 4, 2024

lcnr Jul 5, 2024

lcnr left a comment

compiler-errors commented Jul 5, 2024

bors commented Jul 5, 2024

lcnr commented Jul 5, 2024

compiler-errors commented Jul 5, 2024

compiler-errors commented Jul 5, 2024

bors commented Jul 5, 2024

workingjubilee commented Jul 6, 2024

Split SolverDelegate back out from InferCtxtLike #127333

Split SolverDelegate back out from InferCtxtLike #127333

Conversation

compiler-errors commented Jul 4, 2024

rustbot commented Jul 4, 2024

lcnr Jul 5, 2024

Choose a reason for hiding this comment

lcnr left a comment

Choose a reason for hiding this comment

compiler-errors commented Jul 5, 2024

bors commented Jul 5, 2024

lcnr commented Jul 5, 2024

compiler-errors commented Jul 5, 2024

compiler-errors commented Jul 5, 2024

bors commented Jul 5, 2024

workingjubilee commented Jul 6, 2024

Split `SolverDelegate` back out from `InferCtxtLike` #127333

Split `SolverDelegate` back out from `InferCtxtLike` #127333