Update UI tests

11 files changed, 57 insertions, 57 deletions

diff --git a/src/test/ui-fulldeps/custom-derive/issue-36935.stderr b/src/test/ui-fulldeps/custom-derive/issue-36935.stderr
index 55848c6553c..b082999a897 100644
--- a/src/test/ui-fulldeps/custom-derive/issue-36935.stderr
+++ b/src/test/ui-fulldeps/custom-derive/issue-36935.stderr
@@ -1,7 +1,7 @@
 error: proc-macro derive panicked
   --> $DIR/issue-36935.rs:18:15
    |
-18 | #[derive(Foo, Bar)] //~ ERROR proc-macro derive panicked
+LL | #[derive(Foo, Bar)] //~ ERROR proc-macro derive panicked
    |               ^^^
    |
    = help: message: lolnope
diff --git a/src/test/ui-fulldeps/deprecated-derive.stderr b/src/test/ui-fulldeps/deprecated-derive.stderr
index 3ab7567f8df..df4bd7f752c 100644
--- a/src/test/ui-fulldeps/deprecated-derive.stderr
+++ b/src/test/ui-fulldeps/deprecated-derive.stderr
@@ -1,6 +1,6 @@
 warning: derive(Encodable) is deprecated in favor of derive(RustcEncodable)
   --> $DIR/deprecated-derive.rs:18:10
    |
-18 | #[derive(Encodable)]
+LL | #[derive(Encodable)]
    |          ^^^^^^^^^
 
diff --git a/src/test/ui-fulldeps/lint-group-plugin.stderr b/src/test/ui-fulldeps/lint-group-plugin.stderr
index 1d68e78de5e..80a309f27e1 100644
--- a/src/test/ui-fulldeps/lint-group-plugin.stderr
+++ b/src/test/ui-fulldeps/lint-group-plugin.stderr
@@ -1,7 +1,7 @@
 warning: item is named 'lintme'
   --> $DIR/lint-group-plugin.rs:18:1
    |
-18 | fn lintme() { } //~ WARNING item is named 'lintme'
+LL | fn lintme() { } //~ WARNING item is named 'lintme'
    | ^^^^^^^^^^^^^^^
    |
    = note: #[warn(test_lint)] on by default
@@ -9,7 +9,7 @@ warning: item is named 'lintme'
 warning: item is named 'pleaselintme'
   --> $DIR/lint-group-plugin.rs:19:1
    |
-19 | fn pleaselintme() { } //~ WARNING item is named 'pleaselintme'
+LL | fn pleaselintme() { } //~ WARNING item is named 'pleaselintme'
    | ^^^^^^^^^^^^^^^^^^^^^
    |
    = note: #[warn(please_lint)] on by default
diff --git a/src/test/ui-fulldeps/lint-plugin-cmdline-allow.stderr b/src/test/ui-fulldeps/lint-plugin-cmdline-allow.stderr
index 0cc3a5b6bf3..cda6ea8bb90 100644
--- a/src/test/ui-fulldeps/lint-plugin-cmdline-allow.stderr
+++ b/src/test/ui-fulldeps/lint-plugin-cmdline-allow.stderr
@@ -1,13 +1,13 @@
 warning: function is never used: `lintme`
   --> $DIR/lint-plugin-cmdline-allow.rs:20:1
    |
-20 | fn lintme() { }
+LL | fn lintme() { }
    | ^^^^^^^^^^^
    |
 note: lint level defined here
   --> $DIR/lint-plugin-cmdline-allow.rs:17:9
    |
-17 | #![warn(unused)]
+LL | #![warn(unused)]
    |         ^^^^^^
    = note: #[warn(dead_code)] implied by #[warn(unused)]
 
diff --git a/src/test/ui-fulldeps/lint-plugin-cmdline-load.stderr b/src/test/ui-fulldeps/lint-plugin-cmdline-load.stderr
index 42ececc93bd..33c690a2d9f 100644
--- a/src/test/ui-fulldeps/lint-plugin-cmdline-load.stderr
+++ b/src/test/ui-fulldeps/lint-plugin-cmdline-load.stderr
@@ -1,7 +1,7 @@
 warning: item is named 'lintme'
   --> $DIR/lint-plugin-cmdline-load.rs:18:1
    |
-18 | fn lintme() { } //~ WARNING item is named 'lintme'
+LL | fn lintme() { } //~ WARNING item is named 'lintme'
    | ^^^^^^^^^^^^^^^
    |
    = note: #[warn(test_lint)] on by default
