Update UI tests

35 files changed, 172 insertions, 172 deletions

diff --git a/src/test/ui/resolve/enums-are-namespaced-xc.stderr b/src/test/ui/resolve/enums-are-namespaced-xc.stderr
index ee6d22103e1..e5d75d6e470 100644
--- a/src/test/ui/resolve/enums-are-namespaced-xc.stderr
+++ b/src/test/ui/resolve/enums-are-namespaced-xc.stderr
@@ -1,7 +1,7 @@
 error[E0425]: cannot find value `A` in module `namespaced_enums`
   --> $DIR/enums-are-namespaced-xc.rs:15:31
    |
-15 |     let _ = namespaced_enums::A;
+LL |     let _ = namespaced_enums::A;
    |                               ^ not found in `namespaced_enums`
 help: possible candidate is found in another module, you can import it into scope
    |
@@ -11,7 +11,7 @@ help: possible candidate is found in another module, you can import it into scop
 error[E0425]: cannot find function `B` in module `namespaced_enums`
   --> $DIR/enums-are-namespaced-xc.rs:17:31
    |
-17 |     let _ = namespaced_enums::B(10);
+LL |     let _ = namespaced_enums::B(10);
    |                               ^ not found in `namespaced_enums`
 help: possible candidate is found in another module, you can import it into scope
    |
@@ -21,7 +21,7 @@ help: possible candidate is found in another module, you can import it into scop
 error[E0422]: cannot find struct, variant or union type `C` in module `namespaced_enums`
   --> $DIR/enums-are-namespaced-xc.rs:19:31
    |
-19 |     let _ = namespaced_enums::C { a: 10 };
+LL |     let _ = namespaced_enums::C { a: 10 };
    |                               ^ not found in `namespaced_enums`
 help: possible candidate is found in another module, you can import it into scope
    |
diff --git a/src/test/ui/resolve/issue-14254.stderr b/src/test/ui/resolve/issue-14254.stderr
index 1a1cb8b0dd9..226fe36dba3 100644
--- a/src/test/ui/resolve/issue-14254.stderr
+++ b/src/test/ui/resolve/issue-14254.stderr
@@ -1,146 +1,146 @@
 error[E0425]: cannot find function `baz` in this scope
   --> $DIR/issue-14254.rs:29:9
    |
-29 |         baz();
+LL |         baz();
    |         ^^^ help: try: `self.baz`
 
 error[E0425]: cannot find value `a` in this scope
   --> $DIR/issue-14254.rs:31:9
    |
-31 |         a;
+LL |         a;
    |         ^ not found in this scope
 
 error[E0425]: cannot find function `baz` in this scope
   --> $DIR/issue-14254.rs:38:9
    |
-38 |         baz();
+LL |         baz();
    |         ^^^ help: try: `self.baz`
 
 error[E0425]: cannot find value `x` in this scope
   --> $DIR/issue-14254.rs:40:9
    |
-40 |         x;
+LL |         x;
    |         ^ help: try: `self.x`
 
 error[E0425]: cannot find value `y` in this scope
   --> $DIR/issue-14254.rs:42:9
    |
-42 |         y;
+LL |         y;
    |         ^ help: try: `self.y`
 
 error[E0425]: cannot find value `a` in this scope
   --> $DIR/issue-14254.rs:44:9
    |
-44 |         a;
+LL |         a;
    |         ^ not found in this scope
 
 error[E0425]: cannot find value `bah` in this scope
   --> $DIR/issue-14254.rs:46:9
    |
-46 |         bah;
+LL |         bah;
    |         ^^^ help: try: `Self::bah`
 
 error[E0425]: cannot find value `b` in this scope
   --> $DIR/issue-14254.rs:48:9
    |
-48 |         b;
+LL |         b;
    |         ^ not found in this scope
 
 error[E0425]: cannot find function `baz` in this scope
   --> $DIR/issue-14254.rs:55:9
    |
-55 |         baz();
+LL |         baz();
    |         ^^^ help: try: `self.baz`
 
 error[E0425]: cannot find value `x` in this scope
   --> $DIR/issue-14254.rs:57:9
    |
-57 |         x;
+LL |         x;
    |         ^ help: try: `self.x`
 
 error[E0425]: cannot find value `y` in this scope
   --> $DIR/issue-14254.rs:59:9
    |
-59 |         y;
+LL |         y;
    |         ^ help: try: `self.y`
 
 error[E0425]: cannot find value `a` in this scope
   --> $DIR/issue-14254.rs:61:9
    |
-61 |         a;
+LL |         a;
    |         ^ not found in this scope
 
 error[E0425]: cannot find value `bah` in this scope
   --> $DIR/issue-14254.rs:63:9
    |
-63 |         bah;
+LL |         bah;
    |         ^^^ help: try: `Self::bah`
 
 error[E0425]: cannot find value `b` in this scope
   --> $DIR/issue-14254.rs:65:9
    |
-65 |         b;
+LL |         b;
    |         ^ not found in this scope
 
 error[E0425]: cannot find function `baz` in this scope
   --> $DIR/issue-14254.rs:72:9
    |
-72 |         baz();
+LL |         baz();
    |         ^^^ help: try: `self.baz`
 
 error[E0425]: cannot find value `bah` in this scope
   --> $DIR/issue-14254.rs:74:9
    |
-74 |         bah;
+LL |         bah;
    |         ^^^ help: try: `Self::bah`
 
 error[E0425]: cannot find function `baz` in this scope
   --> $DIR/issue-14254.rs:81:9
    |
-81 |         baz();
+LL |         baz();
    |         ^^^ help: try: `self.baz`
 
 error[E0425]: cannot find value `bah` in this scope
   --> $DIR/issue-14254.rs:83:9
    |
-83 |         bah;
+LL |         bah;
    |         ^^^ help: try: `Self::bah`
 
 error[E0425]: cannot find function `baz` in this scope
   --> $DIR/issue-14254.rs:90:9
    |
-90 |         baz();
+LL |         baz();
    |         ^^^ help: try: `self.baz`
 
 error[E0425]: cannot find value `bah` in this scope
   --> $DIR/issue-14254.rs:92:9
    |
-92 |         bah;
+LL |         bah;
    |         ^^^ help: try: `Self::bah`
 
 error[E0425]: cannot find function `baz` in this scope
   --> $DIR/issue-14254.rs:99:9
    |
-99 |         baz();
+LL |         baz();
    |         ^^^ help: try: `self.baz`
 
 error[E0425]: cannot find value `bah` in this scope
-   --> $DIR/issue-14254.rs:101:9
-    |
-101 |         bah;
-    |         ^^^ help: try: `Self::bah`
+  --> $DIR/issue-14254.rs:101:9
+   |
+LL |         bah;
+   |         ^^^ help: try: `Self::bah`
 
 error[E0425]: cannot find function `baz` in this scope
-   --> $DIR/issue-14254.rs:108:9
-    |
-108 |         baz();
-    |         ^^^ help: try: `self.baz`
+  --> $DIR/issue-14254.rs:108:9
+   |
+LL |         baz();
+   |         ^^^ help: try: `self.baz`
 
 error[E0425]: cannot find value `bah` in this scope
-   --> $DIR/issue-14254.rs:110:9
-    |
-110 |         bah;
-    |         ^^^ help: try: `Self::bah`
+  --> $DIR/issue-14254.rs:110:9
+   |
+LL |         bah;
+   |         ^^^ help: try: `Self::bah`
 
 error[E0601]: main function not found
 
