Update UI tests

5 files changed, 43 insertions, 43 deletions

diff --git a/src/test/ui/imports/duplicate.stderr b/src/test/ui/imports/duplicate.stderr
index 707f0081cd6..d2342bece4f 100644
--- a/src/test/ui/imports/duplicate.stderr
+++ b/src/test/ui/imports/duplicate.stderr
@@ -1,9 +1,9 @@
 error[E0252]: the name `foo` is defined multiple times
   --> $DIR/duplicate.rs:25:9
    |
-24 |     use a::foo;
+LL |     use a::foo;
    |         ------ previous import of the value `foo` here
-25 |     use a::foo; //~ ERROR the name `foo` is defined multiple times
+LL |     use a::foo; //~ ERROR the name `foo` is defined multiple times
    |         ^^^^^^ `foo` reimported here
    |
    = note: `foo` must be defined only once in the value namespace of this module
@@ -15,72 +15,72 @@ help: You can use `as` to change the binding name of the import
 error[E0659]: `foo` is ambiguous
   --> $DIR/duplicate.rs:56:9
    |
-56 |     use self::foo::bar; //~ ERROR `foo` is ambiguous
+LL |     use self::foo::bar; //~ ERROR `foo` is ambiguous
    |         ^^^^^^^^^^^^^^
    |
 note: `foo` could refer to the name imported here
   --> $DIR/duplicate.rs:53:9
    |
-53 |     use self::m1::*;
+LL |     use self::m1::*;
    |         ^^^^^^^^^^^
 note: `foo` could also refer to the name imported here
   --> $DIR/duplicate.rs:54:9
    |
-54 |     use self::m2::*;
+LL |     use self::m2::*;
    |         ^^^^^^^^^^^
    = note: consider adding an explicit import of `foo` to disambiguate
 
 error[E0659]: `foo` is ambiguous
   --> $DIR/duplicate.rs:45:5
    |
-45 |     f::foo(); //~ ERROR `foo` is ambiguous
+LL |     f::foo(); //~ ERROR `foo` is ambiguous
    |     ^^^^^^
    |
 note: `foo` could refer to the name imported here
   --> $DIR/duplicate.rs:34:13
    |
-34 |     pub use a::*;
+LL |     pub use a::*;
    |             ^^^^
 note: `foo` could also refer to the name imported here
   --> $DIR/duplicate.rs:35:13
    |
-35 |     pub use b::*;
+LL |     pub use b::*;
    |             ^^^^
    = note: consider adding an explicit import of `foo` to disambiguate
 
 error[E0659]: `foo` is ambiguous
   --> $DIR/duplicate.rs:46:5
    |
-46 |     g::foo(); //~ ERROR `foo` is ambiguous
+LL |     g::foo(); //~ ERROR `foo` is ambiguous
    |     ^^^^^^
    |
 note: `foo` could refer to the name imported here
   --> $DIR/duplicate.rs:39:13
    |
-39 |     pub use a::*;
+LL |     pub use a::*;
    |             ^^^^
 note: `foo` could also refer to the name imported here
   --> $DIR/duplicate.rs:40:13
    |
-40 |     pub use f::*;
+LL |     pub use f::*;
    |             ^^^^
    = note: consider adding an explicit import of `foo` to disambiguate
 
 error[E0659]: `foo` is ambiguous
   --> $DIR/duplicate.rs:59:9
    |
-59 |         foo::bar(); //~ ERROR `foo` is ambiguous
+LL |         foo::bar(); //~ ERROR `foo` is ambiguous
    |         ^^^^^^^^
    |
 note: `foo` could refer to the name imported here
   --> $DIR/duplicate.rs:53:9
    |
-53 |     use self::m1::*;
+LL |     use self::m1::*;
    |         ^^^^^^^^^^^
 note: `foo` could also refer to the name imported here
   --> $DIR/duplicate.rs:54:9
    |
-54 |     use self::m2::*;
+LL |     use self::m2::*;
    |         ^^^^^^^^^^^
    = note: consider adding an explicit import of `foo` to disambiguate
 
diff --git a/src/test/ui/imports/macro-paths.stderr b/src/test/ui/imports/macro-paths.stderr
index 02e7e34d32e..815694919c7 100644
--- a/src/test/ui/imports/macro-paths.stderr
+++ b/src/test/ui/imports/macro-paths.stderr
@@ -1,38 +1,38 @@
 error[E0659]: `bar` is ambiguous
   --> $DIR/macro-paths.rs:25:5
    |
-25 |     bar::m! { //~ ERROR ambiguous
+LL |     bar::m! { //~ ERROR ambiguous
    |     ^^^^^^
    |
 note: `bar` could refer to the name defined here
   --> $DIR/macro-paths.rs:26:9
    |
-26 |         mod bar { pub use two_macros::m; }
+LL |         mod bar { pub use two_macros::m; }
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: `bar` could also refer to the name imported here
   --> $DIR/macro-paths.rs:24:9
    |
-24 |     use foo::*;
+LL |     use foo::*;
    |         ^^^^^^
    = note: macro-expanded items do not shadow when used in a macro invocation path
 
 error[E0659]: `baz` is ambiguous
   --> $DIR/macro-paths.rs:35:5
    |
-35 |     baz::m! { //~ ERROR ambiguous
+LL |     baz::m! { //~ ERROR ambiguous
    |     ^^^^^^
    |
 note: `baz` could refer to the name defined here
   --> $DIR/macro-paths.rs:36:9
    |
-36 |         mod baz { pub use two_macros::m; }
+LL |         mod baz { pub use two_macros::m; }
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: `baz` could also refer to the name defined here
   --> $DIR/macro-paths.rs:30:1
    |
-30 | / pub mod baz {
-31 | |     pub use two_macros::m;
-32 | | }
+LL | / pub mod baz {
+LL | |     pub use two_macros::m;
+LL | | }
    | |_^
    = note: macro-expanded items do not shadow when used in a macro invocation path
 
diff --git a/src/test/ui/imports/macros.stderr b/src/test/ui/imports/macros.stderr
index 6b917b98062..c32fb56cd5d 100644
--- a/src/test/ui/imports/macros.stderr
+++ b/src/test/ui/imports/macros.stderr
@@ -1,53 +1,53 @@
 error: `m` is ambiguous
   --> $DIR/macros.rs:50:5
    |
-50 |     m!(); //~ ERROR ambiguous
+LL |     m!(); //~ ERROR ambiguous
    |     ^
    |
 note: `m` could refer to the macro defined here
   --> $DIR/macros.rs:48:5
    |
-48 |     macro_rules! m { () => {} }
+LL |     macro_rules! m { () => {} }
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: `m` could also refer to the macro imported here
   --> $DIR/macros.rs:49:9
    |
-49 |     use two_macros::m;
+LL |     use two_macros::m;
    |         ^^^^^^^^^^^^^
 
 error[E0659]: `m` is ambiguous
   --> $DIR/macros.rs:28:5
    |
-28 |     m! { //~ ERROR ambiguous
+LL |     m! { //~ ERROR ambiguous
    |     ^
    |
 note: `m` could refer to the name imported here
   --> $DIR/macros.rs:29:13
    |
-29 |         use foo::m;
+LL |         use foo::m;
    |             ^^^^^^
 note: `m` could also refer to the name imported here
   --> $DIR/macros.rs:27:9
    |
-27 |     use two_macros::*;
+LL |     use two_macros::*;
    |         ^^^^^^^^^^^^^
    = note: macro-expanded macro imports do not shadow
 
 error[E0659]: `m` is ambiguous
   --> $DIR/macros.rs:41:9
    |
-41 |         m! { //~ ERROR ambiguous
+LL |         m! { //~ ERROR ambiguous
    |         ^
    |
 note: `m` could refer to the name imported here
   --> $DIR/macros.rs:42:17
    |
-42 |             use two_macros::n as m;
+LL |             use two_macros::n as m;
    |                 ^^^^^^^^^^^^^^^^^^
 note: `m` could also refer to the name imported here
   --> $DIR/macros.rs:34:9
    |
-34 |     use two_macros::m;
+LL |     use two_macros::m;
    |         ^^^^^^^^^^^^^
    = note: macro-expanded macro imports do not shadow
 
diff --git a/src/test/ui/imports/rfc-1560-warning-cycle.stderr b/src/test/ui/imports/rfc-1560-warning-cycle.stderr
index 1fec7311272..452fcc4c1a9 100644
--- a/src/test/ui/imports/rfc-1560-warning-cycle.stderr
+++ b/src/test/ui/imports/rfc-1560-warning-cycle.stderr
@@ -1,11 +1,11 @@
 error: `Foo` is ambiguous
   --> $DIR/rfc-1560-warning-cycle.rs:21:17
    |
-19 |         use *;
+LL |         use *;
    |             - `Foo` could refer to the name imported here
-20 |         use bar::*;
+LL |         use bar::*;
    |             ------ `Foo` could also refer to the name imported here
-21 |         fn f(_: Foo) {}
+LL |         fn f(_: Foo) {}
    |                 ^^^
    |
    = note: #[deny(legacy_imports)] on by default
diff --git a/src/test/ui/imports/shadow_builtin_macros.stderr b/src/test/ui/imports/shadow_builtin_macros.stderr
index 709a36dab29..cf23230720c 100644
--- a/src/test/ui/imports/shadow_builtin_macros.stderr
+++ b/src/test/ui/imports/shadow_builtin_macros.stderr
@@ -1,10 +1,10 @@
 error: `panic` is already in scope
   --> $DIR/shadow_builtin_macros.rs:42:9
    |
-42 |         macro_rules! panic { () => {} } //~ ERROR `panic` is already in scope
+LL |         macro_rules! panic { () => {} } //~ ERROR `panic` is already in scope
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 43 |     } }
-44 |     m!();
+LL |     m!();
    |     ----- in this macro invocation
    |
    = note: macro-expanded `macro_rules!`s may not shadow existing macros (see RFC 1560)
@@ -12,13 +12,13 @@ error: `panic` is already in scope
 error[E0659]: `panic` is ambiguous
   --> $DIR/shadow_builtin_macros.rs:27:14
    |
-27 |     fn f() { panic!(); } //~ ERROR ambiguous
+LL |     fn f() { panic!(); } //~ ERROR ambiguous
    |              ^^^^^
    |
 note: `panic` could refer to the name imported here
   --> $DIR/shadow_builtin_macros.rs:26:9
    |
-26 |     use foo::*;
+LL |     use foo::*;
    |         ^^^^^^
    = note: `panic` is also a builtin macro
    = note: consider adding an explicit import of `panic` to disambiguate
@@ -26,13 +26,13 @@ note: `panic` could refer to the name imported here
 error[E0659]: `panic` is ambiguous
   --> $DIR/shadow_builtin_macros.rs:32:14
    |
-32 |     fn f() { panic!(); } //~ ERROR ambiguous
+LL |     fn f() { panic!(); } //~ ERROR ambiguous
    |              ^^^^^
    |
 note: `panic` could refer to the name imported here
   --> $DIR/shadow_builtin_macros.rs:31:26
    |
-31 |     ::two_macros::m!(use foo::panic;);
+LL |     ::two_macros::m!(use foo::panic;);
    |                          ^^^^^^^^^^
    = note: `panic` is also a builtin macro
    = note: macro-expanded macro imports do not shadow
@@ -40,18 +40,18 @@ note: `panic` could refer to the name imported here
 error[E0659]: `n` is ambiguous
   --> $DIR/shadow_builtin_macros.rs:61:5
    |
-61 |     n!(); //~ ERROR ambiguous
+LL |     n!(); //~ ERROR ambiguous
    |     ^
    |
 note: `n` could refer to the name imported here
   --> $DIR/shadow_builtin_macros.rs:60:9
    |
-60 |     use bar::*;
+LL |     use bar::*;
    |         ^^^^^^
 note: `n` could also refer to the name imported here
   --> $DIR/shadow_builtin_macros.rs:48:13
    |
-48 | #[macro_use(n)]
+LL | #[macro_use(n)]
    |             ^
    = note: consider adding an explicit import of `n` to disambiguate