about summary refs log tree commit diff
path: root/src/libstd/sys/unix/backtrace/mod.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-01-24 11:51:34 +0000
committerbors <bors@rust-lang.org>2017-01-24 11:51:34 +0000
commitd2d8ae6575281e92a58899fb8f8c51fc8f84de04 (patch)
treeb57fd6179467be20a977c2c77e24011525c0a305 /src/libstd/sys/unix/backtrace/mod.rs
parent65b17f53ef19439d6f14adadc706c745a92956a2 (diff)
parent469ecef422aab0364f87205f39f2830cbdfe6ab1 (diff)
downloadrust-d2d8ae6575281e92a58899fb8f8c51fc8f84de04.tar.gz
rust-d2d8ae6575281e92a58899fb8f8c51fc8f84de04.zip
Auto merge of #39214 - estebank:fix-labels-without-msg, r=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
Diffstat (limited to 'src/libstd/sys/unix/backtrace/mod.rs')
0 files changed, 0 insertions, 0 deletions