Invert infer error_reporting mod struture
#127501
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
S-waiting-on-review
compiler-errors
commented
Jul 9, 2024
| @@ -1,8 +1,8 @@ | |||
| use crate::error_reporting::infer::TypeErrCtxt; | |||
There was a problem hiding this comment.
I didn't actually move need_type_info, bc it has some code that accesses private InferCtxt fields, so I'll need to split it up more carefully later...
This comment has been minimized.
This comment has been minimized.
|
☔ The latest upstream changes (presumably #127493) made this pull request unmergeable. Please resolve the merge conflicts. |
compiler-errors
force-pushed
the
invert-infer-error-mod-struture
branch
from
729cd16
to
9f76567
Compare
This comment has been minimized.
This comment has been minimized.
compiler-errors
force-pushed
the
invert-infer-error-mod-struture
branch
from
9f76567
to
e86fbcf
Compare
|
Some changes occurred in src/tools/clippy cc @rust-lang/clippy |
lcnr
reviewed
Jul 16, 2024
| @@ -1,21 +1,20 @@ | |||
| //! Error Reporting for Anonymous Region Lifetime Errors | |||
| //! where both the regions are anonymous. | |||
|
|
|||
| use crate::error_reporting::infer::nice_region_error::find_anon_type::find_anon_type; | |||
| use crate::error_reporting::infer::nice_region_error::util::AnonymousParamInfo; | |||
| use crate::error_reporting::infer::nice_region_error::NiceRegionError; | |||
| use crate::errors::AddLifetimeParamsSuggestion; | |||
There was a problem hiding this comment.
should crate::errors be moved into error_reporting?
|
@bors r+ rollup=iffy |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 16, 2024
Rollup of 7 pull requests Successful merges: - rust-lang#124033 (Sync ar_archive_writer to LLVM 18.1.3) - rust-lang#126699 (Delegation: support coercion for target expression) - rust-lang#126762 (Deny keyword lifetimes pre-expansion) - rust-lang#126967 (Promote the `wasm32-wasip2` target to Tier 2) - rust-lang#127390 (Migrate `raw-dylib-inline-cross-dylib` and `raw-dylib-custom-dlltool` `run-make` tests to rmake) - rust-lang#127501 (Invert infer `error_reporting` mod struture) - rust-lang#127816 (Update method name to reflect changes to its internals) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 17, 2024
Rollup merge of rust-lang#127501 - compiler-errors:invert-infer-error-mod-struture, r=lcnr Invert infer `error_reporting` mod struture Parallel change to rust-lang#127493, which moves `rustc_infer::infer::error_reporting` to `rustc_infer::error_reporting::infer`. After this, we should just be able to merge this into `rustc_trait_selection::error_reporting::infer`, and pull down `TypeErrCtxt` into that crate. 👍 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.
Parallel change to #127493, which moves
rustc_infer::infer::error_reportingtorustc_infer::error_reporting::infer. After this, we should just be able to merge this intorustc_trait_selection::error_reporting::infer, and pull downTypeErrCtxtinto that crate. 👍r? lcnr