Fix multiple labels when some don't have message by estebank · Pull Request #39214 · rust-lang/rust

estebank · 2017-01-21T05:19:52Z

The diagnostic emitter now accounts for labels with no text message, presenting the underline on its own, without drawing the line for the non existing message below it. Go from

error: foo
--> test.rs:3:6
|
3 | a { b { c } d }
| ----^^^^^^^----
| | |
| | `b` is a good letter
|

to

error: foo
--> test.rs:3:6
|
3 | a { b { c } d }
| ----^^^^^^^----
| |
| `b` is a good letter

from

error: foo
--> test.rs:3:6
|
3 | a { b { c } d }
| ^^^^-------^^^^
| | |
| |
| `a` is a good letter

to

error: foo
--> test.rs:3:6
|
3 | a { b { c } d }
| ^^^^-------^^^^ `a` is a good letter

and from

error: foo
--> test.rs:3:6
|
3 | a { b { c } d }
| ^^^^-------^^^^
| | |
| |
|

to

error: foo
--> test.rs:3:6
|
3 | a { b { c } d }
| ^^^^-------^^^^

r? @nikomatsakis
cc @jonathandturner, @GuillaumeGomez, @nrc

The diagnostic emitter now accounts for labels with no text message, presenting the underline on its own, without drawing the line for the non existing message below it. Go from ``` error: foo --> test.rs:3:6 | 3 | a { b { c } d } | ----^^^^^^^---- | | | | | `b` is a good letter | ``` to ``` error: foo --> test.rs:3:6 | 3 | a { b { c } d } | ----^^^^^^^---- | | | `b` is a good letter ``` and from ``` error: foo --> test.rs:3:6 | 3 | a { b { c } d } | ^^^^-------^^^^ | | | | | | `a` is a good letter ``` to ``` error: foo --> test.rs:3:6 | 3 | a { b { c } d } | ^^^^-------^^^^ `a` is a good letter ```

estebank · 2017-01-21T05:39:15Z

