Update UI tests

16 files changed, 42 insertions, 42 deletions

diff --git a/src/test/ui/codemap_tests/bad-format-args.stderr b/src/test/ui/codemap_tests/bad-format-args.stderr
index 9d6ef54cb97..5414557ddc2 100644
--- a/src/test/ui/codemap_tests/bad-format-args.stderr
+++ b/src/test/ui/codemap_tests/bad-format-args.stderr
@@ -1,7 +1,7 @@
 error: requires at least a format string argument
   --> $DIR/bad-format-args.rs:12:5
    |
-12 |     format!();
+LL |     format!();
    |     ^^^^^^^^^^
    |
    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
@@ -9,7 +9,7 @@ error: requires at least a format string argument
 error: expected token: `,`
   --> $DIR/bad-format-args.rs:13:5
    |
-13 |     format!("" 1);
+LL |     format!("" 1);
    |     ^^^^^^^^^^^^^^
    |
    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
@@ -17,7 +17,7 @@ error: expected token: `,`
 error: expected token: `,`
   --> $DIR/bad-format-args.rs:14:5
    |
-14 |     format!("", 1 1);
+LL |     format!("", 1 1);
    |     ^^^^^^^^^^^^^^^^^
    |
    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
diff --git a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr b/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr
index 168aebf13dd..6531e3b8f8b 100644
--- a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr
+++ b/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr
@@ -1,9 +1,9 @@
 error[E0592]: duplicate definitions with name `f`
   --> $DIR/coherence-overlapping-inherent-impl-trait.rs:14:10
    |
-14 | impl C { fn f() {} } //~ ERROR duplicate
+LL | impl C { fn f() {} } //~ ERROR duplicate
    |          ^^^^^^^^^ duplicate definitions for `f`
-15 | impl C { fn f() {} }
+LL | impl C { fn f() {} }
    |          --------- other definition for `f`
 
 error: aborting due to previous error
diff --git a/src/test/ui/codemap_tests/empty_span.stderr b/src/test/ui/codemap_tests/empty_span.stderr
index 0d9654c8697..63b19c9e0c6 100644
--- a/src/test/ui/codemap_tests/empty_span.stderr
+++ b/src/test/ui/codemap_tests/empty_span.stderr
@@ -1,7 +1,7 @@
 error[E0321]: cross-crate traits with a default impl, like `std::marker::Send`, can only be implemented for a struct/enum type, not `&'static main::Foo`
   --> $DIR/empty_span.rs:17:5
    |
-17 |     unsafe impl Send for &'static Foo { } //~ ERROR cross-crate traits with a default impl
+LL |     unsafe impl Send for &'static Foo { } //~ ERROR cross-crate traits with a default impl
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/codemap_tests/huge_multispan_highlight.stderr b/src/test/ui/codemap_tests/huge_multispan_highlight.stderr
index f7bcaa64fdd..2fdd6906a56 100644
--- a/src/test/ui/codemap_tests/huge_multispan_highlight.stderr
+++ b/src/test/ui/codemap_tests/huge_multispan_highlight.stderr
@@ -1,11 +1,11 @@
 error[E0596]: cannot borrow immutable local variable `x` as mutable
-   --> $DIR/huge_multispan_highlight.rs:100:18
-    |
-12  |     let x = "foo";
-    |         - consider changing this to `mut x`
+  --> $DIR/huge_multispan_highlight.rs:100:18
+   |
+LL |     let x = "foo";
+   |         - consider changing this to `mut x`
 ...
-100 |     let y = &mut x; //~ ERROR cannot borrow
-    |                  ^ cannot borrow mutably
+LL |     let y = &mut x; //~ ERROR cannot borrow
+   |                  ^ cannot borrow mutably
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/codemap_tests/issue-11715.stderr b/src/test/ui/codemap_tests/issue-11715.stderr
index c7fc7d4271a..d44dac0d537 100644
--- a/src/test/ui/codemap_tests/issue-11715.stderr
+++ b/src/test/ui/codemap_tests/issue-11715.stderr
@@ -1,12 +1,12 @@
 error[E0499]: cannot borrow `x` as mutable more than once at a time
