Make spans for tuple patterns in E0023 more precise #88123

camelid · 2021-08-17T20:57:34Z

As suggested in #86307. Closes #86307.

r? @estebank

src/test/ui/destructuring-assignment/tuple_struct_destructure_fail.stderr

As suggested in rust-lang#86307.

compiler/rustc_hir/src/hir.rs

src/test/ui/pattern/pat-tuple-overfield.stderr

src/test/ui/pattern/pat-tuple-underfield.stderr

src/test/ui/pattern/pat-tuple-field-count-cross.rs

src/test/ui/pattern/pat-tuple-field-count-cross.stderr

This should cause a compiler error in the future if more variants are added without `Node::ident()` being updated.

src/test/ui/typeck/struct-enum-wrong-args.stderr

compiler/rustc_hir/src/hir.rs

estebank · 2021-08-22T14:50:33Z

src/test/ui/pattern/pat-tuple-overfield.stderr

+help: a tuple struct with a similar name exists
+   |
+LL |         Z1(_, _) => {}
+   |         ~~


It seems to me that we should suggest this only if the number of fields matches or if nothing else is being suggested (but that seems out of scope for this PR).

estebank

Have to say, love how this is shaping up 😍

* Highlight the whole pattern if it has no fields * Highlight the whole definition if it has no fields * Only highlight the pattern name if the pattern is multi-line * Determine whether a pattern is multi-line based on distance from name to last field, rather than first field

camelid · 2021-08-26T01:13:35Z

r=me after removing the secondary span label with no text in the pattern for cases where there's more than 0 fields, and changing the 0 field case to point at the whole pattern (like it used to).

Ok, done! I'll let you approve it so you can check that the new output matches what you were expecting :)

camelid · 2021-08-26T01:15:43Z

From the commit message:

Determine whether a pattern is multi-line based on distance from name
to last field, rather than first field

I made this change so that code like the following that uses "visual indentation" is understood as multi-line:

M(1,
  2,
  3)

estebank · 2021-08-26T10:16:24Z

I made this change so that code like the following that uses "visual indentation" is understood as multi-line:
M(1,
  2,
  3)

Personally I would lean towards hiding the secondary span label under M simply because the code will be visible, but I'm not bothered by it :)

@bors r+

bors · 2021-08-26T10:16:25Z

📌 Commit 8a6501d has been approved by estebank

…tebank Make spans for tuple patterns in E0023 more precise As suggested in rust-lang#86307. Closes rust-lang#86307. r? `@estebank`

…tebank Make spans for tuple patterns in E0023 more precise As suggested in rust-lang#86307. Closes rust-lang#86307. r? ``@estebank``

…tebank Make spans for tuple patterns in E0023 more precise As suggested in rust-lang#86307. Closes rust-lang#86307. r? ```@estebank```

…arth Rollup of 11 pull requests Successful merges: - rust-lang#87832 (Fix debugger stepping behavior with `match` expressions) - rust-lang#88123 (Make spans for tuple patterns in E0023 more precise) - rust-lang#88215 (Reland rust-lang#83738: "rustdoc: Don't load all extern crates unconditionally") - rust-lang#88216 (Don't stabilize creation of TryReserveError instances) - rust-lang#88270 (Handle type ascription type ops in NLL HRTB diagnostics) - rust-lang#88289 (Fixes for LLVM change 0f45c16) - rust-lang#88320 (type_implements_trait consider obligation failure on overflow) - rust-lang#88332 (Add argument types tait tests) - rust-lang#88340 (Add `c_size_t` and `c_ssize_t` to `std::os::raw`.) - rust-lang#88346 (Revert "Add type of a let tait test impl trait straight in let") - rust-lang#88348 (Add field types tait tests) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

camelid added A-diagnostics Area: Messages for errors, warnings, and lints C-enhancement Category: An issue proposing an enhancement or a PR with one. labels Aug 17, 2021

rust-highfive assigned estebank Aug 17, 2021

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

camelid commented Aug 17, 2021

View reviewed changes

src/test/ui/destructuring-assignment/tuple_struct_destructure_fail.stderr Outdated Show resolved Hide resolved

camelid commented Aug 17, 2021

View reviewed changes

src/test/ui/destructuring-assignment/tuple_struct_destructure_fail.stderr Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

Make spans for tuple patterns in E0023 more precise

da25af2

As suggested in rust-lang#86307.

camelid force-pushed the tup-pat-precise-spans branch from 15b1b2c to da25af2 Compare August 17, 2021 21:28

camelid 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 Aug 19, 2021