diff --git a/src/test/ui-fulldeps/lint-plugin-forbid-attrs.stderr b/src/test/ui-fulldeps/lint-plugin-forbid-attrs.stderr
index b9d166589b0..ac26b5212ec 100644
--- a/src/test/ui-fulldeps/lint-plugin-forbid-attrs.stderr
+++ b/src/test/ui-fulldeps/lint-plugin-forbid-attrs.stderr
@@ -1,22 +1,22 @@
 error: item is named 'lintme'
   --> $DIR/lint-plugin-forbid-attrs.rs:18:1
    |
-18 | fn lintme() { } //~ ERROR item is named 'lintme'
+LL | fn lintme() { } //~ ERROR item is named 'lintme'
    | ^^^^^^^^^^^^^^^
    |
 note: lint level defined here
   --> $DIR/lint-plugin-forbid-attrs.rs:16:11
    |
-16 | #![forbid(test_lint)]
+LL | #![forbid(test_lint)]
    |           ^^^^^^^^^
 
 error[E0453]: allow(test_lint) overruled by outer forbid(test_lint)
   --> $DIR/lint-plugin-forbid-attrs.rs:20:9
    |
-16 | #![forbid(test_lint)]
+LL | #![forbid(test_lint)]
    |           --------- `forbid` level set here
 ...
-20 | #[allow(test_lint)]
+LL | #[allow(test_lint)]
    |         ^^^^^^^^^ overruled by previous forbid
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui-fulldeps/lint-plugin.stderr b/src/test/ui-fulldeps/lint-plugin.stderr
index 1fe821d3115..4a3140925c8 100644
--- a/src/test/ui-fulldeps/lint-plugin.stderr
+++ b/src/test/ui-fulldeps/lint-plugin.stderr
@@ -1,7 +1,7 @@
 warning: item is named 'lintme'
   --> $DIR/lint-plugin.rs:18:1
    |
-18 | fn lintme() { } //~ WARNING item is named 'lintme'
+LL | fn lintme() { } //~ WARNING item is named 'lintme'
    | ^^^^^^^^^^^^^^^
    |
    = note: #[warn(test_lint)] on by default
diff --git a/src/test/ui-fulldeps/proc-macro/parent-source-spans.stderr b/src/test/ui-fulldeps/proc-macro/parent-source-spans.stderr
index 7194b05b18e..0442c4f6ce7 100644
--- a/src/test/ui-fulldeps/proc-macro/parent-source-spans.stderr
+++ b/src/test/ui-fulldeps/proc-macro/parent-source-spans.stderr
@@ -1,127 +1,127 @@
 error: first final: "hello"
   --> $DIR/parent-source-spans.rs:27:12
    |
-27 |     three!($a, $b);
+LL |     three!($a, $b);
    |            ^^
 ...
-44 |     one!("hello", "world");
+LL |     one!("hello", "world");
    |     ----------------------- in this macro invocation
 
 error: second final: "world"
   --> $DIR/parent-source-spans.rs:27:16
    |
-27 |     three!($a, $b);
+LL |     three!($a, $b);
    |                ^^
 ...
-44 |     one!("hello", "world");
+LL |     one!("hello", "world");
    |     ----------------------- in this macro invocation
 
 error: first parent: "hello"
   --> $DIR/parent-source-spans.rs:21:5
    |
-21 |     two!($a, $b);
+LL |     two!($a, $b);
    |     ^^^^^^^^^^^^^
 ...
-44 |     one!("hello", "world");
+LL |     one!("hello", "world");
    |     ----------------------- in this macro invocation
 
 error: second parent: "world"
   --> $DIR/parent-source-spans.rs:21:5
    |
-21 |     two!($a, $b);
+LL |     two!($a, $b);
    |     ^^^^^^^^^^^^^
 ...
-44 |     one!("hello", "world");
+LL |     one!("hello", "world");
    |     ----------------------- in this macro invocation
 
 error: first grandparent: "hello"
   --> $DIR/parent-source-spans.rs:44:5
    |
-44 |     one!("hello", "world");
+LL |     one!("hello", "world");
    |     ^^^^^^^^^^^^^^^^^^^^^^^
 
 error: second grandparent: "world"
   --> $DIR/parent-source-spans.rs:44:5
    |
-44 |     one!("hello", "world");
+LL |     one!("hello", "world");
    |     ^^^^^^^^^^^^^^^^^^^^^^^
 
 error: first source: "hello"
   --> $DIR/parent-source-spans.rs:44:5
    |
-44 |     one!("hello", "world");
+LL |     one!("hello", "world");
    |     ^^^^^^^^^^^^^^^^^^^^^^^
 
 error: second source: "world"
   --> $DIR/parent-source-spans.rs:44:5
    |
