Skip to content

Fix for expected/found not showing in old school mode - #33388

Closed
sophiajt wants to merge 2 commits into
rust-lang:masterfrom
sophiajt:issue-33366
Closed

Fix for expected/found not showing in old school mode#33388
sophiajt wants to merge 2 commits into
rust-lang:masterfrom
sophiajt:issue-33366

Conversation

@sophiajt

Copy link
Copy Markdown
Contributor

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)

@rust-highfive

Copy link
Copy Markdown
Contributor

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> {
"{}",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@nikomatsakis

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented May 3, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 430ee0a has been approved by nikomatsakis

@bors

bors commented May 16, 2016

Copy link
Copy Markdown
Collaborator

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

@sophiajt
sophiajt deleted the issue-33366 branch May 19, 2016 12:26
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

New errors: expected/found types omitted

5 participants

@sophiajt@rust-highfive@nikomatsakis@bors@nrc