-   --> $DIR/issue-11715.rs:100:18
-    |
-99  |     let y = &mut x;
-    |                  - first mutable borrow occurs here
-100 |     let z = &mut x; //~ ERROR cannot borrow
-    |                  ^ second mutable borrow occurs here
-101 | }
-    | - first borrow ends here
+  --> $DIR/issue-11715.rs:100:18
+   |
+LL |     let y = &mut x;
+   |                  - first mutable borrow occurs here
+LL |     let z = &mut x; //~ ERROR cannot borrow
+   |                  ^ second mutable borrow occurs here
+LL | }
+   | - first borrow ends here
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/codemap_tests/issue-28308.stderr b/src/test/ui/codemap_tests/issue-28308.stderr
index 87b8f04ad1f..947c8142e31 100644
--- a/src/test/ui/codemap_tests/issue-28308.stderr
+++ b/src/test/ui/codemap_tests/issue-28308.stderr
@@ -1,7 +1,7 @@
 error[E0600]: cannot apply unary operator `!` to type `&'static str`
   --> $DIR/issue-28308.rs:12:5
    |
-12 |     assert!("foo");
+LL |     assert!("foo");
    |     ^^^^^^^^^^^^^^^
    |
    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
diff --git a/src/test/ui/codemap_tests/one_line.stderr b/src/test/ui/codemap_tests/one_line.stderr
index 73ef9219e7e..a31a5318b41 100644
--- a/src/test/ui/codemap_tests/one_line.stderr
+++ b/src/test/ui/codemap_tests/one_line.stderr
@@ -1,7 +1,7 @@
 error[E0499]: cannot borrow `v` as mutable more than once at a time
   --> $DIR/one_line.rs:13:12
    |
-13 |     v.push(v.pop().unwrap()); //~ ERROR cannot borrow
+LL |     v.push(v.pop().unwrap()); //~ ERROR cannot borrow
    |     -      ^               - first borrow ends here
    |     |      |
    |     |      second mutable borrow occurs here
diff --git a/src/test/ui/codemap_tests/overlapping_inherent_impls.stderr b/src/test/ui/codemap_tests/overlapping_inherent_impls.stderr
index 858e3e53349..d11ac5463f0 100644
--- a/src/test/ui/codemap_tests/overlapping_inherent_impls.stderr
+++ b/src/test/ui/codemap_tests/overlapping_inherent_impls.stderr
@@ -1,28 +1,28 @@
 error[E0592]: duplicate definitions with name `id`
   --> $DIR/overlapping_inherent_impls.rs:19:5
    |
-19 |     fn id() {} //~ ERROR duplicate definitions
+LL |     fn id() {} //~ ERROR duplicate definitions
    |     ^^^^^^^^^^ duplicate definitions for `id`
 ...
-23 |     fn id() {}
+LL |     fn id() {}
    |     ---------- other definition for `id`
 
 error[E0592]: duplicate definitions with name `bar`
   --> $DIR/overlapping_inherent_impls.rs:29:5
    |
-29 |     fn bar(&self) {} //~ ERROR duplicate definitions
+LL |     fn bar(&self) {} //~ ERROR duplicate definitions
    |     ^^^^^^^^^^^^^^^^ duplicate definitions for `bar`
 ...
-33 |     fn bar(&self) {}
+LL |     fn bar(&self) {}
    |     ---------------- other definition for `bar`
 
 error[E0592]: duplicate definitions with name `baz`
   --> $DIR/overlapping_inherent_impls.rs:39:5
    |
-39 |     fn baz(&self) {} //~ ERROR duplicate definitions
+LL |     fn baz(&self) {} //~ ERROR duplicate definitions
    |     ^^^^^^^^^^^^^^^^ duplicate definitions for `baz`
 ...
