Fix for expected/found not showing in old school mode #33388
Closed
+8
−4
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
|
r? @nrc (rust_highfive has picked a reviewer for you, use r? to override) |
| @@ -554,7 +554,7 @@ impl<'a, 'tcx> ErrorReporting<'tcx> for InferCtxt<'a, 'tcx> { | |||
| "{}", | |||
There was a problem hiding this comment.
so, what I was trying to say before was that if we wanted to have something more like the old output, we could remove the modification below and instead change this line to:
let message = if check_old_skool() {
format("{} ({})", trace.origin, terr)
} else {
format("{}", trace.origin)
};
let mut err = struct_span_err!(..., "{}", message);
But I guess I'm ok either way.
|
@bors r+ |
|
📌 Commit 430ee0a has been approved by |
|
☔ The latest upstream changes (presumably #33619) made this pull request unmergeable. Please resolve the merge conflicts. |
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.
This fixes #33366 by turning on the expected/found notes for old school mode. It does so by plumbing through access to check_old_skool()
cc @birkenfeld (builds on #33367)