When encountering an Item in a pat context, point at the item def by estebank · Pull Request #67741 · rust-lang/rust

estebank · 2019-12-31T01:43:06Z

error[E0308]: mismatched types
  --> $DIR/const-in-struct-pat.rs:8:17
   |
LL | struct foo;
   | ----------- `foo` defined here
...
LL |     let Thing { foo } = t;
   |                 ^^^ expected struct `std::string::String`, found struct `foo`
   |
   = note: `foo` is interpreted as a unit struct, not a new binding
help: you can bind the struct field to a different name
   |
LL |     let Thing { foo: other_foo } = t;
   |                 ^^^^^^^^^^^^^^

error[E0308]: mismatched types
  --> $DIR/const.rs:14:9
   |
LL | const FOO: Foo = Foo{bar: 5};
   | ----------------------------- constant defined here
...
LL |         FOO => {},
   |         ^^^
   |         |
   |         expected `&Foo`, found struct `Foo`
   |         `FOO` is interpreted as a constant, not a new binding
   |         help: use different name to introduce a new binding: `other_foo`

Fix #55631, fix #48062, cc #42876.

Centril · 2019-12-31T02:43:36Z

r? @Centril

Centril

Looks promising, but needs some changes.

Also, I'd like for #67730 to land first cause that one will be harder to rebase.

src/librustc_typeck/check/pat.rs

src/test/ui/issues/issue-33504.stderr

src/test/ui/suggestions/const-in-struct-pat.rs

estebank · 2019-12-31T05:43:57Z

I'm away for a week. I'll incorporate the feedback once I'm back.

src/test/ui/rfc-2005-default-binding-mode/const.stderr

src/librustc_typeck/check/pat.rs

Centril

r=me with these comments addressed

src/librustc_typeck/check/pat.rs

Centril · 2020-03-04T23:14:27Z

Ping @estebank :)

estebank · 2020-03-06T23:31:40Z

Rebased and addressed all coments, I believe.

Centril · 2020-03-07T04:35:32Z

Excellent! I'll follow up with a PR on my own to polish a bit, but this is great.

@bors r+

bors · 2020-03-07T04:35:33Z

📌 Commit 125159f has been approved by Centril

bors · 2020-03-07T04:35:34Z

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

When encountering an Item in a pat context, point at the item def ``` error[E0308]: mismatched types --> $DIR/const-in-struct-pat.rs:8:17 | LL | struct foo; | ----------- `foo` defined here ... LL | let Thing { foo } = t; | ^^^ expected struct `std::string::String`, found struct `foo` | = note: `foo` is interpreted as a unit struct, not a new binding help: you can bind the struct field to a different name | LL | let Thing { foo: other_foo } = t; | ^^^^^^^^^^^^^^ ``` ``` error[E0308]: mismatched types --> $DIR/const.rs:14:9 | LL | const FOO: Foo = Foo{bar: 5}; | ----------------------------- constant defined here ... LL | FOO => {}, | ^^^ | | | expected `&Foo`, found struct `Foo` | `FOO` is interpreted as a constant, not a new binding | help: use different name to introduce a new binding: `other_foo` ``` Fix rust-lang#55631, fix rust-lang#48062, cc rust-lang#42876.

@ghost

Rollup of 9 pull requests Successful merges: - #67741 (When encountering an Item in a pat context, point at the item def) - #68985 (Parse & reject postfix operators after casts) - #69656 (Use .next() instead of .nth(0) on iterators.) - #69680 (rustc_expand: Factor out `Annotatable::into_tokens` to a separate method) - #69690 (test(pattern): add tests for combinations of pattern features) - #69706 (Use subslice patterns in slice methods) - #69727 (Avoid using `unwrap()` in suggestions) - #69754 (Update deprecation version to 1.42 for Error::description) - #69782 (Don't redundantly repeat field names (clippy::redundant_field_names)) Failed merges: r? @ghost

rust-highfive assigned zackmdavis Dec 31, 2019

This comment has been minimized.

Sign in to view

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

rust-highfive assigned Centril and unassigned zackmdavis Dec 31, 2019

Centril suggested changes Dec 31, 2019

View reviewed changes

Centril 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 Dec 31, 2019

This comment has been minimized.

Sign in to view

estebank force-pushed the point-at-pat-def branch 2 times, most recently from 1c1142d to 7251e3f Compare January 7, 2020 03:23

This comment has been minimized.

Sign in to view

estebank commented Jan 7, 2020

View reviewed changes

src/test/ui/rfc-2005-default-binding-mode/const.stderr Outdated Show resolved Hide resolved

estebank force-pushed the point-at-pat-def branch from 7251e3f to 7a37d08 Compare January 7, 2020 05:31

estebank 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 Jan 7, 2020

This comment has been minimized.

Sign in to view

estebank force-pushed the point-at-pat-def branch from 7a37d08 to bd3b2b2 Compare January 8, 2020 18:29

Centril reviewed Jan 9, 2020

View reviewed changes

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

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

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

Centril 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 Jan 9, 2020

estebank force-pushed the point-at-pat-def branch from bd3b2b2 to 1176e45 Compare January 14, 2020 02:55

estebank force-pushed the point-at-pat-def branch from 1176e45 to f7332bf Compare January 17, 2020 05:07

estebank removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jan 17, 2020

estebank added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 17, 2020

Centril reviewed Jan 28, 2020

View reviewed changes

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

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

Centril 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 Jan 28, 2020

This comment has been minimized.

Sign in to view

Centril reviewed Feb 25, 2020

View reviewed changes

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

When encountering an Item in a pat context, point at the item def

125159f

estebank force-pushed the point-at-pat-def branch from f7332bf to 125159f Compare March 6, 2020 23:29

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 Mar 7, 2020

Centril mentioned this pull request Mar 7, 2020

Rollup of 12 pull requests #69795

Closed

Centril mentioned this pull request Mar 7, 2020

Rollup of 9 pull requests #69796

Merged

bors merged commit e8bb6c0 into rust-lang:master Mar 7, 2020

estebank deleted the point-at-pat-def branch November 9, 2023 05:17

Uh oh!

Conversation

estebank commented Dec 31, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

Centril commented Dec 31, 2019

Uh oh!

Centril left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

estebank commented Dec 31, 2019

Uh oh!

This comment has been minimized.

This comment has been minimized.

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

Uh oh!

Centril left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

Uh oh!

Centril commented Mar 4, 2020

Uh oh!

estebank commented Mar 6, 2020

Uh oh!

Centril commented Mar 7, 2020

Uh oh!

bors commented Mar 7, 2020

Uh oh!

bors commented Mar 7, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

estebank commented Dec 31, 2019 •

edited

Loading