-43 |     fn baz(&self) {}
+LL |     fn baz(&self) {}
    |     ---------------- other definition for `baz`
    |
    = note: upstream crates may add new impl of trait `std::marker::Copy` for type `std::vec::Vec<_>` in future versions
diff --git a/src/test/ui/codemap_tests/overlapping_spans.stderr b/src/test/ui/codemap_tests/overlapping_spans.stderr
index edb970ffdff..c585964a527 100644
--- a/src/test/ui/codemap_tests/overlapping_spans.stderr
+++ b/src/test/ui/codemap_tests/overlapping_spans.stderr
@@ -1,7 +1,7 @@
 error[E0509]: cannot move out of type `S`, which implements the `Drop` trait
   --> $DIR/overlapping_spans.rs:21:9
    |
-21 |         S {f:_s} => {} //~ ERROR cannot move out
+LL |         S {f:_s} => {} //~ ERROR cannot move out
    |         ^^^^^--^
    |         |    |
    |         |    hint: to prevent move, use `ref _s` or `ref mut _s`
diff --git a/src/test/ui/codemap_tests/tab.stderr b/src/test/ui/codemap_tests/tab.stderr
index cd52f414f64..0f683bd6841 100644
--- a/src/test/ui/codemap_tests/tab.stderr
+++ b/src/test/ui/codemap_tests/tab.stderr
@@ -1,15 +1,15 @@
 error[E0425]: cannot find value `bar` in this scope
   --> $DIR/tab.rs:14:2
    |
-14 |     bar; //~ ERROR cannot find value `bar`
+LL |     bar; //~ ERROR cannot find value `bar`
    |     ^^^ not found in this scope
 
 error[E0308]: mismatched types
   --> $DIR/tab.rs:18:2
    |
-17 | fn foo() {
+LL | fn foo() {
    |          - help: try adding a return type: `-> &'static str`
-18 |     "bar            boo" //~ ERROR mismatched types
+LL |     "bar            boo" //~ ERROR mismatched types
    |     ^^^^^^^^^^^^^^^^^^^^ expected (), found reference
    |
    = note: expected type `()`
diff --git a/src/test/ui/codemap_tests/tab_2.stderr b/src/test/ui/codemap_tests/tab_2.stderr
index 34c49d97562..d8ad5955cae 100644
--- a/src/test/ui/codemap_tests/tab_2.stderr
+++ b/src/test/ui/codemap_tests/tab_2.stderr
@@ -1,9 +1,9 @@
 error: unterminated double quote string
   --> $DIR/tab_2.rs:14:7
    |
-14 |                   """; //~ ERROR unterminated double quote
+LL |                   """; //~ ERROR unterminated double quote
    |  ___________________^
-15 | | }
+LL | | }
    | |__^
 
 error: aborting due to previous error
diff --git a/src/test/ui/codemap_tests/tab_3.stderr b/src/test/ui/codemap_tests/tab_3.stderr
index 0435aed7c8a..02cbf5afee6 100644
--- a/src/test/ui/codemap_tests/tab_3.stderr
+++ b/src/test/ui/codemap_tests/tab_3.stderr
@@ -1,10 +1,10 @@
 error[E0382]: use of moved value: `some_vec`
   --> $DIR/tab_3.rs:17:20
    |
