From: bors <bors@rust-lang.org>
Date: Thu, 6 Jul 2017 22:22:21 +0000 (+0000)
Subject: Auto merge of #42904 - estebank:number-suggestions, r=nikomatsakis
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=d2ebb12a1d6f6599f9171a65a2160e523b53ccdf;p=rust.git

Auto merge of #42904 - estebank:number-suggestions, r=nikomatsakis

Make suggestion include the line number

When there're more than one suggestions in the same diagnostic, they are
displayed in their own block, instead of inline. In order to reduce
confusion, those blocks now display the line number.

New output:

```
error[E0308]: mismatched types
  --> ../../src/test/ui/block-result/unexpected-return-on-unit.rs:19:5
   |
19 |     foo()
   |     ^^^^^ expected (), found usize
   |
   = note: expected type `()`
              found type `usize`
help: did you mean to add a semicolon here?
   |
19 |     foo();
   |          ^
help: possibly return type missing here?
   |
18 | fn bar() -> usize {
   |          ^^^^^^^^

error: aborting due to previous error(s)
```

Fix #39152.
---

d2ebb12a1d6f6599f9171a65a2160e523b53ccdf