-44 |     one!("hello", "world");
+LL |     one!("hello", "world");
    |     ^^^^^^^^^^^^^^^^^^^^^^^
 
 error: first final: "yay"
   --> $DIR/parent-source-spans.rs:27:12
    |
-27 |     three!($a, $b);
+LL |     three!($a, $b);
    |            ^^
 ...
-50 |     two!("yay", "rust");
+LL |     two!("yay", "rust");
    |     -------------------- in this macro invocation
 
 error: second final: "rust"
   --> $DIR/parent-source-spans.rs:27:16
    |
-27 |     three!($a, $b);
+LL |     three!($a, $b);
    |                ^^
 ...
-50 |     two!("yay", "rust");
+LL |     two!("yay", "rust");
    |     -------------------- in this macro invocation
 
 error: first parent: "yay"
   --> $DIR/parent-source-spans.rs:50:5
    |
-50 |     two!("yay", "rust");
+LL |     two!("yay", "rust");
    |     ^^^^^^^^^^^^^^^^^^^^
 
 error: second parent: "rust"
   --> $DIR/parent-source-spans.rs:50:5
    |
-50 |     two!("yay", "rust");
+LL |     two!("yay", "rust");
    |     ^^^^^^^^^^^^^^^^^^^^
 
 error: first source: "yay"
   --> $DIR/parent-source-spans.rs:50:5
    |
-50 |     two!("yay", "rust");
+LL |     two!("yay", "rust");
    |     ^^^^^^^^^^^^^^^^^^^^
 
 error: second source: "rust"
   --> $DIR/parent-source-spans.rs:50:5
    |
-50 |     two!("yay", "rust");
+LL |     two!("yay", "rust");
    |     ^^^^^^^^^^^^^^^^^^^^
 
 error: first final: "hip"
   --> $DIR/parent-source-spans.rs:56:12
    |
-56 |     three!("hip", "hop");
+LL |     three!("hip", "hop");
    |            ^^^^^
 
 error: second final: "hop"
   --> $DIR/parent-source-spans.rs:56:19
    |
-56 |     three!("hip", "hop");
+LL |     three!("hip", "hop");
    |                   ^^^^^
 
 error: first source: "hip"
   --> $DIR/parent-source-spans.rs:56:12
    |
-56 |     three!("hip", "hop");
+LL |     three!("hip", "hop");
    |            ^^^^^
 
 error: second source: "hop"
   --> $DIR/parent-source-spans.rs:56:19
    |
-56 |     three!("hip", "hop");
+LL |     three!("hip", "hop");
    |                   ^^^^^
 
 error: aborting due to 18 previous errors
diff --git a/src/test/ui-fulldeps/proc-macro/signature.stderr b/src/test/ui-fulldeps/proc-macro/signature.stderr
index b89f67d9069..dad403ccf3a 100644
--- a/src/test/ui-fulldeps/proc-macro/signature.stderr
+++ b/src/test/ui-fulldeps/proc-macro/signature.stderr
@@ -1,10 +1,10 @@
 error[E0308]: mismatched types
   --> $DIR/signature.rs:17:1
    |
-17 | / pub unsafe extern fn foo(a: i32, b: u32) -> u32 {
-18 | |     //~^ ERROR: mismatched types
-19 | |     loop {}
-20 | | }
+LL | / pub unsafe extern fn foo(a: i32, b: u32) -> u32 {
+LL | |     //~^ ERROR: mismatched types
+LL | |     loop {}
+LL | | }
    | |_^ expected normal fn, found unsafe fn
    |
    = note: expected type `fn(proc_macro::TokenStream) -> proc_macro::TokenStream`
diff --git a/src/test/ui-fulldeps/proc-macro/three-equals.stderr b/src/test/ui-fulldeps/proc-macro/three-equals.stderr
index 0ffaf161078..1a0337f93f9 100644
--- a/src/test/ui-fulldeps/proc-macro/three-equals.stderr
+++ b/src/test/ui-fulldeps/proc-macro/three-equals.stderr
@@ -1,7 +1,7 @@
 error: found 2 equal signs, need exactly 3
   --> $DIR/three-equals.rs:25:5
    |
-25 |     three_equals!(==); //~ ERROR found 2 equal signs, need exactly 3
+LL |     three_equals!(==); //~ ERROR found 2 equal signs, need exactly 3
    |     ^^^^^^^^^^^^^^^^^^
    |
    = help: input must be: `===`
@@ -9,38 +9,38 @@ error: found 2 equal signs, need exactly 3
 error: expected EOF, found `=`.
   --> $DIR/three-equals.rs:28:21
    |
