NLL: Add union justifications to conflicting borrows. by davidtwco · Pull Request #57102 · rust-lang/rust

davidtwco · 2018-12-24T16:13:24Z

This PR adds justifications to error messages for conflicting borrows of union fields.

Where previously an error message would say cannot borrow `u.b` as mutable.., it now says cannot borrow `u` (via `u.b`) as mutable...

r? @pnkfelix

This commit adds justifications to error messages for conflicting borrows of union fields. Where previously an error message would say ``cannot borrow `u.b` as mutable..``, it now says ``cannot borrow `u` (via `u.b`) as mutable..``.

davidtwco · 2018-12-30T12:35:35Z

r? @nikomatsakis

This commit improves the logic for place descriptions in conflicting borrow errors so that borrows of union fields have better messages even when the unions are embedded in other unions or structs.

This commit improves diagnostic labels to mention which field a borrow overlaps with and adds a note explaining that the fields overlap.

nikomatsakis · 2019-01-08T18:59:00Z

I'm not sure about saying that we "borrow" u, but it's kind of nit-picking at this point. The error is quite nice.

@bors r+

bors · 2019-01-08T18:59:01Z

📌 Commit c2b477c has been approved by nikomatsakis

davidtwco · 2019-01-09T11:09:30Z

@bors retry

cc #55861

bors · 2019-01-10T06:01:48Z

⌛ Testing commit c2b477c with merge c62ef99698f561711103e57302deb5f9713489af...

bors · 2019-01-10T06:01:59Z

💔 Test failed - status-appveyor

emilyalbini · 2019-01-10T08:18:27Z

@bors retry
AppVeyor... what's wrong with you today?

@pnkfelix

NLL: Add union justifications to conflicting borrows. Fixesrust-lang#57100. This PR adds justifications to error messages for conflicting borrows of union fields. Where previously an error message would say ``cannot borrow `u.b` as mutable..``, it now says ``cannot borrow `u` (via `u.b`) as mutable..``. r? @pnkfelix

@ghost

Rollup of 4 pull requests Successful merges: - #57004 (Make `TokenStream` less recursive.) - #57102 (NLL: Add union justifications to conflicting borrows.) - #57337 (rustc: Place wasm linker args first instead of last) - #57549 (Add #[must_use] message to Iterator and Future) Failed merges: r? @ghost

rust-highfive assigned pnkfelix Dec 24, 2018

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

This comment has been minimized.
Sign in to view

davidtwco force-pushed the issue-57100 branch from d7216a7 to a6f5d83Compare December 24, 2018 18:32

This comment has been minimized.
Sign in to view

davidtwco force-pushed the issue-57100 branch from a6f5d83 to aaec069Compare December 24, 2018 19:22

This comment has been minimized.
Sign in to view

davidtwco force-pushed the issue-57100 branch from aaec069 to e33afe6Compare December 24, 2018 20:35

This comment has been minimized.
Sign in to view

Add union justifications to conflicting borrows.
69bded2
This commit adds justifications to error messages for conflicting borrows of union fields. Where previously an error message would say ``cannot borrow `u.b` as mutable..``, it now says ``cannot borrow `u` (via `u.b`) as mutable..``.

davidtwco force-pushed the issue-57100 branch from e33afe6 to 69bded2Compare December 26, 2018 20:28

rust-highfive assigned nikomatsakis and unassigned pnkfelix Dec 30, 2018

nikomatsakis reviewed Jan 2, 2019
View reviewed changes

Comment threadsrc/librustc_mir/borrow_check/error_reporting.rs Outdated
Comment threadsrc/test/ui/borrowck/borrowck-union-borrow.nll.stderr

nikomatsakis 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 3, 2019

davidtwco added 2 commits January 4, 2019 20:56

Make conflicting borrow description more robust.
388dffe
This commit improves the logic for place descriptions in conflicting borrow errors so that borrows of union fields have better messages even when the unions are embedded in other unions or structs.

Improve diagnostic labels and add note.
c2b477c
This commit improves diagnostic labels to mention which field a borrow overlaps with and adds a note explaining that the fields overlap.

nikomatsakis approved these changes Jan 8, 2019
View reviewed changes

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 Jan 8, 2019

This comment has been minimized.
Sign in to view

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 9, 2019

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

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 10, 2019

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 Jan 10, 2019

Centril mentioned this pull request Jan 13, 2019
Rollup of 7 pull requests #57574
Closed

Centril mentioned this pull request Jan 13, 2019
Rollup of 6 pull requests #57575
Closed

Centril mentioned this pull request Jan 13, 2019
Rollup of 5 pull requests #57576
Closed

Centril mentioned this pull request Jan 13, 2019
Rollup of 4 pull requests #57577
Merged

bors merged commit c2b477c into rust-lang:masterJan 13, 2019

davidtwco deleted the issue-57100 branch January 14, 2019 09:33

pnkfelix mentioned this pull request Jan 28, 2019
Project fails (or takes long time) to compile on latest stable and nightly (hang/stackoverflow) #57735
Closed

Navigation Menu

Uh oh!

Uh oh!

NLL: Add union justifications to conflicting borrows. - #57102

NLL: Add union justifications to conflicting borrows.#57102
bors merged 3 commits into
rust-lang:masterfrom
davidtwco:issue-57100

davidtwco commented Dec 24, 2018

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

davidtwco commented Dec 30, 2018

Uh oh!

Uh oh!

Uh oh!

nikomatsakis commented Jan 8, 2019

Uh oh!

bors commented Jan 8, 2019

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

davidtwco commented Jan 9, 2019

Uh oh!

bors commented Jan 10, 2019

Uh oh!

bors commented Jan 10, 2019

Uh oh!

emilyalbini commented Jan 10, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Uh oh!

Conversation

davidtwco commented Dec 24, 2018

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

davidtwco commented Dec 30, 2018

Uh oh!

Uh oh!

Uh oh!

nikomatsakis commented Jan 8, 2019

Uh oh!

bors commented Jan 8, 2019

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

davidtwco commented Jan 9, 2019

Uh oh!

bors commented Jan 10, 2019

Uh oh!

bors commented Jan 10, 2019

Uh oh!

emilyalbini commented Jan 10, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants