Move some diagnostic-relevant methods from InferCtxt to TypeErrCtxt #127503
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
|
Some changes occurred in need_type_info.rs cc @lcnr |
This comment has been minimized.
This comment has been minimized.
|
Some changes occurred in src/tools/clippy cc @rust-lang/clippy |
lcnr
reviewed
Jul 9, 2024
| @@ -398,7 +398,7 @@ pub fn unexpected_hidden_region_diagnostic<'a, 'tcx>( | |||
| err | |||
| } | |||
|
|
|||
| impl<'tcx> InferCtxt<'tcx> { | |||
| impl<'tcx> TypeErrCtxt<'_, 'tcx> { | |||
There was a problem hiding this comment.
can merge the impl blocks here
| @@ -2792,7 +2792,7 @@ impl<'tcx> TypeRelation<TyCtxt<'tcx>> for SameTypeModuloInfer<'_, 'tcx> { | |||
| } | |||
| } | |||
|
|
|||
| impl<'tcx> InferCtxt<'tcx> { | |||
|
☔ The latest upstream changes (presumably #127493) made this pull request unmergeable. Please resolve the merge conflicts. |
|
This is impossible to rebase! |
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.
Self-explanatory. IDK why these weren't moved onto
TypeErrCtxtwhen that struct was created? Maybe just an oversight.cc #127492
r? lcnr