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.

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

Make EvalCtxt generic over InferCtxtLike #125255

Merged
merged 2 commits into from
May 20, 2024

Conversation

compiler-errors
Copy link
Member

...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 #125230.

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 labels May 18, 2024
@rustbot
Copy link
Collaborator

rustbot commented May 18, 2024

Some changes occurred to the core trait solver

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

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.

@lcnr
Copy link
Contributor

lcnr commented May 18, 2024

:3

r=me after #125230 landed, the last 2 commits lgtm

@lcnr
Copy link
Contributor

lcnr commented May 18, 2024

please update the PR name though, you go lifetime -> ty

@compiler-errors
Copy link
Member Author

Might just wait to see if we can merge the SearchGraph changes sooner, but will probably merge by end of week if not, so I can start actually making the impls generic too.

@compiler-errors compiler-errors added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 18, 2024
@compiler-errors compiler-errors changed the title Make EvalCtxt generic over lifetime Make EvalCtxt generic over InferCtxtLike May 18, 2024
@bors
Copy link
Contributor

bors commented May 19, 2024

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

@lcnr
Copy link
Contributor

lcnr commented May 19, 2024

Might just wait to see if we can merge the SearchGraph changes sooner, but will probably merge by end of week if not, so I can start actually making the impls generic too.

I would merge it without waiting for #125167. Rebasing over this PR is pretty straightforward

@compiler-errors
Copy link
Member Author

OK let me rebase then

@compiler-errors
Copy link
Member Author

@bors r=lcnr

@bors
Copy link
Contributor

bors commented May 20, 2024

📌 Commit 9dc073a 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-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels May 20, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 20, 2024
… 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
… 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
bors added a commit to rust-lang-ci/rust that referenced this pull request May 20, 2024
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#125219 (Update `unexpected_cfgs` lint for Cargo new `check-cfg` config)
 - rust-lang#125255 (Make `EvalCtxt` generic over `InferCtxtLike`)
 - rust-lang#125283 (Use a single static for all default slice Arcs.)
 - rust-lang#125300 (rustdoc: Don't strip items with inherited visibility in `AliasedNonLocalStripper`)
 - rust-lang#125309 (Fix `tests/debuginfo/strings-and-strs`.)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request May 20, 2024
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#125255 (Make `EvalCtxt` generic over `InferCtxtLike`)
 - rust-lang#125283 (Use a single static for all default slice Arcs.)
 - rust-lang#125300 (rustdoc: Don't strip items with inherited visibility in `AliasedNonLocalStripper`)
 - rust-lang#125309 (Fix `tests/debuginfo/strings-and-strs`.)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9911788 into rust-lang:master May 20, 2024
6 checks passed
@rustbot rustbot added this to the 1.80.0 milestone May 20, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 20, 2024
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
@compiler-errors compiler-errors deleted the eval-ctxt-generic branch May 21, 2024 02:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants