Specific labels when referring to "expected" and "found" types #66389

estebank · 2019-11-13T22:38:11Z

No description provided.

rust-highfive · 2019-11-13T22:38:15Z

r? @petrochenkov

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

estebank · 2019-11-13T22:38:32Z

@rust-lang/wg-diagnostics is this something we'd like to do?

src/librustc/ty/error.rs

src/test/ui/type/type-parameter-names.stderr

src/librustc/infer/error_reporting/mod.rs

petrochenkov · 2019-11-14T19:15:36Z

Looks like an improvement to me.

estebank · 2019-11-14T22:32:37Z

src/test/ui/c-variadic/variadic-ffi-1.stderr

-   = note: expected type `unsafe extern "C" fn(isize, u8)`
-              found type `unsafe extern "C" fn(isize, u8, ...) {foo}`
+   = note: expected fn pointer `unsafe extern "C" fn(isize, u8)`
+                 found fn item `unsafe extern "C" fn(isize, u8, ...) {foo}`


This output is slightly worrying to me. It might actually confuse people more than it clarifies (unless we decide to add another note explaining that fn pointers and fn items can be interchangeable as long as the share the same signature).

src/librustc/infer/error_reporting/mod.rs

src/librustc/ty/mod.rs

petrochenkov · 2019-11-20T18:42:37Z

@bors retry

bors · 2019-11-20T22:54:45Z

⌛ Testing commit 468722b with merge 30de5622ec32aa04f9ca2edbd1499405d7dcd703...

bors · 2019-11-20T22:58:36Z

💔 Test failed - checks-azure

rust-highfive · 2019-11-20T22:58:39Z

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

petrochenkov · 2019-11-21T04:17:24Z

Another spurious error?
@bors retry

bors · 2019-11-21T17:53:24Z

⌛ Testing commit 468722b with merge 53712f8...

Specific labels when referring to "expected" and "found" types

bors · 2019-11-21T21:01:07Z

☀️ Test successful - checks-azure
Approved by: petrochenkov
Pushing 53712f8 to master...

rust-highfive · 2019-11-21T21:02:31Z

📣 Toolstate changed by #66389!

Tested on commit 53712f8.
Direct link to PR: #66389

💔 rls on windows: test-pass → test-fail (cc @Xanewok, @rust-lang/infra).
💔 rls on linux: test-pass → test-fail (cc @Xanewok, @rust-lang/infra).

@Xanewok

Tested on commit rust-lang/rust@53712f8. Direct link to PR: <rust-lang/rust#66389> 💔 rls on windows: test-pass → test-fail (cc @Xanewok, @rust-lang/infra). 💔 rls on linux: test-pass → test-fail (cc @Xanewok, @rust-lang/infra).

Rustup to rustc 1.41.0-nightly (35ef33a 2019-11-21) I don't have the right fix for the fmtstr tests, and I'm also hitting problems caused by messense/rustc-test#3 List of rustups: - rust-lang/rust#66271 (syntax: Keep string literals in ABIs and `asm!` more precisely) - rust-lang/rust#65355 (Stabilize `!` in Rust 1.41.0) - rust-lang/rust#66515 (Reduce size of `hir::Expr` by boxing more of `hir::InlineAsm`) - rust-lang/rust#66389 (Specific labels when referring to "expected" and "found" types) - rust-lang/rust#66074 ([mir-opt] Turn on the `ConstProp` pass by default) changelog: none

rust-highfive assigned petrochenkov Nov 13, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 13, 2019

Centril reviewed Nov 14, 2019

View reviewed changes

petrochenkov reviewed Nov 14, 2019

View reviewed changes

src/librustc/infer/error_reporting/mod.rs Outdated Show resolved Hide resolved

petrochenkov added S-waiting-on-team Status: Awaiting decision from the relevant subteam (see the T-<team> label). and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 14, 2019

estebank force-pushed the type-err-labels branch from a78761e to 29e48d9 Compare November 14, 2019 22:08

estebank commented Nov 14, 2019

View reviewed changes

This comment has been minimized.

Sign in to view

estebank force-pushed the type-err-labels branch from af22e7e to 72123e2 Compare November 15, 2019 16:17

This comment has been minimized.

Sign in to view

petrochenkov reviewed Nov 16, 2019

View reviewed changes

src/librustc/infer/error_reporting/mod.rs Outdated Show resolved Hide resolved

src/librustc/infer/error_reporting/mod.rs Outdated Show resolved Hide resolved

src/librustc/ty/mod.rs Outdated Show resolved Hide resolved

src/librustc/ty/mod.rs Outdated Show resolved Hide resolved

petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-team Status: Awaiting decision from the relevant subteam (see the T-<team> label). labels Nov 16, 2019

estebank force-pushed the type-err-labels branch from d12ec63 to 82e8e63 Compare November 18, 2019 19:01

estebank added 5 commits November 18, 2019 11:02

Specific labels when referring to "expected" and "found" types

83ffda5

review comments: tweak prefix strings

b2e6aef

Remove E0308 note when primary label has all info

94c6425

Surround types with backticks in type errors

6f8f706

review comments

b3517cd

estebank force-pushed the type-err-labels branch from 82e8e63 to 887bef3 Compare November 18, 2019 19:44

This comment has been minimized.

Sign in to view

fix rebase

468722b

estebank force-pushed the type-err-labels branch from 887bef3 to 468722b Compare November 18, 2019 23:23

petrochenkov added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 19, 2019

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 Nov 20, 2019

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 20, 2019

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 Nov 21, 2019

bors added a commit that referenced this pull request Nov 21, 2019

Auto merge of #66389 - estebank:type-err-labels, r=petrochenkov

53712f8

Specific labels when referring to "expected" and "found" types

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 21, 2019

bors merged commit 468722b into rust-lang:master Nov 21, 2019

This was referenced Nov 21, 2019

Better pretty printing for const raw pointers #65859

Closed

Point at opaque and closure type definitions in type errors #66463

Merged

impl Add<char> and AddAssign<char> for String #66504

Closed

Point at type in let assignment on type errors #66539

Merged

flip1995 added a commit to Manishearth/rust-clippy that referenced this pull request Nov 22, 2019

Rustup to rust-lang/rust#66389

cadc35a

Manishearth mentioned this pull request Nov 22, 2019

Rustup to rustc 1.41.0-nightly (35ef33a8 2019-11-21) rust-lang/rust-clippy#4825

Merged

ehuss mentioned this pull request Nov 22, 2019

Fix test for latest nightly. rust-lang/rls#1595

Merged

euclio mentioned this pull request Jan 12, 2021

Diagnostic refers to incorrect trait method as "fn pointer" #80929

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Specific labels when referring to "expected" and "found" types #66389

Specific labels when referring to "expected" and "found" types #66389

estebank commented Nov 13, 2019

rust-highfive commented Nov 13, 2019

estebank commented Nov 13, 2019

petrochenkov commented Nov 14, 2019

estebank Nov 14, 2019

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

petrochenkov commented Nov 20, 2019

bors commented Nov 20, 2019

bors commented Nov 20, 2019

rust-highfive commented Nov 20, 2019

petrochenkov commented Nov 21, 2019

bors commented Nov 21, 2019

bors commented Nov 21, 2019

rust-highfive commented Nov 21, 2019

Specific labels when referring to "expected" and "found" types #66389

Specific labels when referring to "expected" and "found" types #66389

Conversation

estebank commented Nov 13, 2019

rust-highfive commented Nov 13, 2019

estebank commented Nov 13, 2019

petrochenkov commented Nov 14, 2019

estebank Nov 14, 2019

Choose a reason for hiding this comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

petrochenkov commented Nov 20, 2019

bors commented Nov 20, 2019

bors commented Nov 20, 2019

rust-highfive commented Nov 20, 2019

petrochenkov commented Nov 21, 2019

bors commented Nov 21, 2019

bors commented Nov 21, 2019

rust-highfive commented Nov 21, 2019