Make `ProofTreeBuilder` actually generic over `Interner` #125598

compiler-errors · 2024-05-27T01:04:07Z

Self-explanatory. Also renamed ecx.tcx() to ecx.interner().

r? lcnr

rustbot · 2024-05-27T01:04:15Z

Some changes occurred to the core trait solver

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

bors · 2024-05-27T18:32:36Z

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

lcnr

r=me after nits and rebase

lcnr · 2024-05-27T18:36:30Z

compiler/rustc_middle/src/ty/context.rs

@@ -220,6 +220,13 @@ impl<'tcx> Interner for TyCtxt<'tcx> {
        self.check_and_mk_args(def_id, args)
    }

+    fn mk_canonical_goal_evaluation_step(


Suggested change

fn mk_canonical_goal_evaluation_step(

fn intern_canonical_goal_evaluation_step(

I feel like mk should only be for XKind -> X, so this doesn't feel right to me

We use mk_ either for Kind interning and for some Lists, but I'd be happy to keep it to just those.

lcnr · 2024-05-27T18:38:23Z

compiler/rustc_trait_selection/src/solve/assembly/mod.rs

@@ -455,7 +457,7 @@ impl<'tcx> EvalCtxt<'_, InferCtxt<'tcx>> {
        goal: Goal<'tcx, G>,
        candidates: &mut Vec<Candidate<'tcx>>,
    ) {
-        let tcx = self.tcx();
+        let tcx = self.interner();


🤔 this feels a bit meh, have some thoughts but they aren't blocking so let's chat about this the next time we meet in sync

compiler/rustc_trait_selection/src/solve/eval_ctxt/canonical.rs

lcnr · 2024-05-27T19:06:50Z

@bors r+ rollup (next solver)

bors · 2024-05-27T19:06:52Z

📌 Commit 56e87df has been approved by lcnr

It is now in the queue for this repository.

…, r=lcnr Make `ProofTreeBuilder` actually generic over `Interner` Self-explanatory. Also renamed `ecx.tcx()` to `ecx.interner()`. r? lcnr

Rollup of 4 pull requests Successful merges: - rust-lang#125411 (check host's libstdc++ version when using ci llvm) - rust-lang#125598 (Make `ProofTreeBuilder` actually generic over `Interner`) - rust-lang#125609 (Always use the general case char count with `optimize_for_size`) - rust-lang#125613 (Use `rmake` for `windows-` run-make tests) r? `@ghost` `@rustbot` modify labels: rollup

…, r=lcnr Make `ProofTreeBuilder` actually generic over `Interner` Self-explanatory. Also renamed `ecx.tcx()` to `ecx.interner()`. r? lcnr

workingjubilee · 2024-05-28T05:44:09Z

conflicts with https://github.com/rust-lang/rust/pull/125343/files

flipping a coin I guess

workingjubilee · 2024-05-28T05:45:40Z

hm PR order should be fine actually.

compiler-errors · 2024-05-28T14:46:07Z

Rebased just in case

@bors r=lcnr

bors · 2024-05-28T14:46:10Z

📌 Commit 8050afa has been approved by lcnr

It is now in the queue for this repository.

compiler-errors · 2024-05-28T15:09:41Z

@bors r-

compiler-errors · 2024-05-28T15:37:38Z

@bors r=lcnr

bors · 2024-05-28T15:37:40Z

📌 Commit f494036 has been approved by lcnr

It is now in the queue for this repository.

…, r=lcnr Make `ProofTreeBuilder` actually generic over `Interner` Self-explanatory. Also renamed `ecx.tcx()` to `ecx.interner()`. r? lcnr

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#117671 (NVPTX: Avoid PassMode::Direct for args in C abi) - rust-lang#124251 (Add an intrinsic for `ptr::metadata`) - rust-lang#125573 (Migrate `run-make/allow-warnings-cmdline-stability` to `rmake.rs`) - rust-lang#125590 (Add a "Setup Python" action for github-hosted runners and remove unnecessary `CUSTOM_MINGW` environment variable) - rust-lang#125598 (Make `ProofTreeBuilder` actually generic over `Interner`) - rust-lang#125637 (rustfmt fixes) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#117671 (NVPTX: Avoid PassMode::Direct for args in C abi) - rust-lang#125573 (Migrate `run-make/allow-warnings-cmdline-stability` to `rmake.rs`) - rust-lang#125590 (Add a "Setup Python" action for github-hosted runners and remove unnecessary `CUSTOM_MINGW` environment variable) - rust-lang#125598 (Make `ProofTreeBuilder` actually generic over `Interner`) - rust-lang#125637 (rustfmt fixes) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#125598 - compiler-errors:proof-tree-builder, r=lcnr Make `ProofTreeBuilder` actually generic over `Interner` Self-explanatory. Also renamed `ecx.tcx()` to `ecx.interner()`. r? lcnr

rustbot assigned lcnr May 27, 2024

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 27, 2024

rustbot added 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 May 27, 2024

compiler-errors changed the title ~~Proof tree builder~~ Make ProofTreeBuilder actually generic over Interner May 27, 2024

lcnr reviewed May 27, 2024

View reviewed changes

compiler-errors force-pushed the proof-tree-builder branch from 6b56d57 to 56e87df Compare May 27, 2024 18:54

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 27, 2024

jieyouxu mentioned this pull request May 28, 2024

Rollup of 4 pull requests #125641

Closed

matthiaskrgr mentioned this pull request May 28, 2024

Rollup of 4 pull requests #125643

Closed

EvalCtxt::tcx() -> EvalCtxt::interner()

50a5da1

compiler-errors force-pushed the proof-tree-builder branch from 56e87df to 8050afa Compare May 28, 2024 14:46

This comment has been minimized.

# to view

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 28, 2024

Make ProofTreeBuilder actually generic over interner

f494036

compiler-errors force-pushed the proof-tree-builder branch from 8050afa to f494036 Compare May 28, 2024 15:10

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 28, 2024

matthiaskrgr mentioned this pull request May 28, 2024

Rollup of 6 pull requests #125663

Closed

matthiaskrgr mentioned this pull request May 28, 2024

Rollup of 5 pull requests #125665

Merged

bors merged commit de2bf36 into rust-lang:master May 28, 2024
6 checks passed

rustbot added this to the 1.80.0 milestone May 28, 2024

	fn mk_canonical_goal_evaluation_step(
	fn intern_canonical_goal_evaluation_step(

Make ProofTreeBuilder actually generic over Interner #125598

Make ProofTreeBuilder actually generic over Interner #125598

Uh oh!

Conversation

compiler-errors commented May 27, 2024

Uh oh!

rustbot commented May 27, 2024

Uh oh!

bors commented May 27, 2024

Uh oh!

lcnr left a comment

Choose a reason for hiding this comment

Uh oh!

lcnr May 27, 2024

Choose a reason for hiding this comment

Uh oh!

compiler-errors May 27, 2024

Choose a reason for hiding this comment

Uh oh!

lcnr May 27, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

lcnr commented May 27, 2024

Uh oh!

bors commented May 27, 2024

Uh oh!

workingjubilee commented May 28, 2024

Uh oh!

workingjubilee commented May 28, 2024

Uh oh!

compiler-errors commented May 28, 2024

Uh oh!

bors commented May 28, 2024

Uh oh!

This comment has been minimized.

compiler-errors commented May 28, 2024

Uh oh!

compiler-errors commented May 28, 2024

Uh oh!

bors commented May 28, 2024

Uh oh!

Uh oh!

Uh oh!

Make `ProofTreeBuilder` actually generic over `Interner` #125598

Make `ProofTreeBuilder` actually generic over `Interner` #125598