Uplift more query stuff #125230

compiler-errors · 2024-05-17T21:50:04Z

Uplift various query input/response internals
Uplift the ProofTree structures and make the ProofTreeBuilder stuff (mostly) generic over Interner
Stop using TyCtxt::def_kind in favor of AliasTerm::kind

r? lcnr

rustbot · 2024-05-17T21:50:13Z

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-errors · 2024-05-17T21:51:23Z

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

-                        self.normalize_inherent_associated_type(goal)
-                    }
-                }
+        match goal.predicate.alias.kind(self.tcx()) {


I really like this cleanup lol

compiler/rustc_middle/src/traits/solve.rs

compiler/rustc_middle/src/ty/mod.rs

compiler/rustc_next_trait_solver/src/canonicalizer.rs

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

lcnr

some nits and questions, then r=me

compiler/rustc_type_ir/src/canonical.rs

lcnr · 2024-05-18T18:34:52Z

compiler/rustc_type_ir/src/generic_arg.rs

@@ -0,0 +1,18 @@
+use rustc_macros::{HashStable_NoContext, TyDecodable, TyEncodable};


feel like this doesn't necessarily deserve it's own module 🤔 would maybe also put it into lib.rs

edit: we actually already have a lot of modules in rustc_type_ir, so let's keep the current setup, at least for this PR and maybe merge these modules separately

Yeah, idk, because there's also value with not creating one module that has a lot of stuff, so I am biased to split it up more. Maybe worth grouping this and other things in a different way tho.

compiler/rustc_type_ir/src/inherent.rs

compiler/rustc_type_ir/src/interner.rs

compiler/rustc_type_ir/src/solve/inspect/format.rs

and make NestedGoals generic

I tried to rebase this down into the first commit but it is WAY too annoying x

lcnr · 2024-05-18T20:36:56Z

@bors r+ rollup=iffy

bors · 2024-05-18T20:36:58Z

📌 Commit 8e1dba4 has been approved by lcnr

It is now in the queue for this repository.

bors · 2024-05-19T00:03:52Z

⌛ Testing commit 8e1dba4 with merge 7690f29...

bors · 2024-05-19T02:11:58Z

☀️ Test successful - checks-actions
Approved by: lcnr
Pushing 7690f29 to master...

rust-timer · 2024-05-19T03:26:47Z

Finished benchmarking commit (7690f29): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (primary -3.9%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-3.9%	[-4.3%, -3.4%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-3.9%	[-4.3%, -3.4%]	2

Cycles

Results (primary -4.6%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-4.6%	[-4.6%, -4.6%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-4.6%	[-4.6%, -4.6%]	1

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 669.038s -> 667.801s (-0.18%)
Artifact size: 316.22 MiB -> 316.10 MiB (-0.04%)

… r=lcnr Make `EvalCtxt` generic over `InferCtxtLike` ...but don't change any of the impls, yet! These can get uplifted as we add more methods to `InferCtxtLike`/`Interner` :3 This is built on top of rust-lang#125230. r? lcnr

Rollup merge of rust-lang#125255 - compiler-errors:eval-ctxt-generic, r=lcnr Make `EvalCtxt` generic over `InferCtxtLike` ...but don't change any of the impls, yet! These can get uplifted as we add more methods to `InferCtxtLike`/`Interner` :3 This is built on top of rust-lang#125230. r? lcnr

rustbot assigned lcnr May 17, 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 May 17, 2024

compiler-errors commented May 17, 2024

View reviewed changes

This comment has been minimized.

Sign in to view

compiler-errors force-pushed the uplift-query-stuff branch from 5a134ab to 5ef51d5 Compare May 18, 2024 13:52

compiler-errors mentioned this pull request May 18, 2024

Make EvalCtxt generic over InferCtxtLike #125255

Merged