-15 |     some_vec.into_iter();
+LL |     some_vec.into_iter();
    |     -------- value moved here
 16 |     {
-17 |         println!("{:?}", some_vec); //~ ERROR use of moved
+LL |         println!("{:?}", some_vec); //~ ERROR use of moved
    |                          ^^^^^^^^ value used here after move
    |
    = note: move occurs because `some_vec` has type `std::vec::Vec<&str>`, which does not implement the `Copy` trait
diff --git a/src/test/ui/codemap_tests/two_files.stderr b/src/test/ui/codemap_tests/two_files.stderr
index 8798081ad6d..a7fa82a0ba1 100644
--- a/src/test/ui/codemap_tests/two_files.stderr
+++ b/src/test/ui/codemap_tests/two_files.stderr
@@ -1,7 +1,7 @@
 error[E0404]: expected trait, found type alias `Bar`
   --> $DIR/two_files.rs:15:6
    |
-15 | impl Bar for Baz { } //~ ERROR expected trait, found type alias
+LL | impl Bar for Baz { } //~ ERROR expected trait, found type alias
    |      ^^^ type aliases cannot be used for traits
 
 error: cannot continue compilation due to previous error
diff --git a/src/test/ui/codemap_tests/unicode.stderr b/src/test/ui/codemap_tests/unicode.stderr
index 4f3c79410df..b9b03c9b9ec 100644
--- a/src/test/ui/codemap_tests/unicode.stderr
+++ b/src/test/ui/codemap_tests/unicode.stderr
@@ -1,7 +1,7 @@
 error: invalid ABI: expected one of [cdecl, stdcall, fastcall, vectorcall, thiscall, aapcs, win64, sysv64, ptx-kernel, msp430-interrupt, x86-interrupt, Rust, C, system, rust-intrinsic, rust-call, platform-intrinsic, unadjusted], found `路濫狼á́́`
   --> $DIR/unicode.rs:11:8
    |
-11 | extern "路濫狼á́́" fn foo() {} //~ ERROR invalid ABI
+LL | extern "路濫狼á́́" fn foo() {} //~ ERROR invalid ABI
    |        ^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/codemap_tests/unicode_2.stderr b/src/test/ui/codemap_tests/unicode_2.stderr
index 879553740f3..b75245589b0 100644
--- a/src/test/ui/codemap_tests/unicode_2.stderr
+++ b/src/test/ui/codemap_tests/unicode_2.stderr
@@ -1,7 +1,7 @@
 error: invalid width `7` for integer literal
   --> $DIR/unicode_2.rs:14:25
    |
-14 |     let _ = ("a̐éö̲", 0u7); //~ ERROR invalid width
+LL |     let _ = ("a̐éö̲", 0u7); //~ ERROR invalid width
    |                     ^^^
    |
    = help: valid widths are 8, 16, 32, 64 and 128
@@ -9,7 +9,7 @@ error: invalid width `7` for integer literal
 error: invalid width `42` for integer literal
   --> $DIR/unicode_2.rs:15:20
    |
-15 |     let _ = ("아あ", 1i42); //~ ERROR invalid width
+LL |     let _ = ("아あ", 1i42); //~ ERROR invalid width
    |                      ^^^^
    |
    = help: valid widths are 8, 16, 32, 64 and 128
@@ -17,7 +17,7 @@ error: invalid width `42` for integer literal
 error[E0425]: cannot find value `a̐é` in this scope
   --> $DIR/unicode_2.rs:16:13
    |
-16 |     let _ = a̐é; //~ ERROR cannot find
+LL |     let _ = a̐é; //~ ERROR cannot find
    |             ^^ not found in this scope
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/codemap_tests/unicode_3.stderr b/src/test/ui/codemap_tests/unicode_3.stderr
index 3547accd2ed..1a44d39aa27 100644
--- a/src/test/ui/codemap_tests/unicode_3.stderr
+++ b/src/test/ui/codemap_tests/unicode_3.stderr
@@ -1,7 +1,7 @@
 warning: denote infinite loops with `loop { ... }`
   --> $DIR/unicode_3.rs:14:45
    |
-14 |     let s = "ZͨA͑ͦ͒͋ͤ͑̚L̄͑͋Ĝͨͥ̿͒̽̈́Oͥ͛ͭ!̏"; while true { break; }
+LL |     let s = "ZͨA͑ͦ͒͋ͤ͑̚L̄͑͋Ĝͨͥ̿͒̽̈́Oͥ͛ͭ!̏"; while true { break; }
    |                       ^^^^^^^^^^ help: use `loop`
    |
    = note: #[warn(while_true)] on by default