For an example of what this bug actually looks like in practice (taken from #39202):

The presentation logic should still allow for labels without messages with a reasonable output. Given that, the proper thing to do is to not have labels without a message, specially when multiple labels might overlap. Cases that would now be shown in this way

error: foo
--> test.rs:3:6
|
3 | a { b { c } d }
| ----^^^^^^^----

might actually be masking

error: foo
--> test.rs:3:6
|
3 | a { b { c } d }
| ----^^^^^^^----
| | | | |
| | | | something about d
| | | something about b and its block
| | something about the a block
| something about a

Thankfully, this is a very contrived example.

GuillaumeGomez · 2017-01-21T10:52:48Z

This is really great! 👍

nikomatsakis · 2017-01-23T20:50:32Z

@bors r+

bors · 2017-01-23T20:50:33Z

📌 Commit 469ecef has been approved by nikomatsakis

bors · 2017-01-23T20:50:42Z

⌛ Testing commit 469ecef with merge 7814fb7...

@nikomatsakis

Fix multiple labels when some don't have message The diagnostic emitter now accounts for labels with no text message, presenting the underline on its own, without drawing the line for the non existing message below it. Go from ``` error: foo --> test.rs:3:6 | 3 | a { b { c } d } | ----^^^^^^^---- | | | | | `b` is a good letter | ``` to ``` error: foo --> test.rs:3:6 | 3 | a { b { c } d } | ----^^^^^^^---- | | | `b` is a good letter ``` from ``` error: foo --> test.rs:3:6 | 3 | a { b { c } d } | ^^^^-------^^^^ | | | | | | `a` is a good letter ``` to ``` error: foo --> test.rs:3:6 | 3 | a { b { c } d } | ^^^^-------^^^^ `a` is a good letter ``` and from ``` error: foo --> test.rs:3:6 | 3 | a { b { c } d } | ^^^^-------^^^^ | | | | | | ``` to ``` error: foo --> test.rs:3:6 | 3 | a { b { c } d } | ^^^^-------^^^^ ``` r? @nikomatsakis cc @jonathandturner, @GuillaumeGomez, @nrc

bors · 2017-01-23T22:37:46Z

💔 Test failed - status-travis

alexcrichton · 2017-01-23T23:11:42Z

@bors: retry * osx linker segfaulted #38878

…

On Mon, Jan 23, 2017 at 2:37 PM, bors ***@***.***> wrote: 💔 Test failed - status-travis <https://travis-ci.org/rust-lang/rust/builds/194605255> — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <#39214 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAD95OUGf7JOXRDKnQButLmk4H0L4YAAks5rVSu8gaJpZM4Lp9-e> .

bors · 2017-01-24T03:40:38Z

⌛ Testing commit 469ecef with merge 067221f...

bors · 2017-01-24T03:42:35Z

💔 Test failed - status-travis

alexcrichton · 2017-01-24T03:48:16Z

@bors: retry * apparent travis bug...

…

On Mon, Jan 23, 2017 at 7:42 PM, bors ***@***.***> wrote: 💔 Test failed - status-travis <https://travis-ci.org/rust-lang/rust/builds/194701054> — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#39214 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAD95FHElkRuR4Xoq_5LfdWh09vWLJHPks5rVXMtgaJpZM4Lp9-e> .

bors · 2017-01-24T11:50:54Z

⌛ Testing commit 469ecef with merge d2d8ae6...

@nikomatsakis

Fix multiple labels when some don't have message The diagnostic emitter now accounts for labels with no text message, presenting the underline on its own, without drawing the line for the non existing message below it. Go from ``` error: foo --> test.rs:3:6 | 3 | a { b { c } d } | ----^^^^^^^---- | | | | | `b` is a good letter | ``` to ``` error: foo --> test.rs:3:6 | 3 | a { b { c } d } | ----^^^^^^^---- | | | `b` is a good letter ``` from ``` error: foo --> test.rs:3:6 | 3 | a { b { c } d } | ^^^^-------^^^^ | | | | | | `a` is a good letter ``` to ``` error: foo --> test.rs:3:6 | 3 | a { b { c } d } | ^^^^-------^^^^ `a` is a good letter ``` and from ``` error: foo --> test.rs:3:6 | 3 | a { b { c } d } | ^^^^-------^^^^ | | | | | | ``` to ``` error: foo --> test.rs:3:6 | 3 | a { b { c } d } | ^^^^-------^^^^ ``` r? @nikomatsakis cc @jonathandturner, @GuillaumeGomez, @nrc

bors · 2017-01-24T14:13:30Z

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing d2d8ae6 to master...

rust-highfive assigned nikomatsakis Jan 21, 2017

bors merged commit 469ecef into rust-lang:masterJan 24, 2017

estebank deleted the fix-labels-without-msg branch November 9, 2023 05:26

Navigation Menu

Uh oh!

Uh oh!

Fix multiple labels when some don't have message - #39214

Fix multiple labels when some don't have message#39214
bors merged 1 commit into
rust-lang:masterfrom
estebank:fix-labels-without-msg

estebank commented Jan 21, 2017•
edited
Loading

Uh oh!

estebank commented Jan 21, 2017

Uh oh!

GuillaumeGomez commented Jan 21, 2017

Uh oh!

nikomatsakis commented Jan 23, 2017

Uh oh!

bors commented Jan 23, 2017

Uh oh!

bors commented Jan 23, 2017

Uh oh!

bors commented Jan 23, 2017

Uh oh!

alexcrichton commented Jan 23, 2017 via email

Uh oh!

bors commented Jan 24, 2017

Uh oh!

bors commented Jan 24, 2017

Uh oh!

alexcrichton commented Jan 24, 2017 via email

Uh oh!

bors commented Jan 24, 2017

Uh oh!

bors commented Jan 24, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Uh oh!

Conversation

estebank commented Jan 21, 2017• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

estebank commented Jan 21, 2017

Uh oh!

GuillaumeGomez commented Jan 21, 2017

Uh oh!

nikomatsakis commented Jan 23, 2017

Uh oh!

bors commented Jan 23, 2017

Uh oh!

bors commented Jan 23, 2017

Uh oh!

bors commented Jan 23, 2017

Uh oh!

alexcrichton commented Jan 23, 2017 via email

Uh oh!

bors commented Jan 24, 2017

Uh oh!

bors commented Jan 24, 2017

Uh oh!

alexcrichton commented Jan 24, 2017 via email

Uh oh!

bors commented Jan 24, 2017

Uh oh!

bors commented Jan 24, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

estebank commented Jan 21, 2017•
edited
Loading