More accurately point to where default return type should go #116296

compiler-errors · 2023-09-30T19:31:55Z

When getting the "default return type" span, instead of pointing to the low span of the next token, point to the high span of the previous token. This:

Makes forming return type suggestions more uniform, since we expect them all in the same place.
Arguably makes labels easier to understand, since we're pointing to where the implicit -> () would've gone, rather than the starting brace or the semicolon.

r? @estebank

compiler-errors · 2023-09-30T19:32:51Z

tests/ui/async-await/issue-64130-3-other.stderr

@@ -2,7 +2,7 @@ error[E0277]: the trait bound `Foo: Qux` is not satisfied in `impl Future<Output
  --> $DIR/issue-64130-3-other.rs:25:12
   |
 LL | async fn bar() {
-   |                - within this `impl Future<Output = ()>`
+   |               - within this `impl Future<Output = ()>`


This is the only weirdness. I want to open a separate PR to actually just point to the async keyword span, but I don't think there's actually any "natural" place to point here to mean "the "impl Future that comes from this desugaring"...

When you make that change, would pointing to the whole function signature (through the return type if it exists) give more context as to where the impl Future comes from? A rewording might help too, though I'm not sure how easy that is to do.

something like

async fn meow() -> UwU { ^^^^^^^^^^^^^^^^^^^^^^ within the `impl Future<Output = UwU>` created by this `async` fn

estebank · 2023-10-02T16:04:13Z

r=me after fixing tests

rustbot · 2023-10-02T21:39:58Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Point to full `async fn` for future Semi-follow-up to rust-lang#116296 (comment) cc `@asquared31415`

bors · 2023-10-04T12:51:51Z

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

rustbot · 2023-10-04T21:10:10Z

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

estebank · 2023-10-04T22:22:53Z

@bors r+

bors · 2023-10-04T22:22:55Z

📌 Commit dd5f26c has been approved by estebank

It is now in the queue for this repository.

…estebank More accurately point to where default return type should go When getting the "default return type" span, instead of pointing to the low span of the next token, point to the high span of the previous token. This: 1. Makes forming return type suggestions more uniform, since we expect them all in the same place. 2. Arguably makes labels easier to understand, since we're pointing to where the implicit `-> ()` would've gone, rather than the starting brace or the semicolon. r? `@estebank`

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#116223 (Fix misuses of a vs an) - rust-lang#116296 (More accurately point to where default return type should go) - rust-lang#116402 (Panic when the global allocator tries to register a TLS destructor) - rust-lang#116429 (Diagnostics: Be more careful when suggesting struct fields) - rust-lang#116431 (Tweak wording of E0562) - rust-lang#116432 (rustdoc: rename `issue-\d+.rs` tests to have meaningful names (part 2)) r? `@ghost` `@rustbot` modify labels: rollup

…estebank More accurately point to where default return type should go When getting the "default return type" span, instead of pointing to the low span of the next token, point to the high span of the previous token. This: 1. Makes forming return type suggestions more uniform, since we expect them all in the same place. 2. Arguably makes labels easier to understand, since we're pointing to where the implicit `-> ()` would've gone, rather than the starting brace or the semicolon. r? ``@estebank``

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#115304 (Allow file names to end with '>') - rust-lang#116223 (Fix misuses of a vs an) - rust-lang#116296 (More accurately point to where default return type should go) - rust-lang#116429 (Diagnostics: Be more careful when suggesting struct fields) - rust-lang#116431 (Tweak wording of E0562) - rust-lang#116432 (rustdoc: rename `issue-\d+.rs` tests to have meaningful names (part 2)) r? `@ghost` `@rustbot` modify labels: rollup

…kingjubilee Rollup of 5 pull requests Successful merges: - rust-lang#116223 (Fix misuses of a vs an) - rust-lang#116296 (More accurately point to where default return type should go) - rust-lang#116429 (Diagnostics: Be more careful when suggesting struct fields) - rust-lang#116431 (Tweak wording of E0562) - rust-lang#116432 (rustdoc: rename `issue-\d+.rs` tests to have meaningful names (part 2)) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#116296 - compiler-errors:default-return, r=estebank More accurately point to where default return type should go When getting the "default return type" span, instead of pointing to the low span of the next token, point to the high span of the previous token. This: 1. Makes forming return type suggestions more uniform, since we expect them all in the same place. 2. Arguably makes labels easier to understand, since we're pointing to where the implicit `-> ()` would've gone, rather than the starting brace or the semicolon. r? ```@estebank```

Point to full `async fn` for future Semi-follow-up to rust-lang/rust#116296 (comment) cc `@asquared31415`

Update Rust toolchain from nightly-2023-10-05 to nightly-2023-10-06 without any other source changes. This is an automatically generated pull request. If any of the CI checks fail, manual intervention is required. In such a case, review the changes at https://github.com/rust-lang/rust from rust-lang@2bbb619 up to rust-lang@cae0791. The log for this commit range is: rust-lang@cae0791da4 Auto merge of rust-lang#116417 - ouz-a:trait_type_detective, r=compiler-errors rust-lang@e30d27be00 remove is global hack rust-lang@cdca82c2c8 Auto merge of rust-lang#116455 - matthiaskrgr:rollup-p226a5u, r=matthiaskrgr rust-lang@76d0b794cb Rollup merge of rust-lang#116452 - cjgillot:noassert-erased, r=oli-obk rust-lang@c1c5ab717e Rollup merge of rust-lang#116428 - Alexendoo:note-duplicate-diagnostics, r=compiler-errors,estebank rust-lang@08cc7428d9 Rollup merge of rust-lang#116415 - ouz-a:move_subtyper, r=oli-obk rust-lang@b301bd4220 Rollup merge of rust-lang#116288 - ouz-a:smir_spans, r=spastorino rust-lang@864e5d8d94 Rollup merge of rust-lang#116220 - llogiq:stabilize-option-as-slice, r=BurntSushi rust-lang@3088c4b046 move subtyper change reveal_all rust-lang@14c846cb05 Do not assert that hidden types don't have erased regions. rust-lang@3bcad65fbf Auto merge of rust-lang#103046 - JanBeh:PR_clarify_cmp_terminology, r=workingjubilee rust-lang@cf9fd95b1c Auto merge of rust-lang#114042 - liushuyu:ubuntu/i586-fpmath, r=workingjubilee rust-lang@86b031b734 docs: Correct terminology in std::cmp rust-lang@90f3a6f920 Auto merge of rust-lang#104153 - tspiteri:doc-float-constants, r=workingjubilee rust-lang@5c3a0e932b Auto merge of rust-lang#116427 - cjgillot:no-internal, r=oli-obk rust-lang@a49138e46e impl stable for kinds rust-lang@a79567b01c add span to statements rust-lang@e293927016 Auto merge of rust-lang#116443 - workingjubilee:rollup-r9mh13f, r=workingjubilee rust-lang@4a14a80605 Rollup merge of rust-lang#116432 - notriddle:master, r=fmease rust-lang@d7b02c3d40 Rollup merge of rust-lang#116431 - estebank:issue-80476, r=compiler-errors rust-lang@a9a389cf44 Rollup merge of rust-lang#116429 - fmease:clean-up-struct-field-suggs, r=compiler-errors rust-lang@cfce3a919d Rollup merge of rust-lang#116296 - compiler-errors:default-return, r=estebank rust-lang@ea3454eabb Rollup merge of rust-lang#116223 - catandcoder:master, r=cjgillot rust-lang@5236c8e1fa Auto merge of rust-lang#116273 - compiler-errors:refine2, r=tmandry rust-lang@b781645332 Auto merge of rust-lang#116184 - compiler-errors:afit-lint, r=tmandry rust-lang@5453a9f34d Add a note to duplicate diagnostics rust-lang@afe67fa2ef Auto merge of rust-lang#116370 - nnethercote:more-arena-stuff, r=cjgillot rust-lang@2f5249019e Apply suggestions from code review rust-lang@dd5f26c42d Fix spans for comments in rustfmt rust-lang@1f079cfb44 Point to closure return instead of output if defaulted rust-lang@89b14ae212 Fix clippy rust-lang@137b6d0b01 Point to where missing return type should go rust-lang@a46ccd8d3f Add URL to test case issues rust-lang@9266270ef5 Rename issue-\d+.rs tests to have meaningful names rust-lang@041e54bd92 Tweak wording of E0562 rust-lang@867cc41b5b clean up struct field suggestions rust-lang@a198aff4a4 Add `crate_name` to test so that it can be renamed rust-lang@e63d19c4dd Remove mir::LocalDecl::internal. rust-lang@f44d116e1f Fix misuses of a vs an rust-lang@a2051dd578 Optimize some `alloc_from_iter` call sites. rust-lang@816383c60d Remove the `TypedArena::alloc_from_iter` specialization. rust-lang@c373d206cd Address review nits rust-lang@90dfa24415 Only reachable traits rust-lang@afea0b4eab Fill in prose to describe the `async_fn_in_trait` lint rust-lang@28d58f6524 Bless tests rust-lang@ec79720c1e Add async_fn_in_trait lint rust-lang@999a354a81 add span to terminator rust-lang@9130484db9 create localdecl and add span to it rust-lang@06d9602d33 Only trigger refine lint on reachable traits rust-lang@702da3b89c stabilize `Option::as_`(`mut_`)`slice` rust-lang@40a52cf55c core library: Disable fpmath tests for i386 ... rust-lang@c953b6c014 doc: expand description for f32 and f64 associated constants Co-authored-by: celinval <celinval@users.noreply.github.com>

rustbot assigned estebank Sep 30, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 30, 2023

compiler-errors commented Sep 30, 2023

View reviewed changes

compiler-errors changed the title ~~Point to where missing return type should go~~ More accurately point to where default return type should go Sep 30, 2023

This comment has been minimized.

Sign in to view

rust-cloud-vms bot force-pushed the default-return branch from ab0bb26 to bf0bd58 Compare October 2, 2023 21:39

compiler-errors mentioned this pull request Oct 2, 2023

Point to full async fn for future #116360

Merged

This comment has been minimized.

Sign in to view

bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 4, 2023

Auto merge of rust-lang#116360 - compiler-errors:async-span, r=oli-obk

65519f5

Point to full `async fn` for future Semi-follow-up to rust-lang#116296 (comment) cc `@asquared31415`

estebank approved these changes Oct 4, 2023

View reviewed changes

estebank 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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 4, 2023

compiler-errors added 4 commits October 4, 2023 21:09

Point to where missing return type should go

137b6d0

Fix clippy

89b14ae

Point to closure return instead of output if defaulted

1f079cf

Fix spans for comments in rustfmt

dd5f26c

rust-cloud-vms bot force-pushed the default-return branch from bf0bd58 to dd5f26c Compare October 4, 2023 21:10

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 Oct 4, 2023

matthiaskrgr mentioned this pull request Oct 5, 2023

Rollup of 6 pull requests #116441

Closed

matthiaskrgr mentioned this pull request Oct 5, 2023

Rollup of 6 pull requests #116442

Closed

workingjubilee mentioned this pull request Oct 5, 2023

Rollup of 5 pull requests #116443

Merged

bors merged commit cfce3a9 into rust-lang:master Oct 5, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 5, 2023

flip1995 pushed a commit to flip1995/rust-clippy that referenced this pull request Oct 6, 2023

Auto merge of #116360 - compiler-errors:async-span, r=oli-obk

716f211

Point to full `async fn` for future Semi-follow-up to rust-lang/rust#116296 (comment) cc `@asquared31415`

pvdrz mentioned this pull request Oct 6, 2023

Fix divergence from upstream master ferrocene/ferrocene#23

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

More accurately point to where default return type should go #116296

More accurately point to where default return type should go #116296

compiler-errors commented Sep 30, 2023

compiler-errors Sep 30, 2023

asquared31415 Sep 30, 2023

This comment has been minimized.

estebank commented Oct 2, 2023

rustbot commented Oct 2, 2023

This comment has been minimized.

bors commented Oct 4, 2023

rustbot commented Oct 4, 2023

estebank commented Oct 4, 2023

bors commented Oct 4, 2023

More accurately point to where default return type should go #116296

More accurately point to where default return type should go #116296

Conversation

compiler-errors commented Sep 30, 2023

compiler-errors Sep 30, 2023

Choose a reason for hiding this comment

asquared31415 Sep 30, 2023

Choose a reason for hiding this comment

This comment has been minimized.

estebank commented Oct 2, 2023

rustbot commented Oct 2, 2023

This comment has been minimized.

bors commented Oct 4, 2023

rustbot commented Oct 4, 2023

estebank commented Oct 4, 2023

bors commented Oct 4, 2023