user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
rust/src/test/ui/generator
History
Matthias Krüger 1a96f31f76
Rollup merge of #100130 - compiler-errors:erroneous-return-span, r=lcnr 
Avoid pointing out `return` span if it has nothing to do with type error

This code:

```rust
fn f(_: String) {}

fn main() {
    let x = || {
        if true {
            return ();
        }
        f("");
    };
}
```

Emits this:
```
   Compiling playground v0.0.1 (/playground)
error[E0308]: mismatched types
 --> src/main.rs:8:11
  |
8 |         f("");
  |           ^^- help: try using a conversion method: `.to_string()`
  |           |
  |           expected struct `String`, found `&str`
  |
note: return type inferred to be `String` here
 --> src/main.rs:6:20
  |
6 |             return ();
  |                    ^^
```

Specifically, that note has nothing to do with the type error in question. This is because the change implemented in #84244 tries to point out the `return` span on _any_ type coercion error within a closure that happens after a `return` statement, regardless of if the error has anything to do with it.

This is really easy to trigger -- just needs a closure (or an `async`) and an early return (or any other form, e.g. `?` operator suffices) -- and super distracting in production codebases. I'm letting #84128 regress because that issue is much harder to fix correctly, and I can re-open that issue after this lands.

As a drive-by, I added a `resolve_vars_if_possible` to the coercion error logic, which leads to some error improvements. Unrelated to the issue above, though.
2022-08-07 01:19:33 +02:00
..
auxiliary Encode optimized MIR of generators when emitting metadata 2021-01-14 00:00:00 +00:00
print Shorten span for closures. 2022-07-07 09:27:42 +02:00
addassign-yield.rs tests: Move run-pass tests without naming conflicts to ui 2019-07-27 18:56:16 +03:00
async-generator-issue-67158.rs Do not ICE when encountering yield inside async block 2020-02-16 18:53:52 -08:00
async-generator-issue-67158.stderr Do not ICE when encountering yield inside async block 2020-02-16 18:53:52 -08:00
auto-trait-regions.rs Fully stabilize NLL 2022-06-03 17:16:41 -04:00
auto-trait-regions.stderr Fully stabilize NLL 2022-06-03 17:16:41 -04:00
borrow-in-tail-expr.rs tests: Move run-pass tests without naming conflicts to ui 2019-07-27 18:56:16 +03:00
borrowing.rs Add a resume type parameter to Generator 2020-02-02 13:20:57 +01:00
borrowing.stderr Make needs_drop less pessimistic on generators 2020-04-17 20:30:23 +02:00
conditional-drop.rs also run some generator tests without MIR optimizations 2020-04-28 08:22:08 +02:00
control-flow.rs also run some generator tests without MIR optimizations 2020-04-28 08:22:08 +02:00
derived-drop-parent-expr.rs Fix drop-tracking ICE when a struct containing a field with a Drop impl is used across an await 2022-07-10 15:39:07 -05:00
discriminant.rs improve DiscriminantKind handling 2020-07-15 10:20:44 +02:00
drop-and-replace.rs Add a resume type parameter to Generator 2020-02-02 13:20:57 +01:00
drop-control-flow.rs Enable drop-tracking tests behind -Zdrop-tracking 2022-02-28 12:55:50 -08:00
drop-env.rs also run some generator tests without MIR optimizations 2020-04-28 08:22:08 +02:00
drop-track-addassign-yield.rs Add test case for the need for fake_read callbacks 2022-05-10 13:43:14 -07:00
drop-tracking-parent-expression.rs Fix drop-tracking ICE when a struct containing a field with a Drop impl is used across an await 2022-07-10 15:39:07 -05:00
drop-tracking-parent-expression.stderr Fix drop-tracking ICE when a struct containing a field with a Drop impl is used across an await 2022-07-10 15:39:07 -05:00
drop-tracking-yielding-in-match-guards.rs Borrow guard patterns for the body of the guard 2022-05-19 16:23:28 -07:00
drop-yield-twice.rs Track drops across multiple yields 2022-01-18 14:25:24 -08:00
drop-yield-twice.stderr Shorten span for closures. 2022-07-07 09:27:42 +02:00
dropck-resume.rs Teach dropck about resume arguments 2020-02-02 13:20:58 +01:00
dropck-resume.stderr Use larger span for adjustments on method calls 2021-09-25 10:00:41 -05:00
dropck.rs Cleanup feature gates. 2022-03-03 18:50:28 +01:00
dropck.stderr Use larger span for adjustments on method calls 2021-09-25 10:00:41 -05:00
generator-region-requirements.migrate.stderr update tests for migrate mode by default 2019-04-22 08:40:08 +01:00
generator-region-requirements.rs Fully stabilize NLL 2022-06-03 17:16:41 -04:00
generator-region-requirements.stderr Fully stabilize NLL 2022-06-03 17:16:41 -04:00
generator-resume-after-panic.rs Add needs-unwind to tests that depend on panicking 2021-12-09 22:03:52 +00:00
generator-with-nll.rs Remove feature(nll) when compare mode is sufficient 2019-05-12 18:46:43 +01:00
generator-with-nll.stderr Remove feature(nll) when compare mode is sufficient 2019-05-12 18:46:43 +01:00
generator-yielding-or-returning-itself.rs Move stray generator test into the generator dir 2020-03-05 23:01:57 +01:00
generator-yielding-or-returning-itself.stderr Shorten span for closures. 2022-07-07 09:27:42 +02:00
issue-44197.rs Add a resume type parameter to Generator 2020-02-02 13:20:57 +01:00
issue-45729-unsafe-in-generator.mir.stderr Check for raw pointer dereference in THIR unsafeck 2021-05-20 00:01:05 +02:00
issue-45729-unsafe-in-generator.rs Check for raw pointer dereference in THIR unsafeck 2021-05-20 00:01:05 +02:00
issue-45729-unsafe-in-generator.thir.stderr Replace more "NULL" with "null" 2021-05-24 12:59:33 +02:00
issue-48048.rs Remove licenses 2018-12-25 21:08:33 -07:00
issue-48048.stderr Update tests 2019-03-11 23:10:26 +03:00
issue-52304.rs Add regression test for #52304 2022-07-21 17:08:41 +09:00
issue-52398.rs Make closures and generators a must use types 2020-07-28 00:00:00 +00:00
issue-52398.stderr Make closures and generators a must use types 2020-07-28 00:00:00 +00:00
issue-53548-1.rs Use check-pass in ui tests where appropriate 2019-11-04 16:03:46 +01:00
issue-53548.rs Use check-pass in ui tests where appropriate 2019-11-04 16:03:46 +01:00
issue-57017.rs Fix drop-tracking ICE when a struct containing a field with a Drop impl is used across an await 2022-07-10 15:39:07 -05:00
issue-57084.rs Make closures and generators a must use types 2020-07-28 00:00:00 +00:00
issue-57084.stderr Make closures and generators a must use types 2020-07-28 00:00:00 +00:00
issue-57478.rs Enable drop-tracking tests behind -Zdrop-tracking 2022-02-28 12:55:50 -08:00
issue-58888.rs Upgrade Emscripten targets to use upstream LLVM backend 2019-10-16 17:06:48 -07:00
issue-61442-stmt-expr-with-drop.rs Add a resume type parameter to Generator 2020-02-02 13:20:57 +01:00
issue-62506-two_awaits.rs Remove async_await gates from tests. 2019-08-20 03:08:42 +02:00
issue-64620-yield-array-element.rs Add test for issue-64620 2020-03-09 09:12:41 +09:00
issue-64620-yield-array-element.stderr Add test for issue-64620 2020-03-09 09:12:41 +09:00
issue-68112.rs Greatly improve error reporting for futures and generators in note_obligation_cause_code 2022-06-19 15:31:22 -05:00
issue-68112.stderr Shorten span for closures. 2022-07-07 09:27:42 +02:00
issue-69017.rs add main function to issue-69017 test 2020-02-10 13:47:52 -05:00
issue-69039.rs Move formatting to different function 2020-03-04 21:32:57 +01:00
issue-87142.rs Add regresion test for #87142 2022-06-04 21:19:15 +09:00
issue-88653.rs --bless tests 2022-07-28 20:15:24 +04:00
issue-88653.stderr --bless tests 2022-07-28 20:15:24 +04:00
issue-91477.rs Fix ICE when yielding in fn returning impl Trait 2021-12-02 22:36:05 -08:00
issue-91477.stderr Fix ICE when yielding in fn returning impl Trait 2021-12-02 22:36:05 -08:00
issue-93161.rs Check if call return type is visibly uninhabited when building MIR 2022-03-24 23:56:12 +01:00
iterator-count.rs Add a resume type parameter to Generator 2020-02-02 13:20:57 +01:00
layout-error.rs Make all tests use type_alias_impl_trait feature instead of min 2021-07-27 12:33:02 -03:00
layout-error.stderr Make all tests use type_alias_impl_trait feature instead of min 2021-07-27 12:33:02 -03:00
live-upvar-across-yield.rs Add a resume type parameter to Generator 2020-02-02 13:20:57 +01:00
match-bindings.rs Make closures and generators a must use types 2020-07-28 00:00:00 +00:00
match-bindings.stderr Make closures and generators a must use types 2020-07-28 00:00:00 +00:00
metadata-sufficient-for-layout.rs Make all tests use type_alias_impl_trait feature instead of min 2021-07-27 12:33:02 -03:00
metadata-sufficient-for-layout.stderr Make all tests use type_alias_impl_trait feature instead of min 2021-07-27 12:33:02 -03:00
nested_generators.rs Add a resume type parameter to Generator 2020-02-02 13:20:57 +01:00
niche-in-generator.rs move test that shouldn't be in test/run-pass/ 2019-08-14 18:04:33 +02:00
non-static-is-unpin.rs tests: Move run-pass tests without naming conflicts to ui 2019-07-27 18:56:16 +03:00
not-send-sync.rs Use "generator" instead of "future" when appropriate 2020-04-13 18:48:55 -07:00
not-send-sync.stderr Shorten span for closures. 2022-07-07 09:27:42 +02:00
overlap-locals.rs tests: Move run-pass tests without naming conflicts to ui 2019-07-27 18:56:16 +03:00
panic-drops-resume.rs Add needs-unwind to tests that depend on panicking 2021-12-09 22:03:52 +00:00
panic-drops.rs Add needs-unwind to tests that depend on panicking 2021-12-09 22:03:52 +00:00
panic-safe.rs Add needs-unwind to tests that depend on panicking 2021-12-09 22:03:52 +00:00
partial-drop.rs Enable drop-tracking tests behind -Zdrop-tracking 2022-02-28 12:55:50 -08:00
partial-drop.stderr Shorten span for closures. 2022-07-07 09:27:42 +02:00
partial-initialization-across-yield.rs On partial uninit error point at where we need init 2022-07-07 12:25:55 -07:00
partial-initialization-across-yield.stderr Tweak wording and spans 2022-07-07 12:25:56 -07:00
pattern-borrow.rs Remove licenses 2018-12-25 21:08:33 -07:00
pattern-borrow.stderr Update tests 2019-03-11 23:10:26 +03:00
pin-box-generator.rs tests: Move run-pass tests without naming conflicts to ui 2019-07-27 18:56:16 +03:00
reborrow-mut-upvar.rs Make closures and generators a must use types 2020-07-28 00:00:00 +00:00
reborrow-mut-upvar.stderr Make closures and generators a must use types 2020-07-28 00:00:00 +00:00
ref-escapes-but-not-over-yield.rs update tests for migrate mode by default 2019-04-22 08:40:08 +01:00
ref-escapes-but-not-over-yield.stderr Update ui tests 2021-02-01 18:23:12 +01:00
reinit-in-match-guard.rs Handle reinits in match guards 2022-01-18 14:25:29 -08:00
resume-after-return.rs Add needs-unwind to tests that depend on panicking 2021-12-09 22:03:52 +00:00
resume-arg-late-bound.rs Fully stabilize NLL 2022-06-03 17:16:41 -04:00
resume-arg-late-bound.stderr ValuePairs::PolyTraitRefs should be called 'trait' 2022-06-11 16:25:35 -07:00
resume-arg-size.rs Fix incorrect comment in generator test 2020-05-27 21:38:38 +02:00
resume-live-across-yield.rs Fix miscompilation 2020-02-03 14:08:57 +01:00
retain-resume-ref.rs Add tests for generator resume arguments 2020-02-02 13:20:57 +01:00
retain-resume-ref.stderr Make needs_drop less pessimistic on generators 2020-04-17 20:30:23 +02:00
size-moved-locals.rs Warn about dead tuple struct fields 2022-08-03 12:17:23 +02:00
sized-yield.rs Add a resume type parameter to Generator 2020-02-02 13:20:57 +01:00
sized-yield.stderr Use note to point at bound introducing requirement 2021-08-16 17:47:22 +00:00
smoke-resume-args.rs also run some generator tests without MIR optimizations 2020-04-28 08:22:08 +02:00
smoke.rs also run some generator tests without MIR optimizations 2020-04-28 08:22:08 +02:00
static-generators.rs Capitalize safety comments 2020-09-08 22:37:18 -04:00
static-mut-reference-across-yield.rs Test THIR unsafeck for unsafe ops in closures 2021-05-27 21:04:44 +02:00
static-not-unpin.rs Account for Pin::new(_) and Pin::new(Box::new(_)) when Box::pin(_) would be applicable 2020-02-12 15:13:05 -08:00
static-not-unpin.stderr Shorten span for closures. 2022-07-07 09:27:42 +02:00
static-reference-across-yield.rs Record temporary static references in generator witnesses 2019-11-26 23:18:41 +00:00
too-live-local-in-immovable-gen.rs Lint for unused borrows as part of UNUSED_MUST_USE 2021-06-18 15:09:40 +08:00
too-live-local-in-immovable-gen.stderr Lint for unused borrows as part of UNUSED_MUST_USE 2021-06-18 15:09:40 +08:00
too-many-parameters.rs Update error message with too many parameters 2020-02-04 13:35:38 +01:00
too-many-parameters.stderr Add long error explanation for E0628 #61137 2020-03-10 02:04:48 +05:30
type-mismatch-error.rs Fix error message on type mismatch in generator 2020-02-02 13:20:57 +01:00
type-mismatch-error.stderr Fix error message on type mismatch in generator 2020-02-02 13:20:57 +01:00
type-mismatch-signature-deduction.rs Revert diagnostic duplication and accidental stabilization 2022-04-28 13:25:36 +00:00
type-mismatch-signature-deduction.stderr Resolve vars before emitting coerce error 2022-08-04 03:05:57 +00:00
xcrate-reachable.rs Add a resume type parameter to Generator 2020-02-02 13:20:57 +01:00
xcrate.rs Add a resume type parameter to Generator 2020-02-02 13:20:57 +01:00
yield-in-args-rev.rs Make closures and generators a must use types 2020-07-28 00:00:00 +00:00
yield-in-args-rev.stderr Make closures and generators a must use types 2020-07-28 00:00:00 +00:00
yield-in-args.rs Remove licenses 2018-12-25 21:08:33 -07:00
yield-in-args.stderr update tests for migrate mode by default 2019-04-22 08:40:08 +01:00
yield-in-box.rs Rebase resume argument projections during state transform 2021-09-28 14:39:18 +02:00
yield-in-box.stderr Rebase resume argument projections during state transform 2021-09-28 14:39:18 +02:00
yield-in-const.rs Yield is an expression form, not a statement. 2019-12-23 21:07:13 +08:00
yield-in-const.stderr Yield is an expression form, not a statement. 2019-12-23 21:07:13 +08:00
yield-in-function.rs Yield is an expression form, not a statement. 2019-12-23 21:07:13 +08:00
yield-in-function.stderr Yield is an expression form, not a statement. 2019-12-23 21:07:13 +08:00
yield-in-initializer.rs Lint for unused borrows as part of UNUSED_MUST_USE 2021-06-18 15:09:40 +08:00
yield-in-initializer.stderr Make closures and generators a must use types 2020-07-28 00:00:00 +00:00
yield-in-static.rs Yield is an expression form, not a statement. 2019-12-23 21:07:13 +08:00
yield-in-static.stderr Yield is an expression form, not a statement. 2019-12-23 21:07:13 +08:00
yield-outside-generator-issue-78653.rs Do not ICE when evaluating locals' types of invalid yield 2021-02-17 20:44:00 -08:00
yield-outside-generator-issue-78653.stderr Do not mention associated items when they introduce an obligation 2021-11-20 19:19:31 +00:00
yield-subtype.rs Make closures and generators a must use types 2020-07-28 00:00:00 +00:00
yield-subtype.stderr Make closures and generators a must use types 2020-07-28 00:00:00 +00:00
yield-while-iterating.rs Add a resume type parameter to Generator 2020-02-02 13:20:57 +01:00
yield-while-iterating.stderr Add a resume type parameter to Generator 2020-02-02 13:20:57 +01:00
yield-while-local-borrowed.rs Add a resume type parameter to Generator 2020-02-02 13:20:57 +01:00
yield-while-local-borrowed.stderr Update tests 2019-05-03 03:11:37 -04:00
yield-while-ref-reborrowed.rs Add a resume type parameter to Generator 2020-02-02 13:20:57 +01:00
yield-while-ref-reborrowed.stderr Mention first and last macro in backtrace 2022-07-19 03:07:54 +00:00
yielding-in-match-guards.rs Revert spurious change 2022-05-10 14:22:03 -07:00