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

Split fn_ctxt/adjust_fulfillment_errors from fn_ctxt/checks #107746

Conversation

Nathan-Fenner
Copy link
Contributor

This is a follow-up from #106477, addressing a small number of the FIXMEs that were added, by moving some functions into the new(er) adjust_fulfillment_errors module.

More cleanup is possible for this file (and I'll hopefully get around to doing some of that soon) but the very first thing is to just move these functions out.

There should be no "real" changes in this PR, besides minor adjustments to imports and the functions being transferred.

@rustbot
Copy link
Collaborator

rustbot commented Feb 7, 2023

r? @michaelwoerister

(rustbot has picked a reviewer for you, use r? to override)

@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. labels Feb 7, 2023
@Nathan-Fenner
Copy link
Contributor Author

r? @compiler-errors since you said you'd want to do it (yourself) soon

@compiler-errors
Copy link
Member

cool beans

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 7, 2023

📌 Commit 4c05366 has been approved by compiler-errors

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

Rollup of 8 pull requests

Successful merges:

 - rust-lang#107719 (Remove `arena_cache` modifier from `upstream_monomorphizations_for`)
 - rust-lang#107740 (Avoid locking the global context across the `after_expansion` callback)
 - rust-lang#107746 (Split fn_ctxt/adjust_fulfillment_errors from fn_ctxt/checks)
 - rust-lang#107749 (allow quick-edit convenience)
 - rust-lang#107750 (make more readable)
 - rust-lang#107755 (remove binder from query constraints)
 - rust-lang#107756 (miri: fix ICE when running out of address space)
 - rust-lang#107764 (llvm-16: Use Triple.h from new header location.)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit cf7aa57 into rust-lang:master Feb 8, 2023
@rustbot rustbot added this to the 1.69.0 milestone Feb 8, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 24, 2023
…-funcs, r=compiler-errors

Make helper functions private in fn_ctxt/adjust_fulfillment_errors

Two helper functions in `rustc_hir_typeck/src/fn_ctxt/adjust_fulfillment_errors.rs` were previously made `pub` impl members, because they were also used in `rustc_hir_typeck/src/fn_ctxt/check.rs` (see rust-lang#107746).

However, that's no longer the case, so the FIXME suggesting they be made private can now be implemented.
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants