Tweak mismatched types error #63337

estebank · 2019-08-06T21:21:13Z

Change expected/found for type mismatches in break
Be more accurate when talking about diverging match arms
Tweak wording of function without a return value
Suggest calling bare functions when their return value can be coerced to the expected type
Give more parsing errors when encountering foo(_, _, _)

Fix #51767, fix #62677, fix #63136, cc #37384, cc #35241, cc #51669.

rust-highfive · 2019-08-06T21:21:17Z

r? @matthewjasper

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

estebank · 2019-08-08T16:54:12Z

cc @Centril @varkor

src/librustc_typeck/check/mod.rs

src/librustc_typeck/check/expr.rs

src/librustc_typeck/check/mod.rs

src/librustc_typeck/check/expr.rs

src/librustc/infer/error_reporting/mod.rs

src/test/ui/loops/loop-break-value.stderr

src/librustc_typeck/check/mod.rs

src/libsyntax/parse/parser.rs

Centril

A bit shorter + return is an expr. :)

src/librustc_typeck/check/mod.rs

estebank · 2019-08-08T23:17:40Z

r? @Centril

Centril

r=me when-green with or without the change below depending on whether you feel that is an improvement :)

src/librustc_typeck/check/mod.rs

varkor · 2019-08-08T23:41:03Z

Looks great!

estebank · 2019-08-09T02:03:15Z

@bors r=Centril

bors · 2019-08-09T02:03:16Z

📌 Commit 68aff3f has been approved by Centril

Tweak mismatched types error - Change expected/found for type mismatches in `break` - Be more accurate when talking about diverging match arms - Tweak wording of function without a return value - Suggest calling bare functions when their return value can be coerced to the expected type - Give more parsing errors when encountering `foo(_, _, _)` Fix rust-lang#51767, fix rust-lang#62677, fix rust-lang#63136, cc rust-lang#37384, cc rust-lang#35241.

@ghost

Rollup of 4 pull requests Successful merges: - #61937 (Improve `ptr_rotate` performance, tests, and benches) - #63302 (Update LLVM submodule) - #63337 (Tweak mismatched types error) - #63397 (Add tests for some ICEs) Failed merges: r? @ghost

Centril · 2019-08-09T11:04:46Z

Failed in #63401 (comment), @bors r-
Rebasing + --bless should be enough.

estebank · 2019-08-09T14:58:03Z

@bors r=Centril rebased

bors · 2019-08-09T14:58:04Z

📌 Commit 45a5bc7 has been approved by Centril

Tweak mismatched types error - Change expected/found for type mismatches in `break` - Be more accurate when talking about diverging match arms - Tweak wording of function without a return value - Suggest calling bare functions when their return value can be coerced to the expected type - Give more parsing errors when encountering `foo(_, _, _)` Fix rust-lang#51767, fix rust-lang#62677, fix rust-lang#63136, cc rust-lang#37384, cc rust-lang#35241.

Tweak mismatched types error - Change expected/found for type mismatches in `break` - Be more accurate when talking about diverging match arms - Tweak wording of function without a return value - Suggest calling bare functions when their return value can be coerced to the expected type - Give more parsing errors when encountering `foo(_, _, _)` Fix rust-lang#51767, fix rust-lang#62677, fix rust-lang#63136, cc rust-lang#37384, cc rust-lang#35241, cc rust-lang#51669.

@ghost

Rollup of 7 pull requests Successful merges: - #63056 (Give built-in macros stable addresses in the standard library) - #63337 (Tweak mismatched types error) - #63350 (Use associated_type_bounds where applicable - closes #61738) - #63394 (Add test for issue 36804) - #63399 (More explicit diagnostic when using a `vec![]` in a pattern) - #63419 (check against more collisions for TypeId of fn pointer) - #63423 (Mention that tuple structs are private if any of their fields are) Failed merges: r? @ghost

bors · 2019-08-10T10:02:18Z

⌛ Testing commit 45a5bc7 with merge d19a359...

…trochenkov Suggest calling closure with resolved return type when appropriate Follow up to rust-lang#63337. CC rust-lang#63100. ``` error[E0308]: mismatched types --> $DIR/fn-or-tuple-struct-without-args.rs:46:20 | LL | let closure = || 42; | -- closure defined here LL | let _: usize = closure; | ^^^^^^^ | | | expected usize, found closure | help: use parentheses to call this closure: `closure()` | = note: expected type `usize` found type `[closure@$DIR/fn-or-tuple-struct-without-args.rs:45:19: 45:24]` ```

Suggest call fn ctor passed as arg to fn with type param bounds _Reviewer note: the relevant changes are in the second commit, the first is simple and mechanical, but verbose._ When forgetting to call a fn in an argument position to an fn that has a generic bound: ```rust async fn foo() {} fn bar(f: impl Future<Output=()>) {} fn main() { bar(foo); // <- should be `bar(foo());` } ``` suggest calling it: ``` error[E0277]: the trait bound `fn() -> impl std::future::Future {foo}: std::future::Future` is not satisfied --> $DIR/async-fn-ctor-passed-as-arg-where-it-should-have-been-called.rs:9:5 | LL | fn bar(f: impl Future<Output=()>) {} | --------------------------------- required by `bar` ... LL | bar(foo); | ^^^ the trait `std::future::Future` is not implemented for `fn() -> impl std::future::Future {foo}` | = help: it looks like you forgot to use parentheses to call the function: `foo()` ``` Fix #63100. Follow up to #63833 and #63337.

rust-highfive assigned matthewjasper Aug 6, 2019

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

This comment has been minimized.

Sign in to view

estebank force-pushed the break-ee0308 branch from 92d4d58 to dad230b Compare August 7, 2019 15:20

estebank changed the title ~~Tweak mismatched types error on break expressions~~ Tweak mismatched types error Aug 7, 2019

Centril reviewed Aug 8, 2019

View reviewed changes

estebank commented Aug 8, 2019

View reviewed changes

src/test/ui/loops/loop-break-value.stderr Show resolved Hide resolved

Centril reviewed Aug 8, 2019

View reviewed changes

src/librustc_typeck/check/mod.rs Outdated Show resolved Hide resolved

src/librustc_typeck/check/mod.rs Outdated Show resolved Hide resolved

src/librustc_typeck/check/mod.rs Outdated Show resolved Hide resolved

src/libsyntax/parse/parser.rs Show resolved Hide resolved

estebank mentioned this pull request Aug 8, 2019

Decide whether to suggest anything when encountering break and expecting ! #63390

Closed

estebank force-pushed the break-ee0308 branch from f2a3c45 to 5fabd5b Compare August 8, 2019 23:00

Centril reviewed Aug 8, 2019

View reviewed changes

src/librustc_typeck/check/mod.rs Outdated Show resolved Hide resolved

src/librustc_typeck/check/mod.rs Outdated Show resolved Hide resolved

estebank force-pushed the break-ee0308 branch from 5fabd5b to 4df31cb Compare August 8, 2019 23:04

rust-highfive assigned Centril and unassigned matthewjasper Aug 8, 2019

Centril approved these changes Aug 8, 2019

View reviewed changes

src/librustc_typeck/check/mod.rs Outdated Show resolved Hide resolved

varkor reviewed Aug 8, 2019

View reviewed changes

src/librustc_typeck/check/mod.rs Outdated Show resolved Hide resolved

src/librustc_typeck/check/mod.rs Outdated Show resolved Hide resolved

estebank mentioned this pull request Aug 8, 2019

Clean up parse_bottom_expr to use list parsing utility #63396

Closed

estebank force-pushed the break-ee0308 branch from 4df31cb to 68aff3f Compare August 8, 2019 23:57

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 Aug 9, 2019

Centril mentioned this pull request Aug 9, 2019

Rollup of 4 pull requests #63401

Closed

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 9, 2019

Centril mentioned this pull request Aug 9, 2019

Rollup of 5 pull requests #63412

Closed

Centril mentioned this pull request Aug 9, 2019

Rollup of 8 pull requests #63424

Closed

estebank mentioned this pull request Aug 10, 2019

Type error for loops in a non-() position moves to the break statement #51669

Closed

Centril mentioned this pull request Aug 10, 2019

Rollup of 8 pull requests #63427

Closed

Centril mentioned this pull request Aug 10, 2019

Rollup of 7 pull requests #63428

Merged

bors merged commit 45a5bc7 into rust-lang:master Aug 10, 2019

estebank mentioned this pull request Aug 12, 2019

expected (), found usize, while really this is the other way around #51767

Closed

gilescope mentioned this pull request Aug 17, 2019

"Try invoking the function" hint #63100

Closed

This was referenced Aug 23, 2019

Suggest calling closure with resolved return type when appropriate #63833

Merged

Suggest call fn ctor passed as arg to fn with type param bounds #63870

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Tweak mismatched types error #63337

Tweak mismatched types error #63337

estebank commented Aug 6, 2019 •

edited

Loading

rust-highfive commented Aug 6, 2019

This comment has been minimized.

estebank commented Aug 8, 2019

Centril left a comment

estebank commented Aug 8, 2019

Centril left a comment

varkor commented Aug 8, 2019

estebank commented Aug 9, 2019

bors commented Aug 9, 2019

Centril commented Aug 9, 2019

estebank commented Aug 9, 2019

bors commented Aug 9, 2019

bors commented Aug 10, 2019

Tweak mismatched types error #63337

Tweak mismatched types error #63337

Conversation

estebank commented Aug 6, 2019 • edited Loading

rust-highfive commented Aug 6, 2019

This comment has been minimized.

estebank commented Aug 8, 2019

Centril left a comment

Choose a reason for hiding this comment

estebank commented Aug 8, 2019

Centril left a comment

Choose a reason for hiding this comment

varkor commented Aug 8, 2019

estebank commented Aug 9, 2019

bors commented Aug 9, 2019

Centril commented Aug 9, 2019

estebank commented Aug 9, 2019

bors commented Aug 9, 2019

bors commented Aug 10, 2019

estebank commented Aug 6, 2019 •

edited

Loading