diff --git a/src/test/ui/associated-const/associated-const-no-item.stderr b/src/test/ui/associated-const/associated-const-no-item.stderr
index 31f9683ca0f13..a09c04ea0b2fd 100644
--- a/src/test/ui/associated-const/associated-const-no-item.stderr
+++ b/src/test/ui/associated-const/associated-const-no-item.stderr
@@ -1,10 +1,8 @@
 error[E0599]: no associated item named `ID` found for type `i32` in the current scope
-  --> $DIR/associated-const-no-item.rs:16:23
+  --> $DIR/associated-const-no-item.rs:16:16
    |
 LL | const X: i32 = <i32>::ID;
-   |                -------^^
-   |                |
-   |                associated item not found in `i32`
+   |                ^^^^^^^^^ associated item not found in `i32`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
    = note: the following trait defines an item `ID`, perhaps you need to implement it:
diff --git a/src/test/ui/bogus-tag.stderr b/src/test/ui/bogus-tag.stderr
index 36ed28c345a0b..f9917b07f070b 100644
--- a/src/test/ui/bogus-tag.stderr
+++ b/src/test/ui/bogus-tag.stderr
@@ -1,11 +1,11 @@
 error[E0599]: no variant named `hsl` found for type `color` in the current scope
-  --> $DIR/bogus-tag.rs:18:14
+  --> $DIR/bogus-tag.rs:18:7
    |
 LL | enum color { rgb(isize, isize, isize), rgba(isize, isize, isize, isize), }
    | ---------- variant `hsl` not found here
 ...
 LL |       color::hsl(h, s, l) => { println!("hsl"); }
-   |       -------^^^--------- variant not found in `color`
+   |       ^^^^^^^^^^^^^^^^^^^ variant not found in `color`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/did_you_mean/bad-assoc-pat.stderr b/src/test/ui/did_you_mean/bad-assoc-pat.stderr
index a7b3846a8f634..10ee175a97e16 100644
--- a/src/test/ui/did_you_mean/bad-assoc-pat.stderr
+++ b/src/test/ui/did_you_mean/bad-assoc-pat.stderr
@@ -23,36 +23,28 @@ LL |         &(u8,)::AssocItem => {}
    |          ^^^^^^^^^^^^^^^^ help: try: `<(u8,)>::AssocItem`
 
 error[E0599]: no associated item named `AssocItem` found for type `[u8]` in the current scope
-  --> $DIR/bad-assoc-pat.rs:13:15
+  --> $DIR/bad-assoc-pat.rs:13:9
    |
 LL |         [u8]::AssocItem => {}
-   |         ------^^^^^^^^^
-   |         |
-   |         associated item not found in `[u8]`
+   |         ^^^^^^^^^^^^^^^ associated item not found in `[u8]`
 
 error[E0599]: no associated item named `AssocItem` found for type `(u8, u8)` in the current scope
-  --> $DIR/bad-assoc-pat.rs:16:19
+  --> $DIR/bad-assoc-pat.rs:16:9
    |
 LL |         (u8, u8)::AssocItem => {}
-   |         ----------^^^^^^^^^
-   |         |
-   |         associated item not found in `(u8, u8)`
+   |         ^^^^^^^^^^^^^^^^^^^ associated item not found in `(u8, u8)`
 
 error[E0599]: no associated item named `AssocItem` found for type `_` in the current scope
-  --> $DIR/bad-assoc-pat.rs:19:12
+  --> $DIR/bad-assoc-pat.rs:19:9
    |
 LL |         _::AssocItem => {}
-   |         ---^^^^^^^^^
-   |         |
-   |         associated item not found in `_`
+   |         ^^^^^^^^^^^^ associated item not found in `_`
 
 error[E0599]: no associated item named `AssocItem` found for type `(u8,)` in the current scope
-  --> $DIR/bad-assoc-pat.rs:24:17
+  --> $DIR/bad-assoc-pat.rs:24:10
    |
 LL |         &(u8,)::AssocItem => {}
-   |          -------^^^^^^^^^
-   |          |
-   |          associated item not found in `(u8,)`
+   |          ^^^^^^^^^^^^^^^^ associated item not found in `(u8,)`
 
 error: aborting due to 8 previous errors
 
diff --git a/src/test/ui/dont-suggest-private-trait-method.stderr b/src/test/ui/dont-suggest-private-trait-method.stderr
index c2f21606e2133..81ecc546a6dee 100644
--- a/src/test/ui/dont-suggest-private-trait-method.stderr
+++ b/src/test/ui/dont-suggest-private-trait-method.stderr
@@ -1,13 +1,11 @@
 error[E0599]: no function or associated item named `new` found for type `T` in the current scope
-  --> $DIR/dont-suggest-private-trait-method.rs:14:8
+  --> $DIR/dont-suggest-private-trait-method.rs:14:5
    |
 LL | struct T;
    | --------- function or associated item `new` not found for this
 ...
 LL |     T::new();
-   |     ---^^^
-   |     |
-   |     function or associated item not found in `T`
+   |     ^^^^^^ function or associated item not found in `T`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/empty/empty-struct-braces-expr.stderr b/src/test/ui/empty/empty-struct-braces-expr.stderr
index 3252d0db4dca2..9b6114875e2e5 100644
--- a/src/test/ui/empty/empty-struct-braces-expr.stderr
+++ b/src/test/ui/empty/empty-struct-braces-expr.stderr
@@ -47,24 +47,20 @@ LL |     let xe1 = XEmpty1(); //~ ERROR expected function, found struct `XEmpty1
    |               did you mean `XEmpty1 { /* fields */ }`?
 
 error[E0599]: no variant named `Empty3` found for type `empty_struct::XE` in the current scope
-  --> $DIR/empty-struct-braces-expr.rs:32:19
+  --> $DIR/empty-struct-braces-expr.rs:32:15
    |
 LL |     let xe3 = XE::Empty3; //~ ERROR no variant named `Empty3` found for type
-   |               ----^^^^^^
-   |               |
-   |               variant not found in `empty_struct::XE`
+   |               ^^^^^^^^^^ variant not found in `empty_struct::XE`
    |
-   = help: did you mean `XEmpty3`?
+   = note: did you mean `empty_struct::XE::XEmpty3`?
 
 error[E0599]: no variant named `Empty3` found for type `empty_struct::XE` in the current scope
-  --> $DIR/empty-struct-braces-expr.rs:33:19
+  --> $DIR/empty-struct-braces-expr.rs:33:15
    |
 LL |     let xe3 = XE::Empty3(); //~ ERROR no variant named `Empty3` found for type
-   |               ----^^^^^^
-   |               |
-   |               variant not found in `empty_struct::XE`
+   |               ^^^^^^^^^^ variant not found in `empty_struct::XE`
    |
-   = help: did you mean `XEmpty3`?
+   = note: did you mean `empty_struct::XE::XEmpty3`?
 
 error: aborting due to 8 previous errors
 
diff --git a/src/test/ui/error-codes/E0599.stderr b/src/test/ui/error-codes/E0599.stderr
index f6bdc8b8579dc..d118939d17a15 100644
--- a/src/test/ui/error-codes/E0599.stderr
+++ b/src/test/ui/error-codes/E0599.stderr
@@ -1,11 +1,11 @@
 error[E0599]: no associated item named `NotEvenReal` found for type `Foo` in the current scope
-  --> $DIR/E0599.rs:14:20
+  --> $DIR/E0599.rs:14:15
    |
 LL | struct Foo;
    | ----------- associated item `NotEvenReal` not found for this
 ...
 LL |     || if let Foo::NotEvenReal() = Foo {}; //~ ERROR E0599
-   |               -----^^^^^^^^^^^-- associated item not found in `Foo`
+   |               ^^^^^^^^^^^^^^^^^^ associated item not found in `Foo`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/invalid/invalid-path-in-const.stderr b/src/test/ui/invalid/invalid-path-in-const.stderr
index 47fb717d0ca8a..9214800b93a59 100644
--- a/src/test/ui/invalid/invalid-path-in-const.stderr
+++ b/src/test/ui/invalid/invalid-path-in-const.stderr
@@ -1,10 +1,8 @@
 error[E0599]: no associated item named `DOESNOTEXIST` found for type `u32` in the current scope
-  --> $DIR/invalid-path-in-const.rs:12:23
+  --> $DIR/invalid-path-in-const.rs:12:18
    |
 LL |     fn f(a: [u8; u32::DOESNOTEXIST]) {}
-   |                  -----^^^^^^^^^^^^
-   |                  |
-   |                  associated item not found in `u32`
+   |                  ^^^^^^^^^^^^^^^^^ associated item not found in `u32`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-22933-2.stderr b/src/test/ui/issues/issue-22933-2.stderr
index 97445b609658d..435a89b716f96 100644
--- a/src/test/ui/issues/issue-22933-2.stderr
+++ b/src/test/ui/issues/issue-22933-2.stderr
@@ -1,13 +1,11 @@
 error[E0599]: no variant named `PIE` found for type `Delicious` in the current scope