-28 |     three_equals!(=====); //~ ERROR expected EOF
+LL |     three_equals!(=====); //~ ERROR expected EOF
    |                     ^^
    |
 note: last good input was here
   --> $DIR/three-equals.rs:28:21
    |
-28 |     three_equals!(=====); //~ ERROR expected EOF
+LL |     three_equals!(=====); //~ ERROR expected EOF
    |                     ^^
    = help: input must be: `===`
 
 error: expected `=`, found `abc`.
   --> $DIR/three-equals.rs:31:19
    |
-31 |     three_equals!(abc); //~ ERROR expected `=`
+LL |     three_equals!(abc); //~ ERROR expected `=`
    |                   ^^^
 
 error: expected `=`, found `!`.
   --> $DIR/three-equals.rs:34:19
    |
-34 |     three_equals!(!!); //~ ERROR expected `=`
+LL |     three_equals!(!!); //~ ERROR expected `=`
    |                   ^
 
 error: expected EOF, found `a`.
   --> $DIR/three-equals.rs:37:22
    |
-37 |     three_equals!(===a); //~ ERROR expected EOF
+LL |     three_equals!(===a); //~ ERROR expected EOF
    |                      ^
    |
 note: last good input was here
   --> $DIR/three-equals.rs:37:21
    |
-37 |     three_equals!(===a); //~ ERROR expected EOF
+LL |     three_equals!(===a); //~ ERROR expected EOF
    |                     ^
    = help: input must be: `===`
 
diff --git a/src/test/ui-fulldeps/resolve-error.stderr b/src/test/ui-fulldeps/resolve-error.stderr
index 9121ce1720c..e19ec9e6f80 100644
--- a/src/test/ui-fulldeps/resolve-error.stderr
+++ b/src/test/ui-fulldeps/resolve-error.stderr
@@ -1,61 +1,61 @@
 error: cannot find derive macro `FooWithLongNan` in this scope
   --> $DIR/resolve-error.rs:37:10
    |
-37 | #[derive(FooWithLongNan)]
+LL | #[derive(FooWithLongNan)]
    |          ^^^^^^^^^^^^^^ help: try: `FooWithLongName`
 
 error: cannot find attribute macro `attr_proc_macra` in this scope
   --> $DIR/resolve-error.rs:41:3
    |
-41 | #[attr_proc_macra]
+LL | #[attr_proc_macra]
    |   ^^^^^^^^^^^^^^^ help: try: `attr_proc_macro`
 
 error: cannot find attribute macro `FooWithLongNan` in this scope
   --> $DIR/resolve-error.rs:45:3
    |
-45 | #[FooWithLongNan]
+LL | #[FooWithLongNan]
    |   ^^^^^^^^^^^^^^
 
 error: cannot find derive macro `Dlone` in this scope
   --> $DIR/resolve-error.rs:49:10
    |
-49 | #[derive(Dlone)]
+LL | #[derive(Dlone)]
    |          ^^^^^ help: try: `Clone`
 
 error: cannot find derive macro `Dlona` in this scope
   --> $DIR/resolve-error.rs:53:10
    |
-53 | #[derive(Dlona)]
+LL | #[derive(Dlona)]
    |          ^^^^^ help: try: `Clona`
 
 error: cannot find derive macro `attr_proc_macra` in this scope
   --> $DIR/resolve-error.rs:57:10
    |
-57 | #[derive(attr_proc_macra)]
+LL | #[derive(attr_proc_macra)]
    |          ^^^^^^^^^^^^^^^
 
 error: cannot find macro `FooWithLongNama!` in this scope
   --> $DIR/resolve-error.rs:62:5
    |
-62 |     FooWithLongNama!();
+LL |     FooWithLongNama!();
    |     ^^^^^^^^^^^^^^^ help: you could try the macro: `FooWithLongNam`
 
 error: cannot find macro `attr_proc_macra!` in this scope
   --> $DIR/resolve-error.rs:65:5
    |
-65 |     attr_proc_macra!();
+LL |     attr_proc_macra!();
    |     ^^^^^^^^^^^^^^^ help: you could try the macro: `attr_proc_mac`
 
 error: cannot find macro `Dlona!` in this scope
   --> $DIR/resolve-error.rs:68:5
    |
-68 |     Dlona!();
+LL |     Dlona!();
    |     ^^^^^
 
 error: cannot find macro `bang_proc_macrp!` in this scope
   --> $DIR/resolve-error.rs:71:5
    |
-71 |     bang_proc_macrp!();
+LL |     bang_proc_macrp!();
    |     ^^^^^^^^^^^^^^^ help: you could try the macro: `bang_proc_macro`
 
 error: aborting due to 10 previous errors