Make ProofTreeBuilder actually generic over Interner
#125598
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
the
S-waiting-on-review
|
Some changes occurred to the core trait solver cc @rust-lang/initiative-trait-system-refactor |
rustbot
added
T-compiler
compiler-errors
changed the title
ProofTreeBuilder actually generic over Interner
|
☔ The latest upstream changes (presumably #125413) made this pull request unmergeable. Please resolve the merge conflicts. |
lcnr
reviewed
May 27, 2024
| @@ -220,6 +220,13 @@ impl<'tcx> Interner for TyCtxt<'tcx> { | |||
| self.check_and_mk_args(def_id, args) | |||
| } | |||
|
|
|||
| fn mk_canonical_goal_evaluation_step( | |||
There was a problem hiding this comment.
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
There was a problem hiding this comment.
We use mk_ either for Kind interning and for some Lists, but I'd be happy to keep it to just those.
| @@ -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(); | |||
There was a problem hiding this comment.
🤔 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
compiler-errors
force-pushed
the
proof-tree-builder
branch
from
6b56d57
to
56e87df
Compare
|
@bors r+ rollup (next solver) |
bors
added
S-waiting-on-bors
jieyouxu
added a commit
to jieyouxu/rust
that referenced
this pull request
May 28, 2024
…, r=lcnr Make `ProofTreeBuilder` actually generic over `Interner` Self-explanatory. Also renamed `ecx.tcx()` to `ecx.interner()`. r? lcnr
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 28, 2024
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
…, r=lcnr Make `ProofTreeBuilder` actually generic over `Interner` Self-explanatory. Also renamed `ecx.tcx()` to `ecx.interner()`. r? lcnr
|
conflicts with https://github.com/rust-lang/rust/pull/125343/files flipping a coin I guess |
|
hm PR order should be fine actually. |
compiler-errors
force-pushed
the
proof-tree-builder
branch
from
56e87df
to
8050afa
Compare
|
Rebased just in case @bors r=lcnr |
This comment has been minimized.
This comment has been minimized.
|
@bors r- |
bors
added
S-waiting-on-author
compiler-errors
force-pushed
the
proof-tree-builder
branch
from
8050afa
to
f494036
Compare
|
@bors r=lcnr |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
May 28, 2024
…, r=lcnr Make `ProofTreeBuilder` actually generic over `Interner` Self-explanatory. Also renamed `ecx.tcx()` to `ecx.interner()`. r? lcnr
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 28, 2024
…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
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 28, 2024
…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
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 28, 2024
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Self-explanatory. Also renamed
ecx.tcx()toecx.interner().r? lcnr