-  --> $DIR/issue-22933-2.rs:14:55
+  --> $DIR/issue-22933-2.rs:14:44
    |
 LL | enum Delicious {
    | -------------- variant `PIE` not found here
 ...
 LL |     ApplePie = Delicious::Apple as isize | Delicious::PIE as isize,
-   |                                            -----------^^^
-   |                                            |
-   |                                            variant not found in `Delicious`
+   |                                            ^^^^^^^^^^^^^^ variant not found in `Delicious`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-22933-3.stderr b/src/test/ui/issues/issue-22933-3.stderr
index d3ea39b2adbbb..3d4d2df4d322a 100644
--- a/src/test/ui/issues/issue-22933-3.stderr
+++ b/src/test/ui/issues/issue-22933-3.stderr
@@ -1,10 +1,8 @@
 error[E0599]: no associated item named `MIN` found for type `u8` in the current scope
-  --> $DIR/issue-22933-3.rs:11:22
+  --> $DIR/issue-22933-3.rs:11:18
    |
 LL | const FOO: [u32; u8::MIN as usize] = [];
-   |                  ----^^^
-   |                  |
-   |                  associated item not found in `u8`
+   |                  ^^^^^^^ associated item not found in `u8`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-23173.stderr b/src/test/ui/issues/issue-23173.stderr
index 14a1188710f4b..d58a4d2b8f8a9 100644
--- a/src/test/ui/issues/issue-23173.stderr
+++ b/src/test/ui/issues/issue-23173.stderr
@@ -1,46 +1,38 @@
 error[E0599]: no variant named `Homura` found for type `Token` in the current scope
-  --> $DIR/issue-23173.rs:19:23
+  --> $DIR/issue-23173.rs:19:16
    |
 LL | enum Token { LeftParen, RightParen, Plus, Minus, /* etc */ }
    | ---------- variant `Homura` not found here
 ...
 LL |     use_token(&Token::Homura);
-   |                -------^^^^^^
-   |                |
-   |                variant not found in `Token`
+   |                ^^^^^^^^^^^^^ variant not found in `Token`
 
 error[E0599]: no function or associated item named `method` found for type `Struct` in the current scope
-  --> $DIR/issue-23173.rs:21:13
+  --> $DIR/issue-23173.rs:21:5
    |
 LL | struct Struct {
    | ------------- function or associated item `method` not found for this
 ...
 LL |     Struct::method();
-   |     --------^^^^^^
-   |     |
-   |     function or associated item not found in `Struct`
+   |     ^^^^^^^^^^^^^^ function or associated item not found in `Struct`
 
 error[E0599]: no function or associated item named `method` found for type `Struct` in the current scope
-  --> $DIR/issue-23173.rs:23:13
+  --> $DIR/issue-23173.rs:23:5
    |
 LL | struct Struct {
    | ------------- function or associated item `method` not found for this
 ...
 LL |     Struct::method;
-   |     --------^^^^^^
-   |     |
-   |     function or associated item not found in `Struct`
+   |     ^^^^^^^^^^^^^^ function or associated item not found in `Struct`
 
 error[E0599]: no associated item named `Assoc` found for type `Struct` in the current scope
-  --> $DIR/issue-23173.rs:25:13
+  --> $DIR/issue-23173.rs:25:5
    |
 LL | struct Struct {
    | ------------- associated item `Assoc` not found for this
 ...
 LL |     Struct::Assoc;
-   |     --------^^^^^
-   |     |
-   |     associated item not found in `Struct`
+   |     ^^^^^^^^^^^^^ associated item not found in `Struct`
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/issues/issue-23217.stderr b/src/test/ui/issues/issue-23217.stderr
index 1ba8f276cc9ce..d87f239bca690 100644
--- a/src/test/ui/issues/issue-23217.stderr
+++ b/src/test/ui/issues/issue-23217.stderr
@@ -1,14 +1,12 @@
 error[E0599]: no variant named `A` found for type `SomeEnum` in the current scope
-  --> $DIR/issue-23217.rs:12:19
+  --> $DIR/issue-23217.rs:12:9
    |
 LL | pub enum SomeEnum {
    | ----------------- variant `A` not found here
 LL |     B = SomeEnum::A,
-   |         ----------^
-   |         |
-   |         variant not found in `SomeEnum`
+   |         ^^^^^^^^^^^ variant not found in `SomeEnum`
    |
-   = help: did you mean `B`?
+   = note: did you mean `SomeEnum::B`?
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-28344.stderr b/src/test/ui/issues/issue-28344.stderr
index bd4f4b88d32ba..734c761d0b7bc 100644
--- a/src/test/ui/issues/issue-28344.stderr
+++ b/src/test/ui/issues/issue-28344.stderr
@@ -5,12 +5,10 @@ LL |     let x: u8 = BitXor::bitor(0 as u8, 0 as u8);
    |                 ^^^^^^^^^^^^^ associated type `Output` must be specified
 
 error[E0599]: no function or associated item named `bitor` found for type `dyn std::ops::BitXor<_>` in the current scope
-  --> $DIR/issue-28344.rs:14:25
+  --> $DIR/issue-28344.rs:14:17
    |
 LL |     let x: u8 = BitXor::bitor(0 as u8, 0 as u8);
-   |                 --------^^^^^
-   |                 |
-   |                 function or associated item not found in `dyn std::ops::BitXor<_>`
+   |                 ^^^^^^^^^^^^^ function or associated item not found in `dyn std::ops::BitXor<_>`
    |
    = help: did you mean `bitxor`?
 
@@ -21,12 +19,10 @@ LL |     let g = BitXor::bitor;
    |             ^^^^^^^^^^^^^ associated type `Output` must be specified
 
 error[E0599]: no function or associated item named `bitor` found for type `dyn std::ops::BitXor<_>` in the current scope
-  --> $DIR/issue-28344.rs:18:21
+  --> $DIR/issue-28344.rs:18:13
    |
 LL |     let g = BitXor::bitor;
-   |             --------^^^^^
-   |             |
-   |             function or associated item not found in `dyn std::ops::BitXor<_>`
+   |             ^^^^^^^^^^^^^ function or associated item not found in `dyn std::ops::BitXor<_>`
    |
    = help: did you mean `bitxor`?
 
diff --git a/src/test/ui/issues/issue-28586.stderr b/src/test/ui/issues/issue-28586.stderr
index e48e642301ed6..9820d64909edd 100644
--- a/src/test/ui/issues/issue-28586.stderr
+++ b/src/test/ui/issues/issue-28586.stderr
@@ -1,10 +1,8 @@
 error[E0599]: no associated item named `BYTES` found for type `usize` in the current scope
-  --> $DIR/issue-28586.rs:14:26
+  --> $DIR/issue-28586.rs:14:19
    |
 LL | impl Foo for [u8; usize::BYTES] {}
-   |                   -------^^^^^
-   |                   |
-   |                   associated item not found in `usize`
+   |                   ^^^^^^^^^^^^ associated item not found in `usize`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-28971.stderr b/src/test/ui/issues/issue-28971.stderr
index 77aac975768be..c04e21f7c5857 100644
--- a/src/test/ui/issues/issue-28971.stderr
+++ b/src/test/ui/issues/issue-28971.stderr
@@ -1,13 +1,13 @@
 error[E0599]: no variant named `Baz` found for type `Foo` in the current scope
-  --> $DIR/issue-28971.rs:19:18
+  --> $DIR/issue-28971.rs:19:13
    |
 LL | enum Foo {
    | -------- variant `Baz` not found here
 ...
 LL |             Foo::Baz(..) => (),
-   |             -----^^^---- variant not found in `Foo`
+   |             ^^^^^^^^^^^^ variant not found in `Foo`
    |
-   = help: did you mean `Bar`?
+   = note: did you mean `Foo::Bar`?
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-30123.stderr b/src/test/ui/issues/issue-30123.stderr
index a08c1d678d8c7..094c962de29ec 100644
--- a/src/test/ui/issues/issue-30123.stderr
+++ b/src/test/ui/issues/issue-30123.stderr
@@ -1,10 +1,8 @@
 error[E0599]: no function or associated item named `new_undirected` found for type `issue_30123_aux::Graph<i32, i32>` in the current scope
-  --> $DIR/issue-30123.rs:17:33
+  --> $DIR/issue-30123.rs:17:14
    |
 LL |     let ug = Graph::<i32, i32>::new_undirected();
-   |              -------------------^^^^^^^^^^^^^^
-   |              |
-   |              function or associated item not found in `issue_30123_aux::Graph<i32, i32>`
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ function or associated item not found in `issue_30123_aux::Graph<i32, i32>`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-38919.stderr b/src/test/ui/issues/issue-38919.stderr
index 398a38877d27e..b80367d7c6cff 100644
--- a/src/test/ui/issues/issue-38919.stderr
+++ b/src/test/ui/issues/issue-38919.stderr
@@ -1,10 +1,8 @@
 error[E0599]: no associated item named `Item` found for type `T` in the current scope
-  --> $DIR/issue-38919.rs:12:8
+  --> $DIR/issue-38919.rs:12:5
    |
 LL |     T::Item; //~ ERROR no associated item named `Item` found for type `T` in the current scope
-   |     ---^^^^
-   |     |
-   |     associated item not found in `T`
+   |     ^^^^^^^ associated item not found in `T`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-39559.stderr b/src/test/ui/issues/issue-39559.stderr
index 83af9d82e0bee..2ce6dfdbe44cd 100644
--- a/src/test/ui/issues/issue-39559.stderr
+++ b/src/test/ui/issues/issue-39559.stderr
@@ -1,10 +1,8 @@
 error[E0599]: no function or associated item named `dim` found for type `D` in the current scope
-  --> $DIR/issue-39559.rs:24:21
+  --> $DIR/issue-39559.rs:24:18
    |
 LL |     entries: [T; D::dim()],
-   |                  ---^^^
-   |                  |
-   |                  function or associated item not found in `D`
+   |                  ^^^^^^ function or associated item not found in `D`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
    = note: the following trait defines an item `dim`, perhaps you need to implement it:
diff --git a/src/test/ui/issues/issue-3973.stderr b/src/test/ui/issues/issue-3973.stderr
index 1389dcd2a039b..9be07614ec176 100644
--- a/src/test/ui/issues/issue-3973.stderr
+++ b/src/test/ui/issues/issue-3973.stderr
@@ -8,15 +8,13 @@ LL | |     }
    | |_____^ not a member of trait `ToString_`
 
 error[E0599]: no function or associated item named `new` found for type `Point` in the current scope
-  --> $DIR/issue-3973.rs:32:20
+  --> $DIR/issue-3973.rs:32:13
    |
 LL | struct Point {
    | ------------ function or associated item `new` not found for this
 ...
 LL |     let p = Point::new(0.0, 0.0);
-   |             -------^^^
-   |             |
-   |             function or associated item not found in `Point`
+   |             ^^^^^^^^^^ function or associated item not found in `Point`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/issues/issue-42880.stderr b/src/test/ui/issues/issue-42880.stderr
index 1087e5a014e9d..cf1c3022a2273 100644
--- a/src/test/ui/issues/issue-42880.stderr
+++ b/src/test/ui/issues/issue-42880.stderr
@@ -1,8 +1,8 @@
 error[E0599]: no associated item named `String` found for type `std::string::String` in the current scope
-  --> $DIR/issue-42880.rs:14:22
+  --> $DIR/issue-42880.rs:14:15
    |
 LL |     let f = |&Value::String(_)| (); //~ ERROR no associated item named
-   |               -------^^^^^^--- associated item not found in `std::string::String`
+   |               ^^^^^^^^^^^^^^^^ associated item not found in `std::string::String`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-7950.stderr b/src/test/ui/issues/issue-7950.stderr
index bd0b9454c7f44..750127981b1cc 100644
--- a/src/test/ui/issues/issue-7950.stderr
+++ b/src/test/ui/issues/issue-7950.stderr
@@ -1,13 +1,11 @@
 error[E0599]: no function or associated item named `bar` found for type `Foo` in the current scope
-  --> $DIR/issue-7950.rs:16:10
+  --> $DIR/issue-7950.rs:16:5
    |
 LL | struct Foo;
    | ----------- function or associated item `bar` not found for this
 ...
 LL |     Foo::bar();
-   |     -----^^^
-   |     |
-   |     function or associated item not found in `Foo`
+   |     ^^^^^^^^ function or associated item not found in `Foo`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/lexical-scopes.stderr b/src/test/ui/lexical-scopes.stderr
index 666666c2100a4..3a6ae52c68dc6 100644
--- a/src/test/ui/lexical-scopes.stderr
+++ b/src/test/ui/lexical-scopes.stderr
@@ -9,12 +9,10 @@ LL | use T;
    |
 
 error[E0599]: no function or associated item named `f` found for type `Foo` in the current scope
-  --> $DIR/lexical-scopes.rs:20:10
+  --> $DIR/lexical-scopes.rs:20:5
    |
 LL |     Foo::f(); //~ ERROR no function or associated item named `f`
-   |     -----^
-   |     |
-   |     function or associated item not found in `Foo`
+   |     ^^^^^^ function or associated item not found in `Foo`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/rfc-2005-default-binding-mode/no-double-error.stderr b/src/test/ui/rfc-2005-default-binding-mode/no-double-error.stderr
index b5cc7d4aefaab..e3a613f926110 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/no-double-error.stderr
+++ b/src/test/ui/rfc-2005-default-binding-mode/no-double-error.stderr
@@ -1,10 +1,8 @@
 error[E0599]: no associated item named `XXX` found for type `u32` in the current scope
-  --> $DIR/no-double-error.rs:18:14
+  --> $DIR/no-double-error.rs:18:9
    |
 LL |         u32::XXX => { } //~ ERROR no associated item named
-   |         -----^^^
-   |         |
-   |         associated item not found in `u32`
+   |         ^^^^^^^^ associated item not found in `u32`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/rust-2018/trait-import-suggestions.stderr b/src/test/ui/rust-2018/trait-import-suggestions.stderr
index 72a0fc694c06e..d5d996e27eeb4 100644
--- a/src/test/ui/rust-2018/trait-import-suggestions.stderr
+++ b/src/test/ui/rust-2018/trait-import-suggestions.stderr
@@ -27,12 +27,10 @@ LL |     x.baz(); //~ ERROR no method named `baz`
    |       ^^^
 
 error[E0599]: no function or associated item named `from_str` found for type `u32` in the current scope
-  --> $DIR/trait-import-suggestions.rs:40:18
+  --> $DIR/trait-import-suggestions.rs:40:13
    |
 LL |     let y = u32::from_str("33"); //~ ERROR no function or associated item named `from_str`
-   |             -----^^^^^^^^
-   |             |
-   |             function or associated item not found in `u32`
+   |             ^^^^^^^^^^^^^ function or associated item not found in `u32`
    |
    = help: items from traits can only be used if the trait is in scope
 help: the following trait is implemented but not in scope, perhaps add a `use` for it:
diff --git a/src/test/ui/traits/trait-item-privacy.stderr b/src/test/ui/traits/trait-item-privacy.stderr
index 01719bc4047d1..4ede83d5d7362 100644
--- a/src/test/ui/traits/trait-item-privacy.stderr
+++ b/src/test/ui/traits/trait-item-privacy.stderr
@@ -33,30 +33,26 @@ LL |     c.a(); //~ ERROR method `a` is private
    |       ^
 
 error[E0599]: no function or associated item named `a` found for type `S` in the current scope
-  --> $DIR/trait-item-privacy.rs:88:8
+  --> $DIR/trait-item-privacy.rs:88:5
    |
 LL | struct S;
    | --------- function or associated item `a` not found for this
 ...
 LL |     S::a(&S);
-   |     ---^
-   |     |
-   |     function or associated item not found in `S`
+   |     ^^^^ function or associated item not found in `S`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
    = note: the following trait defines an item `a`, perhaps you need to implement it:
            candidate #1: `method::A`
 
 error[E0599]: no function or associated item named `b` found for type `S` in the current scope
-  --> $DIR/trait-item-privacy.rs:90:8
+  --> $DIR/trait-item-privacy.rs:90:5
    |
 LL | struct S;
    | --------- function or associated item `b` not found for this
 ...
 LL |     S::b(&S);
-   |     ---^
-   |     |
-   |     function or associated item not found in `S`
+   |     ^^^^ function or associated item not found in `S`
    |
    = help: items from traits can only be used if the trait is in scope
 help: the following trait is implemented but not in scope, perhaps add a `use` for it:
@@ -71,30 +67,26 @@ LL |     C::a(&S); //~ ERROR method `a` is private
    |     ^^^^
 
 error[E0599]: no associated item named `A` found for type `S` in the current scope
-  --> $DIR/trait-item-privacy.rs:107:8
+  --> $DIR/trait-item-privacy.rs:107:5
    |
 LL | struct S;
    | --------- associated item `A` not found for this
 ...
 LL |     S::A; //~ ERROR no associated item named `A` found for type `S` in the current scope
-   |     ---^
-   |     |
-   |     associated item not found in `S`
+   |     ^^^^ associated item not found in `S`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
    = note: the following trait defines an item `A`, perhaps you need to implement it:
            candidate #1: `assoc_const::A`
 
 error[E0599]: no associated item named `B` found for type `S` in the current scope
-  --> $DIR/trait-item-privacy.rs:108:8
+  --> $DIR/trait-item-privacy.rs:108:5
    |
 LL | struct S;
    | --------- associated item `B` not found for this
 ...
 LL |     S::B; //~ ERROR no associated item named `B` found for type `S` in the current scope
-   |     ---^
-   |     |
-   |     associated item not found in `S`
+   |     ^^^^ associated item not found in `S`
    |
    = help: items from traits can only be used if the trait is in scope
 help: the following trait is implemented but not in scope, perhaps add a `use` for it:
diff --git a/src/test/ui/ufcs/ufcs-partially-resolved.stderr b/src/test/ui/ufcs/ufcs-partially-resolved.stderr
index 940e00738d92d..cb571be661d6a 100644
--- a/src/test/ui/ufcs/ufcs-partially-resolved.stderr
+++ b/src/test/ui/ufcs/ufcs-partially-resolved.stderr
@@ -187,20 +187,16 @@ LL |     let _: <u8 as Tr>::Y::NN; //~ ERROR ambiguous associated type
    |            ^^^^^^^^^^^^^^^^^ help: use fully-qualified syntax: `<<u8 as Tr>::Y as Trait>::NN`
 
 error[E0599]: no associated item named `NN` found for type `<u8 as Tr>::Y` in the current scope
-  --> $DIR/ufcs-partially-resolved.rs:48:20
+  --> $DIR/ufcs-partially-resolved.rs:48:5
    |
 LL |     <u8 as Tr>::Y::NN; //~ ERROR no associated item named `NN` found for type `<u8 as Tr>::Y`
-   |     ---------------^^
-   |     |
-   |     associated item not found in `<u8 as Tr>::Y`
+   |     ^^^^^^^^^^^^^^^^^ associated item not found in `<u8 as Tr>::Y`
 
 error[E0599]: no associated item named `N` found for type `<u8 as Dr>::X` in the current scope
-  --> $DIR/ufcs-partially-resolved.rs:65:20
+  --> $DIR/ufcs-partially-resolved.rs:65:5
    |
 LL |     <u8 as Dr>::X::N; //~ ERROR no associated item named `N` found for type `<u8 as Dr>::X`
-   |     ---------------^
-   |     |
-   |     associated item not found in `<u8 as Dr>::X`
+   |     ^^^^^^^^^^^^^^^^ associated item not found in `<u8 as Dr>::X`
 
 error: aborting due to 32 previous errors
 
diff --git a/src/test/ui/unspecified-self-in-trait-ref.stderr b/src/test/ui/unspecified-self-in-trait-ref.stderr
index 005d7bfedd0e4..c036540068b0b 100644
--- a/src/test/ui/unspecified-self-in-trait-ref.stderr
+++ b/src/test/ui/unspecified-self-in-trait-ref.stderr
@@ -1,34 +1,26 @@
 error[E0599]: no function or associated item named `lol` found for type `dyn Foo<_>` in the current scope
-  --> $DIR/unspecified-self-in-trait-ref.rs:20:18
+  --> $DIR/unspecified-self-in-trait-ref.rs:20:13
    |
 LL |     let a = Foo::lol();
-   |             -----^^^
-   |             |
-   |             function or associated item not found in `dyn Foo<_>`
+   |             ^^^^^^^^ function or associated item not found in `dyn Foo<_>`
 
 error[E0599]: no function or associated item named `lol` found for type `dyn Foo<_>` in the current scope
-  --> $DIR/unspecified-self-in-trait-ref.rs:22:23
+  --> $DIR/unspecified-self-in-trait-ref.rs:22:13
    |
 LL |     let b = Foo::<_>::lol();
-   |             ----------^^^
-   |             |
-   |             function or associated item not found in `dyn Foo<_>`
+   |             ^^^^^^^^^^^^^ function or associated item not found in `dyn Foo<_>`
 
 error[E0599]: no function or associated item named `lol` found for type `dyn Bar<_, _>` in the current scope
-  --> $DIR/unspecified-self-in-trait-ref.rs:24:18
+  --> $DIR/unspecified-self-in-trait-ref.rs:24:13
    |
 LL |     let c = Bar::lol();
-   |             -----^^^
-   |             |
-   |             function or associated item not found in `dyn Bar<_, _>`
+   |             ^^^^^^^^ function or associated item not found in `dyn Bar<_, _>`
 
 error[E0599]: no function or associated item named `lol` found for type `dyn Bar<usize, _>` in the current scope
-  --> $DIR/unspecified-self-in-trait-ref.rs:26:30
+  --> $DIR/unspecified-self-in-trait-ref.rs:26:13
    |
 LL |     let d = Bar::<usize, _>::lol();
-   |             -----------------^^^
-   |             |
-   |             function or associated item not found in `dyn Bar<usize, _>`
+   |             ^^^^^^^^^^^^^^^^^^^^ function or associated item not found in `dyn Bar<usize, _>`
 
 error[E0393]: the type parameter `A` must be explicitly specified
   --> $DIR/unspecified-self-in-trait-ref.rs:28:13