Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make ProofTreeBuilder actually generic over Interner #125598

Merged
merged 2 commits into from
May 28, 2024
Merged

Make ProofTreeBuilder actually generic over Interner #125598

merged 2 commits into from
May 28, 2024

Conversation

compiler-errors
Copy link
Member

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

r? lcnr

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

rustbot commented May 27, 2024

Some changes occurred to the core trait solver

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

@rustbot 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 compiler-errors changed the title Proof tree builder Make ProofTreeBuilder actually generic over Interner May 27, 2024
@bors
Copy link
Contributor

bors commented May 27, 2024

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

lcnr
lcnr reviewed May 27, 2024
View reviewed changes
Copy link
Contributor

@lcnr lcnr left a comment

Choose a reason for hiding this comment

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

r=me after nits and rebase

compiler/rustc_middle/src/ty/context.rs Outdated
@@ -220,6 +220,13 @@ impl<'tcx> Interner for TyCtxt<'tcx> {
self.check_and_mk_args(def_id, args)
}

fn mk_canonical_goal_evaluation_step(
Copy link
Contributor

Choose a reason for hiding this comment

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

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

Copy link
Member Author

Choose a reason for hiding this comment

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

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

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();
Copy link
Contributor

Choose a reason for hiding this comment

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

🤔 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 Outdated Show resolved Hide resolved
@lcnr
Copy link
Contributor

lcnr commented May 27, 2024

@bors r+ rollup (next solver)

@bors
Copy link
Contributor

bors commented May 27, 2024

📌 Commit 56e87df 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 27, 2024
jieyouxu added a commit to jieyouxu/rust that referenced this pull request May 28, 2024
@jieyouxu
Rollup merge of rust-lang#125598 - compiler-errors:proof-tree-builder…
1f1f9e1 
…, r=lcnr

Make `ProofTreeBuilder` actually generic over `Interner`

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

r? lcnr
@jieyouxu jieyouxu mentioned this pull request May 28, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request May 28, 2024
@bors
Auto merge of rust-lang#125641 - jieyouxu:rollup-37vp5jj, r=jieyouxu
b4f1a13 
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
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 28, 2024
@matthiaskrgr
Rollup merge of rust-lang#125598 - compiler-errors:proof-tree-builder…
9783780 
…, r=lcnr

Make `ProofTreeBuilder` actually generic over `Interner`

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

r? lcnr
@matthiaskrgr matthiaskrgr mentioned this pull request May 28, 2024
Closed
@workingjubilee
Copy link
Member

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

flipping a coin I guess

@workingjubilee
Copy link
Member

hm PR order should be fine actually.

@compiler-errors
Copy link
Member Author

Rebased just in case

@bors r=lcnr

@bors
Copy link
Contributor

bors commented May 28, 2024

📌 Commit 8050afa has been approved by lcnr

It is now in the queue for this repository.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@compiler-errors
Copy link
Member Author

@bors r-

@bors 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
@compiler-errors
Copy link
Member Author

@bors r=lcnr

@bors
Copy link
Contributor

bors commented May 28, 2024

📌 Commit f494036 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 28, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 28, 2024
@matthiaskrgr
Rollup merge of rust-lang#125598 - compiler-errors:proof-tree-builder…
87cd582 
…, r=lcnr

Make `ProofTreeBuilder` actually generic over `Interner`

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

r? lcnr
@matthiaskrgr matthiaskrgr mentioned this pull request May 28, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request May 28, 2024
@bors
Auto merge of rust-lang#125663 - matthiaskrgr:rollup-ej3yuxm, r=matth…
767e12b 
…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
@matthiaskrgr matthiaskrgr mentioned this pull request May 28, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 28, 2024
@bors
Auto merge of rust-lang#125665 - matthiaskrgr:rollup-srkx0v1, r=matth…
274499d 
…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
@bors bors merged commit de2bf36 into rust-lang:master May 28, 2024
6 checks passed
@rustbot rustbot added this to the 1.80.0 milestone May 28, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 28, 2024
@rust-timer
Unrolled build for rust-lang#125598
f2d4586 
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
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
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 @bors @lcnr @workingjubilee @rust-log-analyzer