diff --git a/src/test/ui/resolve/issue-16058.stderr b/src/test/ui/resolve/issue-16058.stderr
index a0ccc2a11cf..f9d3c470377 100644
--- a/src/test/ui/resolve/issue-16058.stderr
+++ b/src/test/ui/resolve/issue-16058.stderr
@@ -1,7 +1,7 @@
 error[E0574]: expected struct, variant or union type, found enum `Result`
   --> $DIR/issue-16058.rs:19:9
    |
-19 |         Result {
+LL |         Result {
    |         ^^^^^^ not a struct, variant or union type
 help: possible better candidates are found in other modules, you can import them into scope
    |
diff --git a/src/test/ui/resolve/issue-17518.stderr b/src/test/ui/resolve/issue-17518.stderr
index 10e7c9815cc..32db6c70e15 100644
--- a/src/test/ui/resolve/issue-17518.stderr
+++ b/src/test/ui/resolve/issue-17518.stderr
@@ -1,7 +1,7 @@
 error[E0422]: cannot find struct, variant or union type `E` in this scope
   --> $DIR/issue-17518.rs:16:5
    |
-16 |     E { name: "foobar" }; //~ ERROR cannot find struct, variant or union type `E`
+LL |     E { name: "foobar" }; //~ ERROR cannot find struct, variant or union type `E`
    |     ^ not found in this scope
 help: possible candidate is found in another module, you can import it into scope
    |
diff --git a/src/test/ui/resolve/issue-18252.stderr b/src/test/ui/resolve/issue-18252.stderr
index c26bc052ee1..4ac907b23ec 100644
--- a/src/test/ui/resolve/issue-18252.stderr
+++ b/src/test/ui/resolve/issue-18252.stderr
@@ -1,7 +1,7 @@
 error[E0423]: expected function, found struct variant `Foo::Variant`
   --> $DIR/issue-18252.rs:16:13
    |
-16 |     let f = Foo::Variant(42);
+LL |     let f = Foo::Variant(42);
    |             ^^^^^^^^^^^^ did you mean `Foo::Variant { /* fields */ }`?
 
 error: aborting due to previous error
diff --git a/src/test/ui/resolve/issue-19452.stderr b/src/test/ui/resolve/issue-19452.stderr
index b80d4faefa9..50845755866 100644
--- a/src/test/ui/resolve/issue-19452.stderr
+++ b/src/test/ui/resolve/issue-19452.stderr
@@ -1,13 +1,13 @@
 error[E0423]: expected value, found struct variant `Homura::Madoka`
   --> $DIR/issue-19452.rs:19:18
    |
-19 |     let homura = Homura::Madoka;
+LL |     let homura = Homura::Madoka;
    |                  ^^^^^^^^^^^^^^ did you mean `Homura::Madoka { /* fields */ }`?
 
 error[E0423]: expected value, found struct variant `issue_19452_aux::Homura::Madoka`
   --> $DIR/issue-19452.rs:22:18
    |
-22 |     let homura = issue_19452_aux::Homura::Madoka;
+LL |     let homura = issue_19452_aux::Homura::Madoka;
    |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ did you mean `issue_19452_aux::Homura::Madoka { /* fields */ }`?
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/resolve/issue-21221-1.stderr b/src/test/ui/resolve/issue-21221-1.stderr
index cbf924d91b3..467ac66cd73 100644
--- a/src/test/ui/resolve/issue-21221-1.stderr
+++ b/src/test/ui/resolve/issue-21221-1.stderr
@@ -1,7 +1,7 @@
 error[E0405]: cannot find trait `Mul` in this scope
   --> $DIR/issue-21221-1.rs:53:6
    |
-53 | impl Mul for Foo {
+LL | impl Mul for Foo {
    |      ^^^ not found in this scope
 help: possible candidates are found in other modules, you can import them into scope
    |
@@ -15,7 +15,7 @@ help: possible candidates are found in other modules, you can import them into s
 error[E0412]: cannot find type `Mul` in this scope
   --> $DIR/issue-21221-1.rs:68:16
    |
-68 | fn getMul() -> Mul {
+LL | fn getMul() -> Mul {
    |                ^^^ not found in this scope
 help: possible candidates are found in other modules, you can import them into scope
    |
@@ -32,13 +32,13 @@ and 2 other candidates
 error[E0405]: cannot find trait `ThisTraitReallyDoesntExistInAnyModuleReally` in this scope
   --> $DIR/issue-21221-1.rs:73:6
    |
-73 | impl ThisTraitReallyDoesntExistInAnyModuleReally for Foo {
+LL | impl ThisTraitReallyDoesntExistInAnyModuleReally for Foo {
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
 
 error[E0405]: cannot find trait `Div` in this scope
   --> $DIR/issue-21221-1.rs:78:6
    |
-78 | impl Div for Foo {
+LL | impl Div for Foo {
    |      ^^^ not found in this scope
 help: possible candidate is found in another module, you can import it into scope
    |
diff --git a/src/test/ui/resolve/issue-21221-2.stderr b/src/test/ui/resolve/issue-21221-2.stderr
index 8a45bd58107..ab7686ad42e 100644
--- a/src/test/ui/resolve/issue-21221-2.stderr
+++ b/src/test/ui/resolve/issue-21221-2.stderr
@@ -1,7 +1,7 @@
 error[E0405]: cannot find trait `T` in this scope
   --> $DIR/issue-21221-2.rs:28:6
    |
-28 | impl T for Foo { }
+LL | impl T for Foo { }
    |      ^ not found in this scope
 help: possible candidate is found in another module, you can import it into scope
    |
diff --git a/src/test/ui/resolve/issue-21221-3.stderr b/src/test/ui/resolve/issue-21221-3.stderr
index 731d7bcd655..ee52278fa93 100644
--- a/src/test/ui/resolve/issue-21221-3.stderr
+++ b/src/test/ui/resolve/issue-21221-3.stderr
@@ -1,7 +1,7 @@
 error[E0405]: cannot find trait `OuterTrait` in this scope
   --> $DIR/issue-21221-3.rs:25:6
    |
-25 | impl OuterTrait for Foo {}
+LL | impl OuterTrait for Foo {}
    |      ^^^^^^^^^^ not found in this scope
 help: possible candidate is found in another module, you can import it into scope
    |
diff --git a/src/test/ui/resolve/issue-21221-4.stderr b/src/test/ui/resolve/issue-21221-4.stderr
index 446bd0e258d..76d7d5bd5ee 100644
--- a/src/test/ui/resolve/issue-21221-4.stderr
+++ b/src/test/ui/resolve/issue-21221-4.stderr
@@ -1,7 +1,7 @@
 error[E0405]: cannot find trait `T` in this scope
   --> $DIR/issue-21221-4.rs:20:6
    |
-20 | impl T for Foo {}
+LL | impl T for Foo {}
    |      ^ not found in this scope
 help: possible candidate is found in another module, you can import it into scope
    |
diff --git a/src/test/ui/resolve/issue-23305.stderr b/src/test/ui/resolve/issue-23305.stderr
index 2da2044ca95..a9d43aeb742 100644
--- a/src/test/ui/resolve/issue-23305.stderr
+++ b/src/test/ui/resolve/issue-23305.stderr
@@ -1,13 +1,13 @@
 error[E0391]: cyclic dependency detected
   --> $DIR/issue-23305.rs:15:12
    |
-15 | impl ToNbt<Self> {}
+LL | impl ToNbt<Self> {}
    |            ^^^^ cyclic reference
    |
 note: the cycle begins when processing `<impl at $DIR/issue-23305.rs:15:1: 15:20>`...
   --> $DIR/issue-23305.rs:15:1
    |
-15 | impl ToNbt<Self> {}
+LL | impl ToNbt<Self> {}
    | ^^^^^^^^^^^^^^^^
    = note: ...which then again requires processing `<impl at $DIR/issue-23305.rs:15:1: 15:20>`, completing the cycle.
 
diff --git a/src/test/ui/resolve/issue-2356.stderr b/src/test/ui/resolve/issue-2356.stderr
index 5238af220b3..6cf5fdeeb0d 100644
--- a/src/test/ui/resolve/issue-2356.stderr
+++ b/src/test/ui/resolve/issue-2356.stderr
@@ -1,25 +1,25 @@
 error[E0425]: cannot find function `shave` in this scope
   --> $DIR/issue-2356.rs:27:5
    |
-27 |     shave();
+LL |     shave();
    |     ^^^^^ not found in this scope
 
 error[E0425]: cannot find function `clone` in this scope
   --> $DIR/issue-2356.rs:34:5
    |
-34 |     clone();
+LL |     clone();
    |     ^^^^^ help: try: `self.clone`
 
 error[E0425]: cannot find function `default` in this scope
   --> $DIR/issue-2356.rs:41:5
    |
-41 |     default();
+LL |     default();
    |     ^^^^^^^ help: try: `Self::default`
 
 error[E0425]: cannot find value `whiskers` in this scope
   --> $DIR/issue-2356.rs:49:5
    |
-49 |     whiskers -= other;
+LL |     whiskers -= other;
    |     ^^^^^^^^
    |     |
    |     `self` value is only available in methods with `self` parameter
@@ -28,67 +28,67 @@ error[E0425]: cannot find value `whiskers` in this scope
 error[E0425]: cannot find function `shave` in this scope
   --> $DIR/issue-2356.rs:51:5
    |
-51 |     shave(4);
+LL |     shave(4);
    |     ^^^^^ help: try: `Self::shave`
 
 error[E0425]: cannot find function `purr` in this scope
   --> $DIR/issue-2356.rs:53:5
    |
-53 |     purr();
+LL |     purr();
    |     ^^^^ not found in this scope
 
 error[E0425]: cannot find function `static_method` in this scope
   --> $DIR/issue-2356.rs:62:9
    |
-62 |         static_method();
+LL |         static_method();
    |         ^^^^^^^^^^^^^ not found in this scope
 
 error[E0425]: cannot find function `purr` in this scope
   --> $DIR/issue-2356.rs:64:9
    |
-64 |         purr();
+LL |         purr();
    |         ^^^^ not found in this scope
 
 error[E0425]: cannot find function `purr` in this scope
   --> $DIR/issue-2356.rs:66:9
    |
-66 |         purr();
+LL |         purr();
    |         ^^^^ not found in this scope
 
 error[E0425]: cannot find function `purr` in this scope
   --> $DIR/issue-2356.rs:68:9
    |
-68 |         purr();
+LL |         purr();
    |         ^^^^ not found in this scope
 
 error[E0424]: expected value, found module `self`
   --> $DIR/issue-2356.rs:75:8
    |
-75 |     if self.whiskers > 3 {
+LL |     if self.whiskers > 3 {
    |        ^^^^ `self` value is only available in methods with `self` parameter
 
 error[E0425]: cannot find function `grow_older` in this scope
   --> $DIR/issue-2356.rs:82:5
    |
-82 |     grow_older();
+LL |     grow_older();
    |     ^^^^^^^^^^ not found in this scope
 
 error[E0425]: cannot find function `shave` in this scope
   --> $DIR/issue-2356.rs:84:5
    |
-84 |     shave();
+LL |     shave();
    |     ^^^^^ not found in this scope
 
 error[E0425]: cannot find value `whiskers` in this scope
   --> $DIR/issue-2356.rs:89:5
    |
-89 |     whiskers = 0;
+LL |     whiskers = 0;
    |     ^^^^^^^^ help: try: `self.whiskers`
 
 error[E0425]: cannot find value `whiskers` in this scope
   --> $DIR/issue-2356.rs:94:5
    |
-94 |     whiskers = 4;
+LL |     whiskers = 4;
    |     ^^^^^^^^
    |     |
    |     `self` value is only available in methods with `self` parameter
@@ -97,14 +97,14 @@ error[E0425]: cannot find value `whiskers` in this scope
 error[E0425]: cannot find function `purr_louder` in this scope
   --> $DIR/issue-2356.rs:96:5
    |
-96 |     purr_louder();
+LL |     purr_louder();
    |     ^^^^^^^^^^^ not found in this scope
 
 error[E0424]: expected value, found module `self`
-   --> $DIR/issue-2356.rs:102:5
-    |
-102 |     self += 1;
-    |     ^^^^ `self` value is only available in methods with `self` parameter
+  --> $DIR/issue-2356.rs:102:5
+   |
+LL |     self += 1;
+   |     ^^^^ `self` value is only available in methods with `self` parameter
 
 error: aborting due to 17 previous errors
 
diff --git a/src/test/ui/resolve/issue-24968.stderr b/src/test/ui/resolve/issue-24968.stderr
index 2a61cee830b..8aa84f2ed87 100644
--- a/src/test/ui/resolve/issue-24968.stderr
+++ b/src/test/ui/resolve/issue-24968.stderr
@@ -1,7 +1,7 @@
 error[E0411]: cannot find type `Self` in this scope
   --> $DIR/issue-24968.rs:11:11
    |
-11 | fn foo(_: Self) {
+LL | fn foo(_: Self) {
    |           ^^^^ `Self` is only available in traits and impls
 
 error: aborting due to previous error
diff --git a/src/test/ui/resolve/issue-33876.stderr b/src/test/ui/resolve/issue-33876.stderr
index f47c3fe574e..2742d4af712 100644
--- a/src/test/ui/resolve/issue-33876.stderr
+++ b/src/test/ui/resolve/issue-33876.stderr
@@ -1,7 +1,7 @@
 error[E0423]: expected value, found trait `Bar`
   --> $DIR/issue-33876.rs:20:22
    |
-20 |     let any: &Any = &Bar; //~ ERROR expected value, found trait `Bar`
+LL |     let any: &Any = &Bar; //~ ERROR expected value, found trait `Bar`
    |                      ^^^ not a value
 
 error: aborting due to previous error
diff --git a/src/test/ui/resolve/issue-3907-2.stderr b/src/test/ui/resolve/issue-3907-2.stderr
index 796b90dc3fa..7d01cd739e0 100644
--- a/src/test/ui/resolve/issue-3907-2.stderr
+++ b/src/test/ui/resolve/issue-3907-2.stderr
@@ -1,7 +1,7 @@
 error[E0038]: the trait `issue_3907::Foo` cannot be made into an object
   --> $DIR/issue-3907-2.rs:20:1
    |
-20 | fn bar(_x: Foo) {}
+LL | fn bar(_x: Foo) {}
    | ^^^^^^^^^^^^^^^ the trait `issue_3907::Foo` cannot be made into an object
    |
    = note: method `bar` has no receiver
diff --git a/src/test/ui/resolve/issue-3907.stderr b/src/test/ui/resolve/issue-3907.stderr
index 59134fe714d..a0d2f3a8bf8 100644
--- a/src/test/ui/resolve/issue-3907.stderr
+++ b/src/test/ui/resolve/issue-3907.stderr
@@ -1,7 +1,7 @@
 error[E0404]: expected trait, found type alias `Foo`
   --> $DIR/issue-3907.rs:20:6
    |
-20 | impl Foo for S { //~ ERROR expected trait, found type alias `Foo`
+LL | impl Foo for S { //~ ERROR expected trait, found type alias `Foo`
    |      ^^^ type aliases cannot be used for traits
 help: possible better candidate is found in another module, you can import it into scope
    |
diff --git a/src/test/ui/resolve/issue-39226.stderr b/src/test/ui/resolve/issue-39226.stderr
index f07b6221dfc..4d1e3ae9b10 100644
--- a/src/test/ui/resolve/issue-39226.stderr
+++ b/src/test/ui/resolve/issue-39226.stderr
@@ -1,7 +1,7 @@
 error[E0423]: expected value, found struct `Handle`
   --> $DIR/issue-39226.rs:20:17
    |
-20 |         handle: Handle
+LL |         handle: Handle
    |                 ^^^^^^
    |                 |
    |                 did you mean `handle`?
diff --git a/src/test/ui/resolve/issue-5035-2.stderr b/src/test/ui/resolve/issue-5035-2.stderr
index 465b93f47f9..fedb8b607fc 100644
--- a/src/test/ui/resolve/issue-5035-2.stderr
+++ b/src/test/ui/resolve/issue-5035-2.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `I + 'static: std::marker::Sized` is not satisfied
   --> $DIR/issue-5035-2.rs:14:8
    |
-14 | fn foo(_x: K) {} //~ ERROR: `I + 'static: std::marker::Sized` is not satisfied
+LL | fn foo(_x: K) {} //~ ERROR: `I + 'static: std::marker::Sized` is not satisfied
    |        ^^ `I + 'static` does not have a constant size known at compile-time
    |
    = help: the trait `std::marker::Sized` is not implemented for `I + 'static`
diff --git a/src/test/ui/resolve/issue-5035.stderr b/src/test/ui/resolve/issue-5035.stderr
index fbdc7095ad8..9b3d69d90c0 100644
--- a/src/test/ui/resolve/issue-5035.stderr
+++ b/src/test/ui/resolve/issue-5035.stderr
@@ -1,13 +1,13 @@
 error[E0432]: unresolved import `ImportError`
   --> $DIR/issue-5035.rs:15:5
    |
-15 | use ImportError; //~ ERROR unresolved import `ImportError` [E0432]
+LL | use ImportError; //~ ERROR unresolved import `ImportError` [E0432]
    |     ^^^^^^^^^^^ no `ImportError` in the root
 
 error[E0404]: expected trait, found type alias `K`
   --> $DIR/issue-5035.rs:13:6
    |
-13 | impl K for isize {} //~ ERROR expected trait, found type alias `K`
+LL | impl K for isize {} //~ ERROR expected trait, found type alias `K`
    |      ^
    |      |
    |      did you mean `I`?
diff --git a/src/test/ui/resolve/issue-6702.stderr b/src/test/ui/resolve/issue-6702.stderr
index bdc45734d65..708ff2e5001 100644
--- a/src/test/ui/resolve/issue-6702.stderr
+++ b/src/test/ui/resolve/issue-6702.stderr
@@ -1,7 +1,7 @@
 error[E0423]: expected function, found struct `Monster`
   --> $DIR/issue-6702.rs:17:14
    |
-17 |     let _m = Monster(); //~ ERROR expected function, found struct `Monster`
+LL |     let _m = Monster(); //~ ERROR expected function, found struct `Monster`
    |              ^^^^^^^ did you mean `Monster { /* fields */ }`?
 
 error: aborting due to previous error
diff --git a/src/test/ui/resolve/levenshtein.stderr b/src/test/ui/resolve/levenshtein.stderr
index 2707c94bc65..1a00395f2de 100644
--- a/src/test/ui/resolve/levenshtein.stderr
+++ b/src/test/ui/resolve/levenshtein.stderr
@@ -1,49 +1,49 @@
 error[E0412]: cannot find type `esize` in this scope
   --> $DIR/levenshtein.rs:15:11
    |
-15 | fn foo(c: esize) {} // Misspelled primitive type name.
+LL | fn foo(c: esize) {} // Misspelled primitive type name.
    |           ^^^^^ did you mean `isize`?
 
 error[E0412]: cannot find type `Baz` in this scope
   --> $DIR/levenshtein.rs:20:10
    |
-20 | type A = Baz; // Misspelled type name.
+LL | type A = Baz; // Misspelled type name.
    |          ^^^ did you mean `Bar`?
 
 error[E0412]: cannot find type `Opiton` in this scope
   --> $DIR/levenshtein.rs:22:10
    |
-22 | type B = Opiton<u8>; // Misspelled type name from the prelude.
+LL | type B = Opiton<u8>; // Misspelled type name from the prelude.
    |          ^^^^^^ did you mean `Option`?
 
 error[E0412]: cannot find type `Baz` in this scope
   --> $DIR/levenshtein.rs:26:14
    |
-26 |     type A = Baz; // No suggestion here, Bar is not visible
+LL |     type A = Baz; // No suggestion here, Bar is not visible
    |              ^^^ not found in this scope
 
 error[E0425]: cannot find value `MAXITEM` in this scope
   --> $DIR/levenshtein.rs:34:20
    |
-34 |     let v = [0u32; MAXITEM]; // Misspelled constant name.
+LL |     let v = [0u32; MAXITEM]; // Misspelled constant name.
    |                    ^^^^^^^ did you mean `MAX_ITEM`?
 
 error[E0425]: cannot find function `foobar` in this scope
   --> $DIR/levenshtein.rs:36:5
    |
-36 |     foobar(); // Misspelled function name.
+LL |     foobar(); // Misspelled function name.
    |     ^^^^^^ did you mean `foo_bar`?
 
 error[E0412]: cannot find type `first` in module `m`
   --> $DIR/levenshtein.rs:38:15
    |
-38 |     let b: m::first = m::second; // Misspelled item in module.
+LL |     let b: m::first = m::second; // Misspelled item in module.
    |               ^^^^^ did you mean `First`?
 
 error[E0425]: cannot find value `second` in module `m`
   --> $DIR/levenshtein.rs:38:26
    |
-38 |     let b: m::first = m::second; // Misspelled item in module.
+LL |     let b: m::first = m::second; // Misspelled item in module.
    |                          ^^^^^^ did you mean `Second`?
 
 error: aborting due to 8 previous errors
diff --git a/src/test/ui/resolve/name-clash-nullary.stderr b/src/test/ui/resolve/name-clash-nullary.stderr
index 6fd2de502a8..aefdc9b9fe1 100644
--- a/src/test/ui/resolve/name-clash-nullary.stderr
+++ b/src/test/ui/resolve/name-clash-nullary.stderr
@@ -1,7 +1,7 @@
 error[E0308]: mismatched types
   --> $DIR/name-clash-nullary.rs:12:7
    |
-12 |   let None: isize = 42; //~ ERROR mismatched types
+LL |   let None: isize = 42; //~ ERROR mismatched types
    |       ^^^^ expected isize, found enum `std::option::Option`
    |
    = note: expected type `isize`
diff --git a/src/test/ui/resolve/privacy-enum-ctor.stderr b/src/test/ui/resolve/privacy-enum-ctor.stderr
index 8a02a0e85f1..a23b587a90c 100644
--- a/src/test/ui/resolve/privacy-enum-ctor.stderr
+++ b/src/test/ui/resolve/privacy-enum-ctor.stderr
@@ -1,7 +1,7 @@
 error[E0423]: expected value, found enum `n::Z`
   --> $DIR/privacy-enum-ctor.rs:33:9
    |
-33 |         n::Z;
+LL |         n::Z;
    |         ^^^^
    |
    = note: did you mean to use one of the following variants?
@@ -12,7 +12,7 @@ error[E0423]: expected value, found enum `n::Z`
 error[E0423]: expected value, found enum `Z`
   --> $DIR/privacy-enum-ctor.rs:35:9
    |
-35 |         Z;
+LL |         Z;
    |         ^ did you mean `f`?
    |
    = note: did you mean to use one of the following variants?
@@ -23,13 +23,13 @@ error[E0423]: expected value, found enum `Z`
 error[E0423]: expected value, found struct variant `Z::Struct`
   --> $DIR/privacy-enum-ctor.rs:39:20
    |
-39 |         let _: Z = Z::Struct;
+LL |         let _: Z = Z::Struct;
    |                    ^^^^^^^^^ did you mean `Z::Struct { /* fields */ }`?
 
 error[E0423]: expected value, found enum `m::E`
   --> $DIR/privacy-enum-ctor.rs:51:16
    |
-51 |     let _: E = m::E;
+LL |     let _: E = m::E;
    |                ^^^-
    |                   |
    |                   did you mean `f`?
@@ -48,13 +48,13 @@ help: possible better candidates are found in other modules, you can import them
 error[E0423]: expected value, found struct variant `m::E::Struct`
   --> $DIR/privacy-enum-ctor.rs:55:16
    |
-55 |     let _: E = m::E::Struct;
+LL |     let _: E = m::E::Struct;
    |                ^^^^^^^^^^^^ did you mean `m::E::Struct { /* fields */ }`?
 
 error[E0423]: expected value, found enum `E`
   --> $DIR/privacy-enum-ctor.rs:59:16
    |
-59 |     let _: E = E;
+LL |     let _: E = E;
    |                ^
    |
    = note: did you mean to use one of the following variants?
@@ -71,13 +71,13 @@ help: possible better candidates are found in other modules, you can import them
 error[E0423]: expected value, found struct variant `E::Struct`
   --> $DIR/privacy-enum-ctor.rs:63:16
    |
-63 |     let _: E = E::Struct;
+LL |     let _: E = E::Struct;
    |                ^^^^^^^^^ did you mean `E::Struct { /* fields */ }`?
 
 error[E0412]: cannot find type `Z` in this scope
   --> $DIR/privacy-enum-ctor.rs:67:12
    |
-67 |     let _: Z = m::n::Z;
+LL |     let _: Z = m::n::Z;
    |            ^ did you mean `E`?
 help: possible candidate is found in another module, you can import it into scope
    |
@@ -87,7 +87,7 @@ help: possible candidate is found in another module, you can import it into scop
 error[E0423]: expected value, found enum `m::n::Z`
   --> $DIR/privacy-enum-ctor.rs:67:16
    |
-67 |     let _: Z = m::n::Z;
+LL |     let _: Z = m::n::Z;
    |                ^^^^^^^
    |
    = note: did you mean to use one of the following variants?
@@ -98,7 +98,7 @@ error[E0423]: expected value, found enum `m::n::Z`
 error[E0412]: cannot find type `Z` in this scope
   --> $DIR/privacy-enum-ctor.rs:71:12
    |
-71 |     let _: Z = m::n::Z::Fn;
+LL |     let _: Z = m::n::Z::Fn;
    |            ^ did you mean `E`?
 help: possible candidate is found in another module, you can import it into scope
    |
@@ -108,7 +108,7 @@ help: possible candidate is found in another module, you can import it into scop
 error[E0412]: cannot find type `Z` in this scope
   --> $DIR/privacy-enum-ctor.rs:74:12
    |
-74 |     let _: Z = m::n::Z::Struct;
+LL |     let _: Z = m::n::Z::Struct;
    |            ^ did you mean `E`?
 help: possible candidate is found in another module, you can import it into scope
    |
@@ -118,13 +118,13 @@ help: possible candidate is found in another module, you can import it into scop
 error[E0423]: expected value, found struct variant `m::n::Z::Struct`
   --> $DIR/privacy-enum-ctor.rs:74:16
    |
-74 |     let _: Z = m::n::Z::Struct;
+LL |     let _: Z = m::n::Z::Struct;
    |                ^^^^^^^^^^^^^^^ did you mean `m::n::Z::Struct { /* fields */ }`?
 
 error[E0412]: cannot find type `Z` in this scope
   --> $DIR/privacy-enum-ctor.rs:78:12
    |
-78 |     let _: Z = m::n::Z::Unit {};
+LL |     let _: Z = m::n::Z::Unit {};
    |            ^ did you mean `E`?
 help: possible candidate is found in another module, you can import it into scope
    |
@@ -134,31 +134,31 @@ help: possible candidate is found in another module, you can import it into scop
 error[E0603]: enum `Z` is private
   --> $DIR/privacy-enum-ctor.rs:67:16
    |
-67 |     let _: Z = m::n::Z;
+LL |     let _: Z = m::n::Z;
    |                ^^^^^^^
 
 error[E0603]: enum `Z` is private
   --> $DIR/privacy-enum-ctor.rs:71:16
    |
-71 |     let _: Z = m::n::Z::Fn;
+LL |     let _: Z = m::n::Z::Fn;
    |                ^^^^^^^^^^^
 
 error[E0603]: enum `Z` is private
   --> $DIR/privacy-enum-ctor.rs:74:16
    |
-74 |     let _: Z = m::n::Z::Struct;
+LL |     let _: Z = m::n::Z::Struct;
    |                ^^^^^^^^^^^^^^^
 
 error[E0603]: enum `Z` is private
   --> $DIR/privacy-enum-ctor.rs:78:16
    |
-78 |     let _: Z = m::n::Z::Unit {};
+LL |     let _: Z = m::n::Z::Unit {};
    |                ^^^^^^^^^^^^^
 
 error[E0308]: mismatched types
   --> $DIR/privacy-enum-ctor.rs:37:20
    |
-37 |         let _: Z = Z::Fn;
+LL |         let _: Z = Z::Fn;
    |                    ^^^^^ expected enum `m::n::Z`, found fn item
    |
    = note: expected type `m::n::Z`
@@ -167,10 +167,10 @@ error[E0308]: mismatched types
 error[E0618]: expected function, found enum variant `Z::Unit`
   --> $DIR/privacy-enum-ctor.rs:41:17
    |
-26 |             Unit,
+LL |             Unit,
    |             ---- `Z::Unit` defined here
 ...
-41 |         let _ = Z::Unit();
+LL |         let _ = Z::Unit();
    |                 ^^^^^^^^^ not a function
 help: `Z::Unit` is a unit variant, you need to write it without the parenthesis
    |
@@ -180,7 +180,7 @@ help: `Z::Unit` is a unit variant, you need to write it without the parenthesis
 error[E0308]: mismatched types
   --> $DIR/privacy-enum-ctor.rs:53:16
    |
-53 |     let _: E = m::E::Fn;
+LL |     let _: E = m::E::Fn;
    |                ^^^^^^^^ expected enum `m::E`, found fn item
    |
    = note: expected type `m::E`
@@ -189,10 +189,10 @@ error[E0308]: mismatched types
 error[E0618]: expected function, found enum variant `m::E::Unit`
   --> $DIR/privacy-enum-ctor.rs:57:16
    |
-17 |         Unit,
+LL |         Unit,
    |         ---- `m::E::Unit` defined here
 ...
-57 |     let _: E = m::E::Unit();
+LL |     let _: E = m::E::Unit();
    |                ^^^^^^^^^^^^ not a function
 help: `m::E::Unit` is a unit variant, you need to write it without the parenthesis
    |
@@ -202,7 +202,7 @@ help: `m::E::Unit` is a unit variant, you need to write it without the parenthes
 error[E0308]: mismatched types
   --> $DIR/privacy-enum-ctor.rs:61:16
    |
-61 |     let _: E = E::Fn;
+LL |     let _: E = E::Fn;
    |                ^^^^^ expected enum `m::E`, found fn item
    |
    = note: expected type `m::E`
@@ -211,10 +211,10 @@ error[E0308]: mismatched types
 error[E0618]: expected function, found enum variant `E::Unit`
   --> $DIR/privacy-enum-ctor.rs:65:16
    |
-17 |         Unit,
+LL |         Unit,
    |         ---- `E::Unit` defined here
 ...
-65 |     let _: E = E::Unit();
+LL |     let _: E = E::Unit();
    |                ^^^^^^^^^ not a function
 help: `E::Unit` is a unit variant, you need to write it without the parenthesis
    |
diff --git a/src/test/ui/resolve/privacy-struct-ctor.stderr b/src/test/ui/resolve/privacy-struct-ctor.stderr
index d7c19a5a468..9b7964f705f 100644
--- a/src/test/ui/resolve/privacy-struct-ctor.stderr
+++ b/src/test/ui/resolve/privacy-struct-ctor.stderr
@@ -1,7 +1,7 @@
 error[E0423]: expected value, found struct `Z`
   --> $DIR/privacy-struct-ctor.rs:30:9
    |
-30 |         Z;
+LL |         Z;
    |         ^
    |         |
    |         did you mean `S`?
@@ -14,7 +14,7 @@ help: possible better candidate is found in another module, you can import it in
 error[E0423]: expected value, found struct `S`
   --> $DIR/privacy-struct-ctor.rs:43:5
    |
-43 |     S;
+LL |     S;
    |     ^ constructor is not visible here due to private fields
 help: possible better candidate is found in another module, you can import it into scope
    |
@@ -24,13 +24,13 @@ help: possible better candidate is found in another module, you can import it in
 error[E0423]: expected value, found struct `S2`
   --> $DIR/privacy-struct-ctor.rs:48:5
    |
-48 |     S2;
+LL |     S2;
    |     ^^ did you mean `S2 { /* fields */ }`?
 
 error[E0423]: expected value, found struct `xcrate::S`
   --> $DIR/privacy-struct-ctor.rs:53:5
    |
-53 |     xcrate::S;
+LL |     xcrate::S;
    |     ^^^^^^^^^ constructor is not visible here due to private fields
 help: possible better candidate is found in another module, you can import it into scope
    |
@@ -40,37 +40,37 @@ help: possible better candidate is found in another module, you can import it in
 error[E0603]: tuple struct `Z` is private
   --> $DIR/privacy-struct-ctor.rs:28:9
    |
-28 |         n::Z;
+LL |         n::Z;
    |         ^^^^
 
 error[E0603]: tuple struct `S` is private
   --> $DIR/privacy-struct-ctor.rs:39:5
    |
-39 |     m::S;
+LL |     m::S;
    |     ^^^^
 
 error[E0603]: tuple struct `S` is private
   --> $DIR/privacy-struct-ctor.rs:41:16
    |
-41 |     let _: S = m::S(2);
+LL |     let _: S = m::S(2);
    |                ^^^^
 
 error[E0603]: tuple struct `Z` is private
   --> $DIR/privacy-struct-ctor.rs:45:5
    |
-45 |     m::n::Z;
+LL |     m::n::Z;
    |     ^^^^^^^
 
 error[E0603]: tuple struct `S` is private
   --> $DIR/privacy-struct-ctor.rs:51:5
    |
-51 |     xcrate::m::S;
+LL |     xcrate::m::S;
    |     ^^^^^^^^^^^^
 
 error[E0603]: tuple struct `Z` is private
   --> $DIR/privacy-struct-ctor.rs:55:5
    |
-55 |     xcrate::m::n::Z;
+LL |     xcrate::m::n::Z;
    |     ^^^^^^^^^^^^^^^
 
 error: aborting due to 10 previous errors
diff --git a/src/test/ui/resolve/resolve-assoc-suggestions.stderr b/src/test/ui/resolve/resolve-assoc-suggestions.stderr
index 93e23bdef7f..e03a9052e4b 100644
--- a/src/test/ui/resolve/resolve-assoc-suggestions.stderr
+++ b/src/test/ui/resolve/resolve-assoc-suggestions.stderr
@@ -1,55 +1,55 @@
 error[E0412]: cannot find type `field` in this scope
   --> $DIR/resolve-assoc-suggestions.rs:26:16
    |
-26 |         let _: field;
+LL |         let _: field;
    |                ^^^^^ not found in this scope
 
 error[E0531]: cannot find tuple struct/variant `field` in this scope
   --> $DIR/resolve-assoc-suggestions.rs:28:13
    |
-28 |         let field(..);
+LL |         let field(..);
    |             ^^^^^ not found in this scope
 
 error[E0425]: cannot find value `field` in this scope
   --> $DIR/resolve-assoc-suggestions.rs:30:9
    |
-30 |         field;
+LL |         field;
    |         ^^^^^ help: try: `self.field`
 
 error[E0412]: cannot find type `Type` in this scope
   --> $DIR/resolve-assoc-suggestions.rs:33:16
    |
-33 |         let _: Type;
+LL |         let _: Type;
    |                ^^^^ help: try: `Self::Type`
 
 error[E0531]: cannot find tuple struct/variant `Type` in this scope
   --> $DIR/resolve-assoc-suggestions.rs:35:13
    |
-35 |         let Type(..);
+LL |         let Type(..);
    |             ^^^^ not found in this scope
 
 error[E0425]: cannot find value `Type` in this scope
   --> $DIR/resolve-assoc-suggestions.rs:37:9
    |
-37 |         Type;
+LL |         Type;
    |         ^^^^ not found in this scope
 
 error[E0412]: cannot find type `method` in this scope
   --> $DIR/resolve-assoc-suggestions.rs:40:16
    |
-40 |         let _: method;
+LL |         let _: method;
    |                ^^^^^^ not found in this scope
 
 error[E0531]: cannot find tuple struct/variant `method` in this scope
   --> $DIR/resolve-assoc-suggestions.rs:42:13
    |
-42 |         let method(..);
+LL |         let method(..);
    |             ^^^^^^ not found in this scope
 
 error[E0425]: cannot find value `method` in this scope
   --> $DIR/resolve-assoc-suggestions.rs:44:9
    |
-44 |         method;
+LL |         method;
    |         ^^^^^^ help: try: `self.method`
 
 error: aborting due to 9 previous errors
diff --git a/src/test/ui/resolve/resolve-hint-macro.stderr b/src/test/ui/resolve/resolve-hint-macro.stderr
index 65acbda8c97..82279b7b2df 100644
--- a/src/test/ui/resolve/resolve-hint-macro.stderr
+++ b/src/test/ui/resolve/resolve-hint-macro.stderr
@@ -1,7 +1,7 @@
 error[E0423]: expected function, found macro `assert`
   --> $DIR/resolve-hint-macro.rs:12:5
    |
-12 |     assert(true);
+LL |     assert(true);
    |     ^^^^^^ did you mean `assert!(...)`?
 
 error: aborting due to previous error
diff --git a/src/test/ui/resolve/resolve-speculative-adjustment.stderr b/src/test/ui/resolve/resolve-speculative-adjustment.stderr
index b6bd4c5460d..0e3eb95f9c4 100644
--- a/src/test/ui/resolve/resolve-speculative-adjustment.stderr
+++ b/src/test/ui/resolve/resolve-speculative-adjustment.stderr
@@ -1,25 +1,25 @@
 error[E0425]: cannot find value `field` in this scope
   --> $DIR/resolve-speculative-adjustment.rs:27:13
    |
-27 |             field;
+LL |             field;
    |             ^^^^^ not found in this scope
 
 error[E0425]: cannot find function `method` in this scope
   --> $DIR/resolve-speculative-adjustment.rs:29:13
    |
-29 |             method();
+LL |             method();
    |             ^^^^^^ not found in this scope
 
 error[E0425]: cannot find value `field` in this scope
   --> $DIR/resolve-speculative-adjustment.rs:33:9
    |
-33 |         field;
+LL |         field;
    |         ^^^^^ help: try: `self.field`
 
 error[E0425]: cannot find function `method` in this scope
   --> $DIR/resolve-speculative-adjustment.rs:35:9
    |
-35 |         method();
+LL |         method();
    |         ^^^^^^ help: try: `self.method`
 
 error: aborting due to 4 previous errors
diff --git a/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr b/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr
index 5cdeb0d52d9..c6058c7af03 100644
--- a/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr
+++ b/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr
@@ -1,7 +1,7 @@
 error[E0423]: expected value, found module `a`
   --> $DIR/suggest-path-instead-of-mod-dot-item.rs:27:5
    |
-27 |     a.I
+LL |     a.I
    |     ^--
    |     |
    |     did you mean `a::I`?
@@ -9,7 +9,7 @@ error[E0423]: expected value, found module `a`
 error[E0423]: expected value, found module `a`
   --> $DIR/suggest-path-instead-of-mod-dot-item.rs:32:5
    |
-32 |     a.g()
+LL |     a.g()
    |     ^----
    |     |
    |     did you mean `a::g(...)`?
@@ -17,7 +17,7 @@ error[E0423]: expected value, found module `a`
 error[E0423]: expected value, found module `a`
   --> $DIR/suggest-path-instead-of-mod-dot-item.rs:37:5
    |
-37 |     a.b.J
+LL |     a.b.J
    |     ^--
    |     |
    |     did you mean `a::b`?
@@ -25,7 +25,7 @@ error[E0423]: expected value, found module `a`
 error[E0423]: expected value, found module `a::b`
   --> $DIR/suggest-path-instead-of-mod-dot-item.rs:42:5
    |
-42 |     a::b.J
+LL |     a::b.J
    |     ^^^---
    |     |  |
    |     |  did you mean `I`?
@@ -34,7 +34,7 @@ error[E0423]: expected value, found module `a::b`
 error[E0423]: expected value, found module `a`
   --> $DIR/suggest-path-instead-of-mod-dot-item.rs:47:5
    |
-47 |     a.b.f();
+LL |     a.b.f();
    |     ^--
    |     |
    |     did you mean `a::b`?
@@ -42,7 +42,7 @@ error[E0423]: expected value, found module `a`
 error[E0423]: expected value, found module `a::b`
   --> $DIR/suggest-path-instead-of-mod-dot-item.rs:50:12
    |
-50 |     v.push(a::b);
+LL |     v.push(a::b);
    |            ^^^-
    |               |
    |               did you mean `I`?
@@ -50,7 +50,7 @@ error[E0423]: expected value, found module `a::b`
 error[E0423]: expected value, found module `a::b`
   --> $DIR/suggest-path-instead-of-mod-dot-item.rs:55:5
    |
-55 |     a::b.f()
+LL |     a::b.f()
    |     ^^^-----
    |     |  |
    |     |  did you mean `I`?
@@ -59,7 +59,7 @@ error[E0423]: expected value, found module `a::b`
 error[E0423]: expected value, found module `a::b`
   --> $DIR/suggest-path-instead-of-mod-dot-item.rs:60:5
    |
-60 |     a::b
+LL |     a::b
    |     ^^^-
    |        |
    |        did you mean `I`?
@@ -67,7 +67,7 @@ error[E0423]: expected value, found module `a::b`
 error[E0423]: expected function, found module `a::b`
   --> $DIR/suggest-path-instead-of-mod-dot-item.rs:65:5
    |
-65 |     a::b()
+LL |     a::b()
    |     ^^^-
    |        |
    |        did you mean `I`?
diff --git a/src/test/ui/resolve/token-error-correct-2.stderr b/src/test/ui/resolve/token-error-correct-2.stderr
index 9295bb27040..41d77bf16b9 100644
--- a/src/test/ui/resolve/token-error-correct-2.stderr
+++ b/src/test/ui/resolve/token-error-correct-2.stderr
@@ -1,19 +1,19 @@
 error: incorrect close delimiter: `)`
   --> $DIR/token-error-correct-2.rs:16:5
    |
-16 |     ) //~ ERROR: incorrect close delimiter: `)`
+LL |     ) //~ ERROR: incorrect close delimiter: `)`
    |     ^
    |
 note: unclosed delimiter
   --> $DIR/token-error-correct-2.rs:14:12
    |
-14 |     if foo {
+LL |     if foo {
    |            ^
 
 error[E0425]: cannot find value `foo` in this scope
   --> $DIR/token-error-correct-2.rs:14:8
    |
-14 |     if foo {
+LL |     if foo {
    |        ^^^ not found in this scope
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/resolve/token-error-correct-3.stderr b/src/test/ui/resolve/token-error-correct-3.stderr
index 1c9867476a2..98989f99dd4 100644
--- a/src/test/ui/resolve/token-error-correct-3.stderr
+++ b/src/test/ui/resolve/token-error-correct-3.stderr
@@ -1,40 +1,40 @@
 error: incorrect close delimiter: `}`
   --> $DIR/token-error-correct-3.rs:30:9
    |
-30 |         } else { //~ ERROR: incorrect close delimiter: `}`
+LL |         } else { //~ ERROR: incorrect close delimiter: `}`
    |         ^
    |
 note: unclosed delimiter
   --> $DIR/token-error-correct-3.rs:24:21
    |
-24 |             callback(path.as_ref(); //~ ERROR expected one of
+LL |             callback(path.as_ref(); //~ ERROR expected one of
    |                     ^
 
 error: expected one of `,`, `.`, `?`, or an operator, found `;`
   --> $DIR/token-error-correct-3.rs:24:35
    |
-24 |             callback(path.as_ref(); //~ ERROR expected one of
+LL |             callback(path.as_ref(); //~ ERROR expected one of
    |                                   ^ expected one of `,`, `.`, `?`, or an operator here
 
 error: expected one of `.`, `;`, `?`, `}`, or an operator, found `)`
   --> $DIR/token-error-correct-3.rs:30:9
    |
-25 |             fs::create_dir_all(path.as_ref()).map(|()| true) //~ ERROR: mismatched types
+LL |             fs::create_dir_all(path.as_ref()).map(|()| true) //~ ERROR: mismatched types
    |                                                             - expected one of `.`, `;`, `?`, `}`, or an operator here
 ...
-30 |         } else { //~ ERROR: incorrect close delimiter: `}`
+LL |         } else { //~ ERROR: incorrect close delimiter: `}`
    |         ^ unexpected token
 
 error[E0425]: cannot find function `is_directory` in this scope
   --> $DIR/token-error-correct-3.rs:23:13
    |
-23 |         if !is_directory(path.as_ref()) { //~ ERROR: cannot find function `is_directory`
+LL |         if !is_directory(path.as_ref()) { //~ ERROR: cannot find function `is_directory`
    |             ^^^^^^^^^^^^ not found in this scope
 
 error[E0308]: mismatched types
   --> $DIR/token-error-correct-3.rs:25:13
    |
-25 |             fs::create_dir_all(path.as_ref()).map(|()| true) //~ ERROR: mismatched types
+LL |             fs::create_dir_all(path.as_ref()).map(|()| true) //~ ERROR: mismatched types
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^- help: try adding a semicolon: `;`
    |             |
    |             expected (), found enum `std::result::Result`
diff --git a/src/test/ui/resolve/token-error-correct.stderr b/src/test/ui/resolve/token-error-correct.stderr
index e26f0e85aa6..344c288b596 100644
--- a/src/test/ui/resolve/token-error-correct.stderr
+++ b/src/test/ui/resolve/token-error-correct.stderr
@@ -1,31 +1,31 @@
 error: incorrect close delimiter: `}`
   --> $DIR/token-error-correct.rs:16:1
    |
-16 | }
+LL | }
    | ^
    |
 note: unclosed delimiter
   --> $DIR/token-error-correct.rs:14:12
    |
-14 |     foo(bar(;
+LL |     foo(bar(;
    |            ^
 
 error: incorrect close delimiter: `}`
   --> $DIR/token-error-correct.rs:16:1
    |
-16 | }
+LL | }
    | ^
    |
 note: unclosed delimiter
   --> $DIR/token-error-correct.rs:14:8
    |
-14 |     foo(bar(;
+LL |     foo(bar(;
    |        ^
 
 error: expected expression, found `;`
   --> $DIR/token-error-correct.rs:14:13
    |
-14 |     foo(bar(;
+LL |     foo(bar(;
    |             ^
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/resolve/tuple-struct-alias.stderr b/src/test/ui/resolve/tuple-struct-alias.stderr
index 144eb7966e0..50d997e01da 100644
--- a/src/test/ui/resolve/tuple-struct-alias.stderr
+++ b/src/test/ui/resolve/tuple-struct-alias.stderr
@@ -1,7 +1,7 @@
 error[E0423]: expected function, found self type `Self`
   --> $DIR/tuple-struct-alias.rs:16:17
    |
-16 |         let s = Self(0, 1); //~ ERROR expected function
+LL |         let s = Self(0, 1); //~ ERROR expected function
    |                 ^^^^ not a function
    |
    = note: can't use `Self` as a constructor, you must use the implemented struct
@@ -9,7 +9,7 @@ error[E0423]: expected function, found self type `Self`
 error[E0532]: expected tuple struct/variant, found self type `Self`
   --> $DIR/tuple-struct-alias.rs:18:13
    |
-18 |             Self(..) => {} //~ ERROR expected tuple struct/variant
+LL |             Self(..) => {} //~ ERROR expected tuple struct/variant
    |             ^^^^ not a tuple struct/variant
    |
    = note: can't use `Self` as a constructor, you must use the implemented struct
@@ -17,7 +17,7 @@ error[E0532]: expected tuple struct/variant, found self type `Self`
 error[E0423]: expected function, found type alias `A`
   --> $DIR/tuple-struct-alias.rs:24:13
    |
-24 |     let s = A(0, 1); //~ ERROR expected function
+LL |     let s = A(0, 1); //~ ERROR expected function
    |             ^ did you mean `S`?
    |
    = note: can't use a type alias as a constructor
@@ -25,7 +25,7 @@ error[E0423]: expected function, found type alias `A`
 error[E0532]: expected tuple struct/variant, found type alias `A`
   --> $DIR/tuple-struct-alias.rs:26:9
    |
-26 |         A(..) => {} //~ ERROR expected tuple struct/variant
+LL |         A(..) => {} //~ ERROR expected tuple struct/variant
    |         ^ did you mean `S`?
    |
    = note: can't use a type alias as a constructor
diff --git a/src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.stderr b/src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.stderr
index 028a0931c71..c225563b754 100644
--- a/src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.stderr
+++ b/src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.stderr
@@ -1,13 +1,13 @@
 error[E0405]: cannot find trait `Nonexist` in this scope
   --> $DIR/unboxed-closure-sugar-nonexistent-trait.rs:11:8
    |
-11 | fn f<F:Nonexist(isize) -> isize>(x: F) {}
+LL | fn f<F:Nonexist(isize) -> isize>(x: F) {}
    |        ^^^^^^^^ not found in this scope
 
 error[E0404]: expected trait, found type alias `Typedef`
   --> $DIR/unboxed-closure-sugar-nonexistent-trait.rs:16:8
    |
-16 | fn g<F:Typedef(isize) -> isize>(x: F) {}
+LL | fn g<F:Typedef(isize) -> isize>(x: F) {}
    |        ^^^^^^^^^^^^^^^^^^^^^^^ type aliases cannot be used for traits
 
 error: cannot continue compilation due to previous error
diff --git a/src/test/ui/resolve/unresolved_static_type_field.stderr b/src/test/ui/resolve/unresolved_static_type_field.stderr
index ea58281a331..7012419d94c 100644
--- a/src/test/ui/resolve/unresolved_static_type_field.stderr
+++ b/src/test/ui/resolve/unresolved_static_type_field.stderr
@@ -1,7 +1,7 @@
 error[E0425]: cannot find value `cx` in this scope
   --> $DIR/unresolved_static_type_field.rs:19:11
    |
-19 |         f(cx);
+LL |         f(cx);
    |           ^^
    |           |
    |           `self` value is only available in methods with `self` parameter
diff --git a/src/test/ui/resolve/use_suggestion_placement.stderr b/src/test/ui/resolve/use_suggestion_placement.stderr
index c46a1d5bfc8..8e70a579781 100644
--- a/src/test/ui/resolve/use_suggestion_placement.stderr
+++ b/src/test/ui/resolve/use_suggestion_placement.stderr
@@ -1,7 +1,7 @@
 error[E0412]: cannot find type `Path` in this scope
   --> $DIR/use_suggestion_placement.rs:27:16
    |
-27 |     type Bar = Path; //~ ERROR cannot find
+LL |     type Bar = Path; //~ ERROR cannot find
    |                ^^^^ not found in this scope
 help: possible candidate is found in another module, you can import it into scope
    |
@@ -11,7 +11,7 @@ help: possible candidate is found in another module, you can import it into scop
 error[E0425]: cannot find value `A` in this scope
   --> $DIR/use_suggestion_placement.rs:32:13
    |
-32 |     let _ = A; //~ ERROR cannot find
+LL |     let _ = A; //~ ERROR cannot find
    |             ^ not found in this scope
 help: possible candidate is found in another module, you can import it into scope
    |
@@ -21,7 +21,7 @@ help: possible candidate is found in another module, you can import it into scop
 error[E0412]: cannot find type `HashMap` in this scope
   --> $DIR/use_suggestion_placement.rs:37:23
    |
-37 |     type Dict<K, V> = HashMap<K, V>; //~ ERROR cannot find
+LL |     type Dict<K, V> = HashMap<K, V>; //~ ERROR cannot find
    |                       ^^^^^^^ not found in this scope
 help: possible candidates are found in other modules, you can import them into scope
    |