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's infcx private #109511

Merged
merged 2 commits into from
Mar 30, 2023

Conversation

compiler-errors
Copy link
Member

To better protect against people doing bad things with the inner InferCtxt

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 Mar 23, 2023
@rustbot
Copy link
Collaborator

rustbot commented Mar 23, 2023

Some changes occurred to the core trait solver

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

@rust-cloud-vms rust-cloud-vms bot force-pushed the eval-ctxt-infcx-private branch from 62819ba to 5c570aa Compare March 23, 2023 06:16
@bors
Copy link
Contributor

bors commented Mar 23, 2023

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

@compiler-errors compiler-errors force-pushed the eval-ctxt-infcx-private branch from 5c570aa to 2420699 Compare March 23, 2023 19:47
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.

a few nits which you may or may not fix

after that r=me

compiler/rustc_trait_selection/src/solve/eval_ctxt.rs Outdated Show resolved Hide resolved
compiler/rustc_trait_selection/src/solve/eval_ctxt.rs Outdated Show resolved Hide resolved
compiler/rustc_trait_selection/src/solve/eval_ctxt.rs Outdated Show resolved Hide resolved
@compiler-errors compiler-errors force-pushed the eval-ctxt-infcx-private branch from 3362143 to a61616a Compare March 29, 2023 16:19
@compiler-errors
Copy link
Member Author

@bors r=lcnr rollup (only affects new solver)

@bors
Copy link
Contributor

bors commented Mar 29, 2023

📌 Commit a61616a 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 Mar 29, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 29, 2023
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#107387 (Use random `HashMap` keys on Hermit)
 - rust-lang#109511 (Make `EvalCtxt`'s `infcx` private)
 - rust-lang#109554 (Suggest ..= when someone tries to create an overflowing range)
 - rust-lang#109675 (Do not consider elaborated projection predicates for objects in new solver)
 - rust-lang#109693 (Remove ~const from alloc)
 - rust-lang#109700 (Lint against escape sequences in Fluent files)
 - rust-lang#109716 (Move `mir::Field` → `abi::FieldIdx`)
 - rust-lang#109726 (rustdoc: Don't strip crate module)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9f28c98 into rust-lang:master Mar 30, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 30, 2023
@compiler-errors compiler-errors deleted the eval-ctxt-infcx-private branch August 11, 2023 20:00
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 (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants