Skip to content

Uplift more query stuff - #125230

Merged
bors merged 5 commits into
rust-lang:masterfrom
compiler-errors:uplift-query-stuff
May 19, 2024
Merged

Uplift more query stuff#125230
bors merged 5 commits into
rust-lang:masterfrom
compiler-errors:uplift-query-stuff

Conversation

@compiler-errors

@compiler-errors compiler-errors commented May 17, 2024

Copy link
Copy Markdown
Contributor
  • 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 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
@rustbot

rustbot commented May 17, 2024

Copy link
Copy Markdown
Collaborator

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
compiler-errors commented May 17, 2024
View reviewed changes
Comment thread compiler/rustc_trait_selection/src/solve/normalizes_to/mod.rs
self.normalize_inherent_associated_type(goal)
}
}
match goal.predicate.alias.kind(self.tcx()) {

@compiler-errors compiler-errors May 17, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I really like this cleanup lol

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@compiler-errors compiler-errors mentioned this pull request May 18, 2024
Merged
lcnr
lcnr reviewed May 18, 2024
View reviewed changes
Comment thread compiler/rustc_middle/src/traits/solve.rs Outdated
lcnr
lcnr reviewed May 18, 2024
View reviewed changes
Comment thread compiler/rustc_middle/src/ty/mod.rs
lcnr
lcnr reviewed May 18, 2024
View reviewed changes
Comment thread compiler/rustc_next_trait_solver/src/canonicalizer.rs Outdated
lcnr
lcnr reviewed May 18, 2024
View reviewed changes
Comment thread compiler/rustc_trait_selection/src/solve/eval_ctxt/mod.rs
lcnr
lcnr reviewed May 18, 2024
View reviewed changes

@lcnr lcnr left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

some nits and questions, then r=me

Comment thread compiler/rustc_type_ir/src/canonical.rs Outdated
Comment thread compiler/rustc_type_ir/src/generic_arg.rs
@@ -0,0 +1,18 @@
use rustc_macros::{HashStable_NoContext, TyDecodable, TyEncodable};

@lcnr lcnr May 18, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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

@compiler-errors compiler-errors May 18, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

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.

Comment thread compiler/rustc_type_ir/src/inherent.rs Outdated
Comment thread compiler/rustc_type_ir/src/interner.rs Outdated
Comment thread compiler/rustc_type_ir/src/solve/inspect/format.rs Outdated
@lcnr

lcnr commented May 18, 2024

Copy link
Copy Markdown
Contributor

@bors r+ rollup=iffy

@bors

bors commented May 18, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 8e1dba4 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 May 18, 2024
@bors

bors commented May 19, 2024

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented May 19, 2024

Copy link
Copy Markdown
Collaborator

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 19, 2024
@bors
bors merged commit 7690f29 into rust-lang:master May 19, 2024
@rustbot rustbot added this to the 1.80.0 milestone May 19, 2024
@bors bors mentioned this pull request May 19, 2024
Closed
@rust-timer

rust-timer commented May 19, 2024

Copy link
Copy Markdown
Collaborator

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%)

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 20, 2024
@matthiaskrgr
Rollup merge of rust-lang#125255 - compiler-errors:eval-ctxt-generic,…
81744f1 
… 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
fmease added a commit to fmease/rust that referenced this pull request May 20, 2024
@fmease
Rollup merge of rust-lang#125255 - compiler-errors:eval-ctxt-generic,…
798d7a7 
… 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
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 20, 2024
@matthiaskrgr
Rollup merge of rust-lang#125255 - compiler-errors:eval-ctxt-generic,…
9911788 
… 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
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 20, 2024
@rust-timer
Unrolled build for rust-lang#125255
3ee9366 
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
@lcnr lcnr mentioned this pull request Jul 21, 2026
Open
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lcnr lcnr lcnr left review comments

Assignees

@lcnr lcnr

Labels

merged-by-bors This PR was explicitly merged by bors. 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.80.0

Development

Successfully merging this pull request may close these issues.

6 participants

@compiler-errors @rustbot @rust-log-analyzer @lcnr @bors @rust-timer