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

Split SolverDelegate back out from InferCtxtLike #127333

Merged
merged 1 commit into from
Jul 6, 2024
Merged

Split SolverDelegate back out from InferCtxtLike #127333

merged 1 commit into from
Jul 6, 2024

Conversation

compiler-errors
Copy link
Member

This is because in order to uplift things like the Generalizer and other TypeRelations, we want to be able to interface with InferCtxtLike (and InferCtxt as its implementation), rather that SolverDelegate, which only really exists as a hack to be able to define some downstream methods in rustc_type_ir.

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 Jul 4, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jul 4, 2024

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

lcnr
lcnr reviewed Jul 5, 2024
View reviewed changes
compiler/rustc_infer/src/infer/context.rs Outdated
}

fn universe_of_ct(&self, ct: ty::ConstVid) -> Option<ty::UniverseIndex> {
// Same issue as with `universe_of_ty`
Copy link
Contributor

Choose a reason for hiding this comment

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

and here

lcnr
lcnr reviewed Jul 5, 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 nit

@compiler-errors
Copy link
Member Author

@bors r=lcnr rollup

@bors
Copy link
Contributor

bors commented Jul 5, 2024

📌 Commit 0edf69d 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 Jul 5, 2024
@lcnr
Copy link
Contributor

lcnr commented Jul 5, 2024

@bors r- this has two submodule updates, are they intended?

@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 Jul 5, 2024
@compiler-errors
Copy link
Member Author

They very much are not. Why didn't rustbot comment that submodules were changed :(

@compiler-errors
Copy link
Member Author

OK, reverted the submodule changes.

@bors r=lcnr

@bors
Copy link
Contributor

bors commented Jul 5, 2024

📌 Commit 27588d1 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 Jul 5, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 5, 2024
@matthiaskrgr
Rollup merge of rust-lang#127333 - compiler-errors:infer_ctxt_like-ag…
e407730 
…ain, r=lcnr

Split `SolverDelegate` back out from `InferCtxtLike`

This is because in order to uplift things like the `Generalizer` and other `TypeRelation`s, we want to be able to interface with `InferCtxtLike` (and `InferCtxt` as its implementation), rather that `SolverDelegate`, which only really exists as a hack to be able to define some downstream methods in `rustc_type_ir`.

r? lcnr
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 5, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 5, 2024
@bors
Auto merge of rust-lang#127394 - matthiaskrgr:rollup-h8xj6tv, r=matth…
0c58a06 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#127333 (Split `SolverDelegate` back out from `InferCtxtLike`)
 - rust-lang#127363 (Improve readability of some fmt code examples)
 - rust-lang#127366 (Use `ControlFlow` results for visitors that are only looking for a single value)
 - rust-lang#127368 (Added dots at the sentence ends of rustc AST doc)
 - rust-lang#127369 (Match ergonomics 2024: align with RFC again)
 - rust-lang#127382 (Use verbose style when suggesting changing `const` with `let`)
 - rust-lang#127383 (Use verbose style for argument removal suggestion)

r? `@ghost`
`@rustbot` modify labels: rollup
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Jul 5, 2024
@workingjubilee
Rollup merge of rust-lang#127333 - compiler-errors:infer_ctxt_like-ag…
a33d82e 
…ain, r=lcnr

Split `SolverDelegate` back out from `InferCtxtLike`

This is because in order to uplift things like the `Generalizer` and other `TypeRelation`s, we want to be able to interface with `InferCtxtLike` (and `InferCtxt` as its implementation), rather that `SolverDelegate`, which only really exists as a hack to be able to define some downstream methods in `rustc_type_ir`.

r? lcnr
@workingjubilee workingjubilee mentioned this pull request Jul 5, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 5, 2024
@bors
Auto merge of rust-lang#127400 - workingjubilee:rollup-9894l8q, r=wor…
d956223 
…kingjubilee

Rollup of 11 pull requests

Successful merges:

 - rust-lang#123600 (impl PathBuf::add_extension and Path::with_added_extension)
 - rust-lang#126987 (out_of_scope_macro_calls: Detect calls inside attributes more precisely)
 - rust-lang#127107 (Improve dead code analysis)
 - rust-lang#127221 (Improve well known value check-cfg diagnostic for the standard library)
 - rust-lang#127333 (Split `SolverDelegate` back out from `InferCtxtLike`)
 - rust-lang#127363 (Improve readability of some fmt code examples)
 - rust-lang#127366 (Use `ControlFlow` results for visitors that are only looking for a single value)
 - rust-lang#127368 (Added dots at the sentence ends of rustc AST doc)
 - rust-lang#127369 (Match ergonomics 2024: align with RFC again)
 - rust-lang#127383 (Use verbose style for argument removal suggestion)
 - rust-lang#127393 (Remove clubby789 from review rotation)

r? `@ghost`
`@rustbot` modify labels: rollup
This was referenced Jul 6, 2024
Merged
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 6, 2024
@bors
Auto merge of rust-lang#127403 - compiler-errors:rollup-x2yb5t0, r=co…
51917e2 
…mpiler-errors

Rollup of 8 pull requests

Successful merges:

 - rust-lang#123600 (impl PathBuf::add_extension and Path::with_added_extension)
 - rust-lang#127107 (Improve dead code analysis)
 - rust-lang#127221 (Improve well known value check-cfg diagnostic for the standard library)
 - rust-lang#127333 (Split `SolverDelegate` back out from `InferCtxtLike`)
 - rust-lang#127363 (Improve readability of some fmt code examples)
 - rust-lang#127366 (Use `ControlFlow` results for visitors that are only looking for a single value)
 - rust-lang#127368 (Added dots at the sentence ends of rustc AST doc)
 - rust-lang#127393 (Remove clubby789 from review rotation)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 16ba4b7 into rust-lang:master Jul 6, 2024
6 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jul 6, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 6, 2024
@rust-timer
Unrolled build for rust-lang#127333
47e9b97 
Rollup merge of rust-lang#127333 - compiler-errors:infer_ctxt_like-again, r=lcnr

Split `SolverDelegate` back out from `InferCtxtLike`

This is because in order to uplift things like the `Generalizer` and other `TypeRelation`s, we want to be able to interface with `InferCtxtLike` (and `InferCtxt` as its implementation), rather that `SolverDelegate`, which only really exists as a hack to be able to define some downstream methods in `rustc_type_ir`.

r? lcnr
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 6, 2024
Closed
@workingjubilee
Copy link
Contributor

@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 Jul 6, 2024
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Jul 6, 2024
@compiler-errors
Rollup merge of rust-lang#127405 - compiler-errors:uplift-predicate-e…
f664171 
…mitting-relation, r=lcnr

uplift `PredicateEmittingRelation`

Small follow-up to rust-lang#127333

r? lcnr
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 6, 2024
@rust-timer
Unrolled build for rust-lang#127405
d869a6b 
Rollup merge of rust-lang#127405 - compiler-errors:uplift-predicate-emitting-relation, r=lcnr

uplift `PredicateEmittingRelation`

Small follow-up to rust-lang#127333

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-author Status: This is awaiting some action (such as code changes or more information) from the author. 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
Milestone
1.81.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@compiler-errors @rustbot @bors @lcnr @workingjubilee