Only underline suggestion if it is not the only code being shown

13 files changed, 69 insertions, 24 deletions

diff --git a/src/test/ui/block-result/unexpected-return-on-unit.stderr b/src/test/ui/block-result/unexpected-return-on-unit.stderr
index 68afd2084f1..c8743c72e31 100644
--- a/src/test/ui/block-result/unexpected-return-on-unit.stderr
+++ b/src/test/ui/block-result/unexpected-return-on-unit.stderr
@@ -7,9 +7,13 @@ error[E0308]: mismatched types
    = note: expected type `()`
               found type `usize`
 help: did you mean to add a semicolon here?
-   |     foo();
+   |
+19 |     foo();
+   |          ^
 help: possibly return type missing here?
-   | fn bar() -> usize {
+   |
+18 | fn bar() -> usize {
+   |          ^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issue-22644.rs b/src/test/ui/issue-22644.rs
index 9269180396c..e8a2db4048c 100644
--- a/src/test/ui/issue-22644.rs
+++ b/src/test/ui/issue-22644.rs
@@ -14,5 +14,18 @@ fn main() {
 
     println!("{}", a as usize > b);
     println!("{}", a as usize < b);
-    println!("{}", a as usize < 4);
+    println!("{}", a
+                   as
+                   usize
+                   <
+                   4);
+    println!("{}", a
+
+
+                   as
+
+
+                   usize
+                   <
+                   5);
 }
diff --git a/src/test/ui/issue-22644.stderr b/src/test/ui/issue-22644.stderr
index f9702d43ad5..af61571625b 100644
--- a/src/test/ui/issue-22644.stderr
+++ b/src/test/ui/issue-22644.stderr
@@ -12,17 +12,37 @@ help: if you want to compare the casted value then write:
    |                    ^^^^^^^^^^^^
 
 error: `<` is interpreted as a start of generic arguments for `usize`, not a comparison
-  --> $DIR/issue-22644.rs:17:33
+  --> $DIR/issue-22644.rs:21:20
    |
-17 |     println!("{}", a as usize < 4);
-   |                               - ^ interpreted as generic argument
-   |                               |
-   |                               not interpreted as comparison
+20 |                    <
+   |                    - not interpreted as comparison
+21 |                    4);
+   |                    ^ interpreted as generic argument
    |
 help: if you want to compare the casted value then write:
    |
-17 |     println!("{}", (a as usize) < 4);
-   |                    ^^^^^^^^^^^^
+17 |     println!("{}", (a
+18 |                    as
+19 |                    usize)
+   |
+
+error: `<` is interpreted as a start of generic arguments for `usize`, not a comparison
+  --> $DIR/issue-22644.rs:30:20
+   |
+29 |                    <
+   |                    - not interpreted as comparison
+30 |                    5);
+   |                    ^ interpreted as generic argument
+   |
+help: if you want to compare the casted value then write:
+   |
+22 |     println!("{}", (a
+23 | 
+24 | 
+25 |                    as
+26 | 
+27 | 
+ ...
 
-error: aborting due to 2 previous errors
+error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/resolve/enums-are-namespaced-xc.stderr b/src/test/ui/resolve/enums-are-namespaced-xc.stderr
index 525dd4fe8f1..4b32ecff2fb 100644
--- a/src/test/ui/resolve/enums-are-namespaced-xc.stderr
+++ b/src/test/ui/resolve/enums-are-namespaced-xc.stderr
@@ -7,7 +7,7 @@ error[E0425]: cannot find value `A` in module `namespaced_enums`
 help: possible candidate is found in another module, you can import it into scope
    |
 12 | use namespaced_enums::Foo::A;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
 
 error[E0425]: cannot find function `B` in module `namespaced_enums`
   --> $DIR/enums-are-namespaced-xc.rs:18:31
@@ -18,7 +18,7 @@ error[E0425]: cannot find function `B` in module `namespaced_enums`
 help: possible candidate is found in another module, you can import it into scope
    |
 12 | use namespaced_enums::Foo::B;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
 
 error[E0422]: cannot find struct, variant or union type `C` in module `namespaced_enums`
   --> $DIR/enums-are-namespaced-xc.rs:21:31
@@ -29,7 +29,7 @@ error[E0422]: cannot find struct, variant or union type `C` in module `namespace
 help: possible candidate is found in another module, you can import it into scope
    |
 12 | use namespaced_enums::Foo::C;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/resolve/issue-16058.stderr b/src/test/ui/resolve/issue-16058.stderr
index 7abf6e3d5fd..6d7406f891c 100644
--- a/src/test/ui/resolve/issue-16058.stderr
+++ b/src/test/ui/resolve/issue-16058.stderr
@@ -7,7 +7,9 @@ error[E0574]: expected struct, variant or union type, found enum `Result`
 help: possible better candidates are found in other modules, you can import them into scope
    |
 12 | use std::fmt::Result;
+   |
 12 | use std::io::Result;
+   |
 12 | use std::thread::Result;
    |
 
diff --git a/src/test/ui/resolve/issue-17518.stderr b/src/test/ui/resolve/issue-17518.stderr
index d7017f30145..2f94dbdc2c5 100644
--- a/src/test/ui/resolve/issue-17518.stderr
+++ b/src/test/ui/resolve/issue-17518.stderr
@@ -7,7 +7,7 @@ error[E0422]: cannot find struct, variant or union type `E` in this scope
 help: possible candidate is found in another module, you can import it into scope
    |
 11 | use SomeEnum::E;
-   | ^^^^^^^^^^^^^^^^
+   |
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/resolve/issue-21221-1.stderr b/src/test/ui/resolve/issue-21221-1.stderr
index ce5ed7b5e5d..ddaee451e90 100644
--- a/src/test/ui/resolve/issue-21221-1.stderr
+++ b/src/test/ui/resolve/issue-21221-1.stderr
@@ -7,7 +7,9 @@ error[E0405]: cannot find trait `Mul` in this scope
 help: possible candidates are found in other modules, you can import them into scope
    |
 11 | use mul1::Mul;
+   |
 11 | use mul2::Mul;
+   |
 11 | use std::ops::Mul;
    |
 
@@ -20,9 +22,13 @@ error[E0412]: cannot find type `Mul` in this scope
 help: possible candidates are found in other modules, you can import them into scope
    |
 11 | use mul1::Mul;
+   |
 11 | use mul2::Mul;
+   |
 11 | use mul3::Mul;
+   |
 11 | use mul4::Mul;
+   |
 and 2 other candidates
 
 error[E0405]: cannot find trait `ThisTraitReallyDoesntExistInAnyModuleReally` in this scope
@@ -40,7 +46,7 @@ error[E0405]: cannot find trait `Div` in this scope
 help: possible candidate is found in another module, you can import it into scope
    |
 11 | use std::ops::Div;
-   | ^^^^^^^^^^^^^^^^^^
+   |
 
 error: cannot continue compilation due to previous error
 
diff --git a/src/test/ui/resolve/issue-21221-2.stderr b/src/test/ui/resolve/issue-21221-2.stderr
index bca3667d60b..a759116c6ac 100644
--- a/src/test/ui/resolve/issue-21221-2.stderr
+++ b/src/test/ui/resolve/issue-21221-2.stderr
@@ -7,7 +7,7 @@ error[E0405]: cannot find trait `T` in this scope
 help: possible candidate is found in another module, you can import it into scope
    |
 11 | use foo::bar::T;
-   | ^^^^^^^^^^^^^^^^
+   |
 
 error[E0601]: main function not found
 
diff --git a/src/test/ui/resolve/issue-21221-3.stderr b/src/test/ui/resolve/issue-21221-3.stderr
index f364fb590ab..f4d183192b6 100644
--- a/src/test/ui/resolve/issue-21221-3.stderr
+++ b/src/test/ui/resolve/issue-21221-3.stderr
@@ -7,7 +7,7 @@ error[E0405]: cannot find trait `OuterTrait` in this scope
 help: possible candidate is found in another module, you can import it into scope
    |
 16 | use issue_21221_3::outer::OuterTrait;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
 
 error: cannot continue compilation due to previous error
 
diff --git a/src/test/ui/resolve/issue-21221-4.stderr b/src/test/ui/resolve/issue-21221-4.stderr
index a022ca0749d..eb71ee893ce 100644
--- a/src/test/ui/resolve/issue-21221-4.stderr
+++ b/src/test/ui/resolve/issue-21221-4.stderr
@@ -7,7 +7,7 @@ error[E0405]: cannot find trait `T` in this scope
 help: possible candidate is found in another module, you can import it into scope
    |
 16 | use issue_21221_4::T;
-   | ^^^^^^^^^^^^^^^^^^^^^
+   |
 
 error: cannot continue compilation due to previous error
 
diff --git a/src/test/ui/resolve/issue-3907.stderr b/src/test/ui/resolve/issue-3907.stderr
index 56d3afd77e6..70b4599dbf8 100644
--- a/src/test/ui/resolve/issue-3907.stderr
+++ b/src/test/ui/resolve/issue-3907.stderr
@@ -7,7 +7,7 @@ error[E0404]: expected trait, found type alias `Foo`
 help: possible better candidate is found in another module, you can import it into scope
    |
 12 | use issue_3907::Foo;
-   | ^^^^^^^^^^^^^^^^^^^^
+   |
 
 error: cannot continue compilation due to previous error
 
diff --git a/src/test/ui/resolve/privacy-struct-ctor.stderr b/src/test/ui/resolve/privacy-struct-ctor.stderr
index c0b0fc63f22..57b143d34db 100644
--- a/src/test/ui/resolve/privacy-struct-ctor.stderr
+++ b/src/test/ui/resolve/privacy-struct-ctor.stderr
@@ -11,7 +11,7 @@ error[E0423]: expected value, found struct `Z`
 help: possible better candidate is found in another module, you can import it into scope
    |
 15 | use m::n::Z;
-   | ^^^^^^^^^^^^
+   |
 
 error[E0423]: expected value, found struct `S`
   --> $DIR/privacy-struct-ctor.rs:36:5
@@ -25,7 +25,7 @@ error[E0423]: expected value, found struct `S`
 help: possible better candidate is found in another module, you can import it into scope
    |
 13 | use m::S;
-   | ^^^^^^^^^
+   |
 
 error[E0423]: expected value, found struct `xcrate::S`
   --> $DIR/privacy-struct-ctor.rs:42:5
@@ -39,7 +39,7 @@ error[E0423]: expected value, found struct `xcrate::S`
 help: possible better candidate is found in another module, you can import it into scope
    |
 13 | use m::S;
-   | ^^^^^^^^^
+   |
 
 error[E0603]: tuple struct `Z` is private
   --> $DIR/privacy-struct-ctor.rs:25:9
diff --git a/src/test/ui/span/issue-35987.stderr b/src/test/ui/span/issue-35987.stderr
index b344f00cd88..0cd7e1046f6 100644
--- a/src/test/ui/span/issue-35987.stderr
+++ b/src/test/ui/span/issue-35987.stderr
@@ -7,7 +7,7 @@ error[E0404]: expected trait, found type parameter `Add`
 help: possible better candidate is found in another module, you can import it into scope
    |
 11 | use std::ops::Add;
-   | ^^^^^^^^^^^^^^^^^^
+   |
 
 error[E0601]: main function not found