Update UI tests

src/test/ui/error-codes/E0001.stderr

@@ -1,13 +1,13 @@
 error: unreachable pattern
   --> $DIR/E0001.rs:18:9
    |
-18 |         _ => {/* ... */} //~ ERROR unreachable pattern
+LL |         _ => {/* ... */} //~ ERROR unreachable pattern
    |         ^
    |
 note: lint level defined here
   --> $DIR/E0001.rs:11:9
    |
-11 | #![deny(unreachable_patterns)]
+LL | #![deny(unreachable_patterns)]
    |         ^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error

src/test/ui/error-codes/E0004-2.stderr

@@ -1,13 +1,13 @@
 error[E0004]: non-exhaustive patterns: type std::option::Option<i32> is non-empty
   --> $DIR/E0004-2.rs:14:11
    |
-14 |     match x { } //~ ERROR E0004
+LL |     match x { } //~ ERROR E0004
    |           ^
    |
 help: Please ensure that all possible cases are being handled; possibly adding wildcards or more match arms.
   --> $DIR/E0004-2.rs:14:11
    |
-14 |     match x { } //~ ERROR E0004
+LL |     match x { } //~ ERROR E0004
    |           ^
 
 error: aborting due to previous error

src/test/ui/error-codes/E0004.stderr

@@ -1,7 +1,7 @@
 error[E0004]: non-exhaustive patterns: `HastaLaVistaBaby` not covered
   --> $DIR/E0004.rs:19:11
    |
-19 |     match x { //~ ERROR E0004
+LL |     match x { //~ ERROR E0004
    |           ^ pattern `HastaLaVistaBaby` not covered
 
 error: aborting due to previous error

src/test/ui/error-codes/E0005.stderr

@@ -1,7 +1,7 @@
 error[E0005]: refutable pattern in local binding: `None` not covered
   --> $DIR/E0005.rs:13:9
    |
-13 |     let Some(y) = x; //~ ERROR E0005
+LL |     let Some(y) = x; //~ ERROR E0005
    |         ^^^^^^^ pattern `None` not covered
 
 error: aborting due to previous error

src/test/ui/error-codes/E0007.stderr

@@ -1,13 +1,13 @@
 error[E0007]: cannot bind by-move with sub-bindings
   --> $DIR/E0007.rs:14:9
    |
-14 |         op_string @ Some(s) => {},
+LL |         op_string @ Some(s) => {},
    |         ^^^^^^^^^^^^^^^^^^^ binds an already bound by-move value by moving it
 
 error[E0303]: pattern bindings are not allowed after an `@`
   --> $DIR/E0007.rs:14:26
    |
-14 |         op_string @ Some(s) => {},
+LL |         op_string @ Some(s) => {},
    |                          ^ not allowed after `@`
 
 error: aborting due to 2 previous errors

src/test/ui/error-codes/E0008.stderr

@@ -1,7 +1,7 @@
 error[E0008]: cannot bind by-move into a pattern guard
   --> $DIR/E0008.rs:13:14
    |
-13 |         Some(s) if s.len() == 0 => {},
+LL |         Some(s) if s.len() == 0 => {},
    |              ^ moves value into pattern guard
 
 error: aborting due to previous error

src/test/ui/error-codes/E0009.stderr

@@ -1,7 +1,7 @@
 error[E0009]: cannot bind by-move and by-ref in the same pattern
   --> $DIR/E0009.rs:15:15
    |
-15 |         Some((y, ref z)) => {},
+LL |         Some((y, ref z)) => {},
    |               ^  ----- both by-ref and by-move used
    |               |
    |               by-move pattern here

src/test/ui/error-codes/E0010-teach.stderr

@@ -1,7 +1,7 @@
 error[E0010]: allocations are not allowed in constants
   --> $DIR/E0010-teach.rs:16:24
    |
-16 | const CON : Box<i32> = box 0; //~ ERROR E0010
+LL | const CON : Box<i32> = box 0; //~ ERROR E0010
    |                        ^^^^^ allocation not allowed in constants
    |
    = note: The value of statics and constants must be known at compile time, and they live for the entire lifetime of a program. Creating a boxed value allocates memory on the heap at runtime, and therefore cannot be done at compile time.

src/test/ui/error-codes/E0010.stderr

@@ -1,7 +1,7 @@
 error[E0010]: allocations are not allowed in constants
   --> $DIR/E0010.rs:14:24
    |
-14 | const CON : Box<i32> = box 0; //~ ERROR E0010
+LL | const CON : Box<i32> = box 0; //~ ERROR E0010
    |                        ^^^^^ allocation not allowed in constants
 
 error: aborting due to previous error

src/test/ui/error-codes/E0017.stderr

@@ -1,25 +1,25 @@
 error[E0017]: references in constants may only refer to immutable values
   --> $DIR/E0017.rs:14:30
    |
-14 | const CR: &'static mut i32 = &mut C; //~ ERROR E0017
+LL | const CR: &'static mut i32 = &mut C; //~ ERROR E0017
    |                              ^^^^^^ constants require immutable values
 
 error[E0017]: references in statics may only refer to immutable values
   --> $DIR/E0017.rs:15:39
    |
-15 | static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017
+LL | static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017
    |                                       ^^^^^^ statics require immutable values
 
 error[E0596]: cannot borrow immutable static item as mutable
   --> $DIR/E0017.rs:15:44
    |
-15 | static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017
+LL | static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017
    |                                            ^
 
 error[E0017]: references in statics may only refer to immutable values
   --> $DIR/E0017.rs:17:38
    |
-17 | static CONST_REF: &'static mut i32 = &mut C; //~ ERROR E0017
+LL | static CONST_REF: &'static mut i32 = &mut C; //~ ERROR E0017
    |                                      ^^^^^^ statics require immutable values
 
 error: aborting due to 4 previous errors

src/test/ui/error-codes/E0023.stderr

@@ -1,19 +1,19 @@
 error[E0023]: this pattern has 1 field, but the corresponding tuple variant has 2 fields
   --> $DIR/E0023.rs:20:9
    |
-20 |         Fruit::Apple(a) => {}, //~ ERROR E0023
+LL |         Fruit::Apple(a) => {}, //~ ERROR E0023
    |         ^^^^^^^^^^^^^^^ expected 2 fields, found 1
 
 error[E0023]: this pattern has 3 fields, but the corresponding tuple variant has 2 fields
   --> $DIR/E0023.rs:21:9
    |
-21 |         Fruit::Apple(a, b, c) => {}, //~ ERROR E0023
+LL |         Fruit::Apple(a, b, c) => {}, //~ ERROR E0023
    |         ^^^^^^^^^^^^^^^^^^^^^ expected 2 fields, found 3
 
 error[E0023]: this pattern has 2 fields, but the corresponding tuple variant has 1 field
   --> $DIR/E0023.rs:22:9
    |
-22 |         Fruit::Pear(1, 2) => {}, //~ ERROR E0023
+LL |         Fruit::Pear(1, 2) => {}, //~ ERROR E0023
    |         ^^^^^^^^^^^^^^^^^ expected 1 field, found 2
 
 error: aborting due to 3 previous errors

src/test/ui/error-codes/E0025.stderr

@@ -1,7 +1,7 @@
 error[E0025]: field `a` bound multiple times in the pattern
   --> $DIR/E0025.rs:18:21
    |
-18 |     let Foo { a: x, a: y, b: 0 } = x;
+LL |     let Foo { a: x, a: y, b: 0 } = x;
    |               ----  ^^^^ multiple uses of `a` in pattern
    |               |
    |               first use of `a`

src/test/ui/error-codes/E0026-teach.stderr

@@ -1,7 +1,7 @@
 error[E0026]: struct `Thing` does not have a field named `z`
   --> $DIR/E0026-teach.rs:21:23
    |
-21 |         Thing { x, y, z } => {}
+LL |         Thing { x, y, z } => {}
    |                       ^ struct `Thing` does not have field `z`
    |
    = note: This error indicates that a struct pattern attempted to extract a non-existent field from a struct. Struct fields are identified by the name used before the colon : so struct patterns should resemble the declaration of the struct type being matched.

src/test/ui/error-codes/E0026.stderr

@@ -1,7 +1,7 @@
 error[E0026]: struct `Thing` does not have a field named `z`
   --> $DIR/E0026.rs:19:23
    |
-19 |         Thing { x, y, z } => {}
+LL |         Thing { x, y, z } => {}
    |                       ^ struct `Thing` does not have field `z`
 
 error: aborting due to previous error

src/test/ui/error-codes/E0027-teach.stderr

@@ -1,7 +1,7 @@
 error[E0027]: pattern does not mention field `name`
   --> $DIR/E0027-teach.rs:22:9
    |
-22 |         Dog { age: x } => {}
+LL |         Dog { age: x } => {}
    |         ^^^^^^^^^^^^^^ missing field `name`
    |
    = note: This error indicates that a pattern for a struct fails to specify a sub-pattern for every one of the struct's fields. Ensure that each field from the struct's definition is mentioned in the pattern, or use `..` to ignore unwanted fields.

src/test/ui/error-codes/E0027.stderr

@@ -1,7 +1,7 @@
 error[E0027]: pattern does not mention field `name`
   --> $DIR/E0027.rs:20:9
    |
-20 |         Dog { age: x } => {}
+LL |         Dog { age: x } => {}
    |         ^^^^^^^^^^^^^^ missing field `name`
 
 error: aborting due to previous error

src/test/ui/error-codes/E0029-teach.stderr

@@ -1,7 +1,7 @@
 error[E0658]: non-reference pattern used to match a reference (see issue #42640)
   --> $DIR/E0029-teach.rs:17:9
    |
-17 |         "hello" ... "world" => {}
+LL |         "hello" ... "world" => {}
    |         ^^^^^^^^^^^^^^^^^^^ help: consider using a reference: `&"hello" ... "world"`
    |
    = help: add #![feature(match_default_bindings)] to the crate attributes to enable
@@ -9,7 +9,7 @@ error[E0658]: non-reference pattern used to match a reference (see issue #42640)
 error[E0029]: only char and numeric types are allowed in range patterns
   --> $DIR/E0029-teach.rs:17:9
    |
-17 |         "hello" ... "world" => {}
+LL |         "hello" ... "world" => {}
    |         ^^^^^^^^^^^^^^^^^^^ ranges require char or numeric types
    |
    = note: start type: &'static str

src/test/ui/error-codes/E0029.stderr

@@ -1,7 +1,7 @@
 error[E0658]: non-reference pattern used to match a reference (see issue #42640)
   --> $DIR/E0029.rs:15:9
    |
-15 |         "hello" ... "world" => {}
+LL |         "hello" ... "world" => {}
    |         ^^^^^^^^^^^^^^^^^^^ help: consider using a reference: `&"hello" ... "world"`
    |
    = help: add #![feature(match_default_bindings)] to the crate attributes to enable
@@ -9,7 +9,7 @@ error[E0658]: non-reference pattern used to match a reference (see issue #42640)
 error[E0029]: only char and numeric types are allowed in range patterns
   --> $DIR/E0029.rs:15:9
    |
-15 |         "hello" ... "world" => {}
+LL |         "hello" ... "world" => {}
    |         ^^^^^^^^^^^^^^^^^^^ ranges require char or numeric types
    |
    = note: start type: &'static str

src/test/ui/error-codes/E0030-teach.stderr

@@ -1,7 +1,7 @@
 error[E0030]: lower range bound must be less than or equal to upper
   --> $DIR/E0030-teach.rs:15:9
    |
-15 |         1000 ... 5 => {}
+LL |         1000 ... 5 => {}
    |         ^^^^ lower bound larger than upper bound
    |
    = note: When matching against a range, the compiler verifies that the range is non-empty. Range patterns include both end-points, so this is equivalent to requiring the start of the range to be less than or equal to the end of the range.

src/test/ui/error-codes/E0030.stderr

@@ -1,7 +1,7 @@
 error[E0030]: lower range bound must be less than or equal to upper
   --> $DIR/E0030.rs:14:9
    |
-14 |         1000 ... 5 => {}
+LL |         1000 ... 5 => {}
    |         ^^^^ lower bound larger than upper bound
 
 error: aborting due to previous error

src/test/ui/error-codes/E0033-teach.stderr

@@ -1,13 +1,13 @@
 error[E0423]: expected value, found trait `SomeTrait`
   --> $DIR/E0033-teach.rs:18:33
    |
-18 |     let trait_obj: &SomeTrait = SomeTrait;
+LL |     let trait_obj: &SomeTrait = SomeTrait;
    |                                 ^^^^^^^^^ not a value
 
 error[E0038]: the trait `SomeTrait` cannot be made into an object
   --> $DIR/E0033-teach.rs:18:20
    |
-18 |     let trait_obj: &SomeTrait = SomeTrait;
+LL |     let trait_obj: &SomeTrait = SomeTrait;
    |                    ^^^^^^^^^^ the trait `SomeTrait` cannot be made into an object
    |
    = note: method `foo` has no receiver
@@ -15,7 +15,7 @@ error[E0038]: the trait `SomeTrait` cannot be made into an object
 error[E0033]: type `&SomeTrait` cannot be dereferenced
   --> $DIR/E0033-teach.rs:23:9
    |
-23 |     let &invalid = trait_obj;
+LL |     let &invalid = trait_obj;
    |         ^^^^^^^^ type `&SomeTrait` cannot be dereferenced
    |
    = note: This error indicates that a pointer to a trait type cannot be implicitly dereferenced by a pattern. Every trait defines a type, but because the size of trait implementors isn't fixed, this type has no compile-time size. Therefore, all accesses to trait types must be through pointers. If you encounter this error you should try to avoid dereferencing the pointer.

src/test/ui/error-codes/E0033.stderr

@@ -1,13 +1,13 @@
 error[E0423]: expected value, found trait `SomeTrait`
   --> $DIR/E0033.rs:16:33
    |
-16 |     let trait_obj: &SomeTrait = SomeTrait;
+LL |     let trait_obj: &SomeTrait = SomeTrait;
    |                                 ^^^^^^^^^ not a value
 
 error[E0038]: the trait `SomeTrait` cannot be made into an object
   --> $DIR/E0033.rs:16:20
    |
-16 |     let trait_obj: &SomeTrait = SomeTrait;
+LL |     let trait_obj: &SomeTrait = SomeTrait;
    |                    ^^^^^^^^^^ the trait `SomeTrait` cannot be made into an object
    |
    = note: method `foo` has no receiver
@@ -15,7 +15,7 @@ error[E0038]: the trait `SomeTrait` cannot be made into an object
 error[E0033]: type `&SomeTrait` cannot be dereferenced
   --> $DIR/E0033.rs:21:9
    |
-21 |     let &invalid = trait_obj;
+LL |     let &invalid = trait_obj;
    |         ^^^^^^^^ type `&SomeTrait` cannot be dereferenced
 
 error: aborting due to 3 previous errors

src/test/ui/error-codes/E0034.stderr

@@ -1,18 +1,18 @@
 error[E0034]: multiple applicable items in scope
   --> $DIR/E0034.rs:30:5
    |
-30 |     Test::foo() //~ ERROR multiple applicable items in scope
+LL |     Test::foo() //~ ERROR multiple applicable items in scope
    |     ^^^^^^^^^ multiple `foo` found
    |
 note: candidate #1 is defined in an impl of the trait `Trait1` for the type `Test`
   --> $DIR/E0034.rs:22:5
    |
-22 |     fn foo() {}
+LL |     fn foo() {}
    |     ^^^^^^^^
 note: candidate #2 is defined in an impl of the trait `Trait2` for the type `Test`
   --> $DIR/E0034.rs:26:5
    |
-26 |     fn foo() {}
+LL |     fn foo() {}
    |     ^^^^^^^^
 
 error: aborting due to previous error

src/test/ui/error-codes/E0038.stderr

@@ -1,7 +1,7 @@
 error[E0038]: the trait `Trait` cannot be made into an object
   --> $DIR/E0038.rs:15:1
    |
-15 | fn call_foo(x: Box<Trait>) {
+LL | fn call_foo(x: Box<Trait>) {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Trait` cannot be made into an object
    |
    = note: method `foo` references the `Self` type in its arguments or return type

src/test/ui/error-codes/E0040.stderr

@@ -1,7 +1,7 @@
 error[E0040]: explicit use of destructor method
   --> $DIR/E0040.rs:23:7
    |
-23 |     x.drop();
+LL |     x.drop();
    |       ^^^^ explicit destructor calls not allowed
 
 error: aborting due to previous error

src/test/ui/error-codes/E0044.stderr

@@ -1,13 +1,13 @@
 error[E0044]: foreign items may not have type parameters
   --> $DIR/E0044.rs:11:10
    |
-11 | extern { fn some_func<T>(x: T); } //~ ERROR E0044
+LL | extern { fn some_func<T>(x: T); } //~ ERROR E0044
    |          ^^^^^^^^^^^^^^^^^^^^^^
    |
 help: consider using specialization instead of type parameters
   --> $DIR/E0044.rs:11:10
    |
-11 | extern { fn some_func<T>(x: T); } //~ ERROR E0044
+LL | extern { fn some_func<T>(x: T); } //~ ERROR E0044
    |          ^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error

src/test/ui/error-codes/E0045.stderr

@@ -1,7 +1,7 @@
 error[E0045]: variadic function must have C or cdecl calling convention
   --> $DIR/E0045.rs:11:17
    |
-11 | extern "Rust" { fn foo(x: u8, ...); }   //~ ERROR E0045
+LL | extern "Rust" { fn foo(x: u8, ...); }   //~ ERROR E0045
    |                 ^^^^^^^^^^^^^^^^^^^ variadics require C or cdecl calling convention
 
 error: aborting due to previous error

src/test/ui/error-codes/E0049.stderr

@@ -1,10 +1,10 @@
 error[E0049]: method `foo` has 0 type parameters but its trait declaration has 1 type parameter
   --> $DIR/E0049.rs:18:5
    |
-12 |     fn foo<T: Default>(x: T) -> Self;
+LL |     fn foo<T: Default>(x: T) -> Self;
    |     --------------------------------- expected 1 type parameter
 ...
-18 |     fn foo(x: bool) -> Self { Bar } //~ ERROR E0049
+LL |     fn foo(x: bool) -> Self { Bar } //~ ERROR E0049
    |     ^^^^^^^^^^^^^^^^^^^^^^^ found 0 type parameters
 
 error: aborting due to previous error

src/test/ui/error-codes/E0050.stderr

@@ -1,28 +1,28 @@
 error[E0050]: method `foo` has 1 parameter but the declaration in trait `Foo::foo` has 2
   --> $DIR/E0050.rs:20:12
    |
-12 |     fn foo(&self, x: u8) -> bool;
+LL |     fn foo(&self, x: u8) -> bool;
    |                      -- trait requires 2 parameters
 ...
-20 |     fn foo(&self) -> bool { true } //~ ERROR E0050
+LL |     fn foo(&self) -> bool { true } //~ ERROR E0050
    |            ^^^^^ expected 2 parameters, found 1
 
 error[E0050]: method `bar` has 1 parameter but the declaration in trait `Foo::bar` has 4
   --> $DIR/E0050.rs:21:12
    |
-13 |     fn bar(&self, x: u8, y: u8, z: u8);
+LL |     fn bar(&self, x: u8, y: u8, z: u8);
    |                                    -- trait requires 4 parameters
 ...
-21 |     fn bar(&self) { } //~ ERROR E0050
+LL |     fn bar(&self) { } //~ ERROR E0050
    |            ^^^^^ expected 4 parameters, found 1
 
 error[E0050]: method `less` has 4 parameters but the declaration in trait `Foo::less` has 1
   --> $DIR/E0050.rs:22:37
    |
-14 |     fn less(&self);
+LL |     fn less(&self);
    |             ----- trait requires 1 parameter
 ...
-22 |     fn less(&self, x: u8, y: u8, z: u8) { } //~ ERROR E0050
+LL |     fn less(&self, x: u8, y: u8, z: u8) { } //~ ERROR E0050
    |                                     ^^ expected 1 parameter, found 4
 
 error: aborting due to 3 previous errors

src/test/ui/error-codes/E0054.stderr

@@ -1,7 +1,7 @@
 error[E0054]: cannot cast as `bool`
   --> $DIR/E0054.rs:13:24
    |
-13 |     let x_is_nonzero = x as bool; //~ ERROR E0054
+LL |     let x_is_nonzero = x as bool; //~ ERROR E0054
    |                        ^^^^^^^^^ unsupported cast
    |
    = help: compare with zero instead

src/test/ui/error-codes/E0055.stderr

@@ -1,7 +1,7 @@
 error[E0055]: reached the recursion limit while auto-dereferencing Foo
   --> $DIR/E0055.rs:21:13
    |
-21 |     ref_foo.foo();
+LL |     ref_foo.foo();
    |             ^^^ deref recursion limit reached
    |
    = help: consider adding a `#![recursion_limit="4"]` attribute to your crate

src/test/ui/error-codes/E0057.stderr

@@ -1,13 +1,13 @@
 error[E0057]: this function takes 1 parameter but 0 parameters were supplied
   --> $DIR/E0057.rs:13:13
    |
-13 |     let a = f(); //~ ERROR E0057
+LL |     let a = f(); //~ ERROR E0057
    |             ^^^ expected 1 parameter
 
 error[E0057]: this function takes 1 parameter but 2 parameters were supplied
   --> $DIR/E0057.rs:15:13
    |
-15 |     let c = f(2, 3); //~ ERROR E0057
+LL |     let c = f(2, 3); //~ ERROR E0057
    |             ^^^^^^^ expected 1 parameter
 
 error: aborting due to 2 previous errors

src/test/ui/error-codes/E0059.stderr

@@ -1,7 +1,7 @@
 error[E0059]: cannot use call notation; the first type parameter for the function trait is neither a tuple nor unit
   --> $DIR/E0059.rs:13:41
    |
-13 | fn foo<F: Fn<i32>>(f: F) -> F::Output { f(3) } //~ ERROR E0059
+LL | fn foo<F: Fn<i32>>(f: F) -> F::Output { f(3) } //~ ERROR E0059
    |                                         ^^^^
 
 error: aborting due to previous error

src/test/ui/error-codes/E0060.stderr

@@ -1,10 +1,10 @@
 error[E0060]: this function takes at least 1 parameter but 0 parameters were supplied
   --> $DIR/E0060.rs:16:14
    |
-12 |     fn printf(_: *const u8, ...) -> u32;
+LL |     fn printf(_: *const u8, ...) -> u32;
    |     ------------------------------------ defined here
 ...
-16 |     unsafe { printf(); }
+LL |     unsafe { printf(); }
    |              ^^^^^^^^ expected at least 1 parameter
 
 error: aborting due to previous error

src/test/ui/error-codes/E0061.stderr

@@ -1,19 +1,19 @@
 error[E0061]: this function takes 2 parameters but 1 parameter was supplied
   --> $DIR/E0061.rs:16:5
    |
-11 | fn f(a: u16, b: &str) {}
+LL | fn f(a: u16, b: &str) {}
    | --------------------- defined here
 ...
-16 |     f(0);
+LL |     f(0);
    |     ^^^^ expected 2 parameters
 
 error[E0061]: this function takes 1 parameter but 0 parameters were supplied
   --> $DIR/E0061.rs:20:5
    |
-13 | fn f2(a: u16) {}
+LL | fn f2(a: u16) {}
    | ------------- defined here
 ...
-20 |     f2();
+LL |     f2();
    |     ^^^^ expected 1 parameter
 
 error: aborting due to 2 previous errors

src/test/ui/error-codes/E0062.stderr

@@ -1,7 +1,7 @@
 error[E0062]: field `x` specified more than once
   --> $DIR/E0062.rs:18:9
    |
-17 |         x: 0,
+LL |         x: 0,
    |         ---- first use of `x`
 18 |         x: 0,
    |         ^ used more than once

src/test/ui/error-codes/E0063.stderr

@@ -1,25 +1,25 @@
 error[E0063]: missing field `x` in initializer of `SingleFoo`
   --> $DIR/E0063.rs:42:13
    |
-42 |     let w = SingleFoo { };
+LL |     let w = SingleFoo { };
    |             ^^^^^^^^^ missing `x`
 
 error[E0063]: missing fields `y`, `z` in initializer of `PluralFoo`
   --> $DIR/E0063.rs:44:13
    |
-44 |     let x = PluralFoo {x: 1};
+LL |     let x = PluralFoo {x: 1};
    |             ^^^^^^^^^ missing `y`, `z`
 
 error[E0063]: missing fields `a`, `b`, `y` and 1 other field in initializer of `TruncatedFoo`
   --> $DIR/E0063.rs:46:13
    |
-46 |     let y = TruncatedFoo{x:1};
+LL |     let y = TruncatedFoo{x:1};
    |             ^^^^^^^^^^^^ missing `a`, `b`, `y` and 1 other field
 
 error[E0063]: missing fields `a`, `b`, `c` and 2 other fields in initializer of `TruncatedPluralFoo`
   --> $DIR/E0063.rs:48:13
    |
-48 |     let z = TruncatedPluralFoo{x:1};
+LL |     let z = TruncatedPluralFoo{x:1};
    |             ^^^^^^^^^^^^^^^^^^ missing `a`, `b`, `c` and 2 other fields
 
 error: aborting due to 4 previous errors

src/test/ui/error-codes/E0067.stderr

@@ -1,7 +1,7 @@
 error[E0368]: binary assignment operation `+=` cannot be applied to type `std::collections::LinkedList<_>`
   --> $DIR/E0067.rs:14:5
    |
-14 |     LinkedList::new() += 1; //~ ERROR E0368
+LL |     LinkedList::new() += 1; //~ ERROR E0368
    |     -----------------^^^^^
    |     |
    |     cannot use `+=` on type `std::collections::LinkedList<_>`
@@ -9,7 +9,7 @@ error[E0368]: binary assignment operation `+=` cannot be applied to type `std::c
 error[E0067]: invalid left-hand side expression
   --> $DIR/E0067.rs:14:5
    |
-14 |     LinkedList::new() += 1; //~ ERROR E0368
+LL |     LinkedList::new() += 1; //~ ERROR E0368
    |     ^^^^^^^^^^^^^^^^^ invalid expression for left-hand side
 
 error: aborting due to 2 previous errors

src/test/ui/error-codes/E0069.stderr

@@ -1,7 +1,7 @@
 error[E0069]: `return;` in a function whose return type is not `()`
   --> $DIR/E0069.rs:12:5
    |
-12 |     return;
+LL |     return;
    |     ^^^^^^ return type is not ()
 
 error: aborting due to previous error

src/test/ui/error-codes/E0070.stderr

@@ -1,19 +1,19 @@
 error[E0070]: invalid left-hand side expression
   --> $DIR/E0070.rs:16:5
    |
-16 |     SOME_CONST = 14; //~ ERROR E0070
+LL |     SOME_CONST = 14; //~ ERROR E0070
    |     ^^^^^^^^^^^^^^^ left-hand of expression not valid
 
 error[E0070]: invalid left-hand side expression
   --> $DIR/E0070.rs:17:5
    |
-17 |     1 = 3; //~ ERROR E0070
+LL |     1 = 3; //~ ERROR E0070
    |     ^^^^^ left-hand of expression not valid
 
 error[E0308]: mismatched types
   --> $DIR/E0070.rs:18:25
    |
-18 |     some_other_func() = 4; //~ ERROR E0070
+LL |     some_other_func() = 4; //~ ERROR E0070
    |                         ^ expected (), found integral variable
    |
    = note: expected type `()`
@@ -22,7 +22,7 @@ error[E0308]: mismatched types
 error[E0070]: invalid left-hand side expression
   --> $DIR/E0070.rs:18:5
    |
-18 |     some_other_func() = 4; //~ ERROR E0070
+LL |     some_other_func() = 4; //~ ERROR E0070
    |     ^^^^^^^^^^^^^^^^^^^^^ left-hand of expression not valid
 
 error: aborting due to 4 previous errors

src/test/ui/error-codes/E0071.stderr

@@ -1,7 +1,7 @@
 error[E0071]: expected struct, variant or union type, found enum `Foo`
   --> $DIR/E0071.rs:15:13
    |
-15 |     let u = FooAlias { value: 0 };
+LL |     let u = FooAlias { value: 0 };
    |             ^^^^^^^^ not a struct
 
 error: aborting due to previous error

src/test/ui/error-codes/E0075.stderr

@@ -1,7 +1,7 @@
 error[E0075]: SIMD vector cannot be empty
   --> $DIR/E0075.rs:14:1
    |
-14 | struct Bad; //~ ERROR E0075
+LL | struct Bad; //~ ERROR E0075
    | ^^^^^^^^^^^
 
 error: aborting due to previous error

src/test/ui/error-codes/E0076.stderr

@@ -1,7 +1,7 @@
 error[E0076]: SIMD vector should be homogeneous
   --> $DIR/E0076.rs:14:1
    |
-14 | struct Bad(u16, u32, u32);
+LL | struct Bad(u16, u32, u32);
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^ SIMD elements must have the same type
 
 error: aborting due to previous error

src/test/ui/error-codes/E0077.stderr

@@ -1,7 +1,7 @@
 error[E0077]: SIMD vector element type should be machine type
   --> $DIR/E0077.rs:14:1
    |
-14 | struct Bad(String); //~ ERROR E0077
+LL | struct Bad(String); //~ ERROR E0077
    | ^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error

src/test/ui/error-codes/E0080.stderr

@@ -1,7 +1,7 @@
 warning: constant evaluation error: attempt to shift left with overflow
   --> $DIR/E0080.rs:12:9
    |
-12 |     X = (1 << 500), //~ ERROR E0080
+LL |     X = (1 << 500), //~ ERROR E0080
    |         ^^^^^^^^^^
    |
    = note: #[warn(const_err)] on by default
@@ -9,19 +9,19 @@ warning: constant evaluation error: attempt to shift left with overflow
 error[E0080]: constant evaluation error
   --> $DIR/E0080.rs:12:9
    |
-12 |     X = (1 << 500), //~ ERROR E0080
+LL |     X = (1 << 500), //~ ERROR E0080
    |         ^^^^^^^^^^ attempt to shift left with overflow
 
 warning: constant evaluation error: attempt to divide by zero
   --> $DIR/E0080.rs:14:9
    |
-14 |     Y = (1 / 0) //~ ERROR E0080
+LL |     Y = (1 / 0) //~ ERROR E0080
    |         ^^^^^^^
 
 error[E0080]: constant evaluation error
   --> $DIR/E0080.rs:14:9
    |
-14 |     Y = (1 / 0) //~ ERROR E0080
+LL |     Y = (1 / 0) //~ ERROR E0080
    |         ^^^^^^^ attempt to divide by zero
 
 error: aborting due to 2 previous errors

src/test/ui/error-codes/E0081.stderr

@@ -1,9 +1,9 @@
 error[E0081]: discriminant value `3isize` already exists
   --> $DIR/E0081.rs:13:9
    |
-12 |     P = 3,
+LL |     P = 3,
    |         - first use of `3isize`
-13 |     X = 3,
+LL |     X = 3,
    |         ^ enum already has `3isize`
 
 error: aborting due to previous error

src/test/ui/error-codes/E0084.stderr

@@ -1,9 +1,9 @@
 error[E0084]: unsupported representation for zero-variant enum
   --> $DIR/E0084.rs:11:1
    |
-11 | #[repr(i32)] //~ ERROR: E0084
+LL | #[repr(i32)] //~ ERROR: E0084
    | ^^^^^^^^^^^^
-12 | enum Foo {}
+LL | enum Foo {}
    | ----------- zero-variant enum
 
 error: aborting due to previous error

src/test/ui/error-codes/E0087.stderr

@@ -1,13 +1,13 @@
 error[E0087]: too many type parameters provided: expected at most 0 type parameters, found 1 type parameter
   --> $DIR/E0087.rs:15:11
    |
-15 |     foo::<f64>(); //~ ERROR expected at most 0 type parameters, found 1 type parameter [E0087]
+LL |     foo::<f64>(); //~ ERROR expected at most 0 type parameters, found 1 type parameter [E0087]
    |           ^^^ expected 0 type parameters
 
 error[E0087]: too many type parameters provided: expected at most 1 type parameter, found 2 type parameters
   --> $DIR/E0087.rs:17:16
    |
-17 |     bar::<f64, u64>(); //~ ERROR expected at most 1 type parameter, found 2 type parameters [E0087]
+LL |     bar::<f64, u64>(); //~ ERROR expected at most 1 type parameter, found 2 type parameters [E0087]
    |                ^^^ expected 1 type parameter
 
 error: aborting due to 2 previous errors

src/test/ui/error-codes/E0088.stderr

@@ -1,13 +1,13 @@
 error[E0088]: too many lifetime parameters provided: expected at most 0 lifetime parameters, found 1 lifetime parameter
   --> $DIR/E0088.rs:15:9
    |
-15 |     f::<'static>(); //~ ERROR E0088
+LL |     f::<'static>(); //~ ERROR E0088
    |         ^^^^^^^ expected 0 lifetime parameters
 
 error[E0088]: too many lifetime parameters provided: expected at most 1 lifetime parameter, found 2 lifetime parameters
   --> $DIR/E0088.rs:16:18
    |
-16 |     g::<'static, 'static>(); //~ ERROR E0088
+LL |     g::<'static, 'static>(); //~ ERROR E0088
    |                  ^^^^^^^ expected 1 lifetime parameter
 
 error: aborting due to 2 previous errors

src/test/ui/error-codes/E0089.stderr

@@ -1,7 +1,7 @@
 error[E0089]: too few type parameters provided: expected 2 type parameters, found 1 type parameter
   --> $DIR/E0089.rs:14:5
    |
-14 |     foo::<f64>(); //~ ERROR expected 2 type parameters, found 1 type parameter [E0089]
+LL |     foo::<f64>(); //~ ERROR expected 2 type parameters, found 1 type parameter [E0089]
    |     ^^^^^^^^^^ expected 2 type parameters
 
 error: aborting due to previous error

src/test/ui/error-codes/E0090.stderr

@@ -1,7 +1,7 @@
 error[E0090]: too few lifetime parameters provided: expected 2 lifetime parameters, found 1 lifetime parameter
   --> $DIR/E0090.rs:14:5
    |
-14 |     foo::<'static>(); //~ ERROR expected 2 lifetime parameters, found 1 lifetime parameter [E0090]
+LL |     foo::<'static>(); //~ ERROR expected 2 lifetime parameters, found 1 lifetime parameter [E0090]
    |     ^^^^^^^^^^^^^^ expected 2 lifetime parameters
 
 error: aborting due to previous error

src/test/ui/error-codes/E0091.stderr

@@ -1,13 +1,13 @@
 error[E0091]: type parameter `T` is unused
   --> $DIR/E0091.rs:11:10
    |
-11 | type Foo<T> = u32; //~ ERROR E0091
+LL | type Foo<T> = u32; //~ ERROR E0091
    |          ^ unused type parameter
 
 error[E0091]: type parameter `B` is unused
   --> $DIR/E0091.rs:12:14
    |
-12 | type Foo2<A, B> = Box<A>; //~ ERROR E0091
+LL | type Foo2<A, B> = Box<A>; //~ ERROR E0091
    |              ^ unused type parameter
 
 error: aborting due to 2 previous errors

src/test/ui/error-codes/E0092.stderr

@@ -1,7 +1,7 @@
 error[E0092]: unrecognized atomic operation function: `foo`
   --> $DIR/E0092.rs:13:5
    |
-13 |     fn atomic_foo(); //~ ERROR E0092
+LL |     fn atomic_foo(); //~ ERROR E0092
    |     ^^^^^^^^^^^^^^^^ unrecognized atomic operation
 
 error: aborting due to previous error

src/test/ui/error-codes/E0093.stderr

@@ -1,7 +1,7 @@
 error[E0093]: unrecognized intrinsic function: `foo`
   --> $DIR/E0093.rs:13:5
    |
-13 |     fn foo();
+LL |     fn foo();
    |     ^^^^^^^^^ unrecognized intrinsic
 
 error: aborting due to previous error

src/test/ui/error-codes/E0094.stderr

@@ -1,7 +1,7 @@
 error[E0094]: intrinsic has wrong number of type parameters: found 2, expected 1
   --> $DIR/E0094.rs:13:15
    |
-13 |     fn size_of<T, U>() -> usize; //~ ERROR E0094
+LL |     fn size_of<T, U>() -> usize; //~ ERROR E0094
    |               ^^^^^^ expected 1 type parameter
 
 error: aborting due to previous error

src/test/ui/error-codes/E0106.stderr

@@ -1,31 +1,31 @@
 error[E0106]: missing lifetime specifier
   --> $DIR/E0106.rs:12:8
    |
-12 |     x: &bool,
+LL |     x: &bool,
    |        ^ expected lifetime parameter
 
 error[E0106]: missing lifetime specifier
   --> $DIR/E0106.rs:17:7
    |
-17 |     B(&bool),
+LL |     B(&bool),
    |       ^ expected lifetime parameter
 
 error[E0106]: missing lifetime specifier
   --> $DIR/E0106.rs:20:14
    |
-20 | type MyStr = &str;
+LL | type MyStr = &str;
    |              ^ expected lifetime parameter
 
 error[E0106]: missing lifetime specifier
   --> $DIR/E0106.rs:27:10
    |
-27 |     baz: Baz,
+LL |     baz: Baz,
    |          ^^^ expected lifetime parameter
 
 error[E0106]: missing lifetime specifiers
   --> $DIR/E0106.rs:30:11
    |
-30 |     buzz: Buzz,
+LL |     buzz: Buzz,
    |           ^^^^ expected 2 lifetime parameters
 
 error: aborting due to 5 previous errors

src/test/ui/error-codes/E0107.stderr

@@ -1,19 +1,19 @@
 error[E0107]: wrong number of lifetime parameters: expected 2, found 1
   --> $DIR/E0107.rs:21:11
    |
-21 |     buzz: Buzz<'a>,
+LL |     buzz: Buzz<'a>,
    |           ^^^^^^^^ expected 2 lifetime parameters
 
 error[E0107]: wrong number of lifetime parameters: expected 0, found 1
   --> $DIR/E0107.rs:24:10
    |
-24 |     bar: Bar<'a>,
+LL |     bar: Bar<'a>,
    |          ^^^^^^^ unexpected lifetime parameter
 
 error[E0107]: wrong number of lifetime parameters: expected 1, found 3
   --> $DIR/E0107.rs:27:11
    |
-27 |     foo2: Foo<'a, 'b, 'c>,
+LL |     foo2: Foo<'a, 'b, 'c>,
    |           ^^^^^^^^^^^^^^^ 2 unexpected lifetime parameters
 
 error: aborting due to 3 previous errors

src/test/ui/error-codes/E0109.stderr

@@ -1,7 +1,7 @@
 error[E0109]: type parameters are not allowed on this type
   --> $DIR/E0109.rs:11:14
    |
-11 | type X = u32<i32>; //~ ERROR E0109
+LL | type X = u32<i32>; //~ ERROR E0109
    |              ^^^ type parameter not allowed
 
 error: aborting due to previous error

src/test/ui/error-codes/E0110.stderr

@@ -1,7 +1,7 @@
 error[E0110]: lifetime parameters are not allowed on this type
   --> $DIR/E0110.rs:11:14
    |
-11 | type X = u32<'static>; //~ ERROR E0110
+LL | type X = u32<'static>; //~ ERROR E0110
    |              ^^^^^^^ lifetime parameter not allowed on this type
 
 error: aborting due to previous error

src/test/ui/error-codes/E0116.stderr

@@ -1,7 +1,7 @@
 error[E0116]: cannot define inherent `impl` for a type outside of the crate where the type is defined
   --> $DIR/E0116.rs:11:1
    |
-11 | impl Vec<u8> {}
+LL | impl Vec<u8> {}
    | ^^^^^^^^^^^^^^^ impl for type defined outside of crate.
    |
    = note: define and implement a trait or new type instead

src/test/ui/error-codes/E0117.stderr

@@ -1,13 +1,13 @@
 error[E0120]: the Drop trait may only be implemented on structures
   --> $DIR/E0117.rs:11:15
    |
-11 | impl Drop for u32 {} //~ ERROR E0117
+LL | impl Drop for u32 {} //~ ERROR E0117
    |               ^^^ implementing Drop requires a struct
 
 error[E0117]: only traits defined in the current crate can be implemented for arbitrary types
   --> $DIR/E0117.rs:11:1
    |
-11 | impl Drop for u32 {} //~ ERROR E0117
+LL | impl Drop for u32 {} //~ ERROR E0117
    | ^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate
    |
    = note: the impl does not reference any types defined in this crate

src/test/ui/error-codes/E0118.stderr

@@ -1,7 +1,7 @@
 error[E0118]: no base type found for inherent implementation
   --> $DIR/E0118.rs:11:6
    |
-11 | impl (u8, u8) { //~ ERROR E0118
+LL | impl (u8, u8) { //~ ERROR E0118
    |      ^^^^^^^^ impl requires a base type
    |
    = note: either implement a trait on it or create a newtype to wrap it instead

src/test/ui/error-codes/E0119.stderr

@@ -1,10 +1,10 @@
 error[E0119]: conflicting implementations of trait `MyTrait` for type `Foo`:
   --> $DIR/E0119.rs:23:1
    |
-15 | impl<T> MyTrait for T {
+LL | impl<T> MyTrait for T {
    | --------------------- first implementation here
 ...
-23 | impl MyTrait for Foo { //~ ERROR E0119
+LL | impl MyTrait for Foo { //~ ERROR E0119
    | ^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Foo`
 
 error: aborting due to previous error

src/test/ui/error-codes/E0120.stderr

@@ -1,7 +1,7 @@
 error[E0120]: the Drop trait may only be implemented on structures
   --> $DIR/E0120.rs:13:15
    |
-13 | impl Drop for MyTrait {
+LL | impl Drop for MyTrait {
    |               ^^^^^^^ implementing Drop requires a struct
 
 error: aborting due to previous error

src/test/ui/error-codes/E0121.stderr

@@ -1,13 +1,13 @@
 error[E0121]: the type placeholder `_` is not allowed within types on item signatures
   --> $DIR/E0121.rs:11:13
    |
-11 | fn foo() -> _ { 5 } //~ ERROR E0121
+LL | fn foo() -> _ { 5 } //~ ERROR E0121
    |             ^ not allowed in type signatures
 
 error[E0121]: the type placeholder `_` is not allowed within types on item signatures
   --> $DIR/E0121.rs:13:13
    |
-13 | static BAR: _ = "test"; //~ ERROR E0121
+LL | static BAR: _ = "test"; //~ ERROR E0121
    |             ^ not allowed in type signatures
 
 error: aborting due to 2 previous errors

src/test/ui/error-codes/E0124.stderr

@@ -1,9 +1,9 @@
 error[E0124]: field `field1` is already declared
   --> $DIR/E0124.rs:13:5
    |
-12 |     field1: i32,
+LL |     field1: i32,
    |     ----------- `field1` first declared here
-13 |     field1: i32,
+LL |     field1: i32,
    |     ^^^^^^^^^^^ field already declared
 
 error: aborting due to previous error

src/test/ui/error-codes/E0128.stderr

@@ -1,7 +1,7 @@
 error[E0128]: type parameters with a default cannot use forward declared identifiers
   --> $DIR/E0128.rs:11:14
    |
-11 | struct Foo<T=U, U=()> { //~ ERROR E0128
+LL | struct Foo<T=U, U=()> { //~ ERROR E0128
    |              ^ defaulted type parameters cannot be forward declared
 
 error: aborting due to previous error

src/test/ui/error-codes/E0130.stderr

@@ -1,7 +1,7 @@
 error[E0130]: patterns aren't allowed in foreign function declarations
   --> $DIR/E0130.rs:12:12
    |
-12 |     fn foo((a, b): (u32, u32));
+LL |     fn foo((a, b): (u32, u32));
    |            ^^^^^^ pattern not allowed in foreign function
 
 error: aborting due to previous error

src/test/ui/error-codes/E0131.stderr

@@ -1,7 +1,7 @@
 error[E0131]: main function is not allowed to have type parameters
   --> $DIR/E0131.rs:11:8
    |
-11 | fn main<T>() {
+LL | fn main<T>() {
    |        ^^^ main cannot have type parameters
 
 error: aborting due to previous error

src/test/ui/error-codes/E0132.stderr

@@ -1,7 +1,7 @@
 error[E0132]: start function is not allowed to have type parameters
   --> $DIR/E0132.rs:14:5
    |
-14 | fn f< T >() {} //~ ERROR E0132
+LL | fn f< T >() {} //~ ERROR E0132
    |     ^^^^^ start function cannot have type parameters
 
 error: aborting due to previous error

src/test/ui/error-codes/E0133.stderr

@@ -1,7 +1,7 @@
 error[E0133]: call to unsafe function requires unsafe function or block
   --> $DIR/E0133.rs:14:5
    |
-14 |     f();
+LL |     f();
    |     ^^^ call to unsafe function
 
 error: aborting due to previous error

src/test/ui/error-codes/E0137.stderr

@@ -1,10 +1,10 @@
 error[E0137]: multiple functions with a #[main] attribute
   --> $DIR/E0137.rs:17:1
    |
-14 | fn foo() {}
+LL | fn foo() {}
    | ----------- first #[main] function
 ...
-17 | fn f() {}
+LL | fn f() {}
    | ^^^^^^^^^ additional #[main] function
 
 error: aborting due to previous error

src/test/ui/error-codes/E0138.stderr

@@ -1,10 +1,10 @@
 error[E0138]: multiple 'start' functions
   --> $DIR/E0138.rs:17:1
    |
-14 | fn foo(argc: isize, argv: *const *const u8) -> isize { 0 }
+LL | fn foo(argc: isize, argv: *const *const u8) -> isize { 0 }
    | ---------------------------------------------------------- previous `start` function here
 ...
-17 | fn f(argc: isize, argv: *const *const u8) -> isize { 0 }
+LL | fn f(argc: isize, argv: *const *const u8) -> isize { 0 }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ multiple `start` functions
 
 error: aborting due to previous error

src/test/ui/error-codes/E0152.stderr

@@ -1,7 +1,7 @@
 error[E0152]: duplicate lang item found: `panic_fmt`.
   --> $DIR/E0152.rs:14:1
    |
-14 | struct Foo; //~ ERROR E0152
+LL | struct Foo; //~ ERROR E0152
    | ^^^^^^^^^^^
    |
    = note: first defined in crate `std`.

src/test/ui/error-codes/E0161.stderr

@@ -1,13 +1,13 @@
 error[E0161]: cannot move a value of type str: the size of str cannot be statically determined
   --> $DIR/E0161.rs:14:28
    |
-14 |     let _x: Box<str> = box *"hello"; //~ ERROR E0161
+LL |     let _x: Box<str> = box *"hello"; //~ ERROR E0161
    |                            ^^^^^^^^
 
 error[E0507]: cannot move out of borrowed content
   --> $DIR/E0161.rs:14:28
    |
-14 |     let _x: Box<str> = box *"hello"; //~ ERROR E0161
+LL |     let _x: Box<str> = box *"hello"; //~ ERROR E0161
    |                            ^^^^^^^^ cannot move out of borrowed content
 
 error: aborting due to 2 previous errors

src/test/ui/error-codes/E0162.stderr

@@ -1,7 +1,7 @@
 error[E0162]: irrefutable if-let pattern
   --> $DIR/E0162.rs:15:12
    |
-15 |     if let Irrefutable(x) = irr { //~ ERROR E0162
+LL |     if let Irrefutable(x) = irr { //~ ERROR E0162
    |            ^^^^^^^^^^^^^^ irrefutable pattern
 
 error: aborting due to previous error

src/test/ui/error-codes/E0164.stderr

@@ -1,7 +1,7 @@
 error[E0164]: expected tuple struct/variant, found associated constant `<Foo>::B`
   --> $DIR/E0164.rs:20:9
    |
-20 |         Foo::B(i) => i, //~ ERROR E0164
+LL |         Foo::B(i) => i, //~ ERROR E0164
    |         ^^^^^^^^^ not a tuple variant or struct
 
 error: aborting due to previous error

src/test/ui/error-codes/E0165.stderr

@@ -1,7 +1,7 @@
 error[E0165]: irrefutable while-let pattern
   --> $DIR/E0165.rs:15:15
    |
-15 |     while let Irrefutable(x) = irr { //~ ERROR E0165
+LL |     while let Irrefutable(x) = irr { //~ ERROR E0165
    |               ^^^^^^^^^^^^^^ irrefutable pattern
 
 error: aborting due to previous error

src/test/ui/error-codes/E0184.stderr

@@ -1,7 +1,7 @@
 error[E0184]: the trait `Copy` may not be implemented for this type; the type has a destructor
   --> $DIR/E0184.rs:11:10
    |
-11 | #[derive(Copy)] //~ ERROR E0184
+LL | #[derive(Copy)] //~ ERROR E0184
    |          ^^^^ Copy not allowed on types with destructors
 
 error: aborting due to previous error

src/test/ui/error-codes/E0185.stderr

@@ -1,10 +1,10 @@
 error[E0185]: method `foo` has a `&self` declaration in the impl, but not in the trait
   --> $DIR/E0185.rs:19:5
    |
-12 |     fn foo();
+LL |     fn foo();
    |     --------- trait method declared without `&self`
 ...
-19 |     fn foo(&self) {}
+LL |     fn foo(&self) {}
    |     ^^^^^^^^^^^^^ `&self` used in impl
 
 error: aborting due to previous error

src/test/ui/error-codes/E0186.stderr

@@ -1,10 +1,10 @@
 error[E0186]: method `foo` has a `&self` declaration in the trait, but not in the impl
   --> $DIR/E0186.rs:18:5
    |
-12 |     fn foo(&self); //~ `&self` used in trait
+LL |     fn foo(&self); //~ `&self` used in trait
    |     -------------- `&self` used in trait
 ...
-18 |     fn foo() {} //~ ERROR E0186
+LL |     fn foo() {} //~ ERROR E0186
    |     ^^^^^^^^ expected `&self` in impl
 
 error: aborting due to previous error

src/test/ui/error-codes/E0191.stderr

@@ -1,7 +1,7 @@
 error[E0191]: the value of the associated type `Bar` (from the trait `Trait`) must be specified
   --> $DIR/E0191.rs:15:12
    |
-15 | type Foo = Trait; //~ ERROR E0191
+LL | type Foo = Trait; //~ ERROR E0191
    |            ^^^^^ missing associated type `Bar` value
 
 error: aborting due to previous error

src/test/ui/error-codes/E0192.stderr

@@ -1,7 +1,7 @@
 error[E0192]: negative impls are only allowed for auto traits (e.g., `Send` and `Sync`)
   --> $DIR/E0192.rs:19:1
    |
-19 | impl !Trait for Foo { } //~ ERROR E0192
+LL | impl !Trait for Foo { } //~ ERROR E0192
    | ^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error

src/test/ui/error-codes/E0194.stderr

@@ -1,10 +1,10 @@
 error[E0194]: type parameter `T` shadows another type parameter of the same name
   --> $DIR/E0194.rs:13:26
    |
-11 | trait Foo<T> {
+LL | trait Foo<T> {
    |           - first `T` declared here
 12 |     fn do_something(&self) -> T;
-13 |     fn do_something_else<T: Clone>(&self, bar: T);
+LL |     fn do_something_else<T: Clone>(&self, bar: T);
    |                          ^ shadows another type parameter
 
 error: aborting due to previous error

src/test/ui/error-codes/E0195.stderr

@@ -1,10 +1,10 @@
 error[E0195]: lifetime parameters or bounds on method `bar` do not match the trait declaration
   --> $DIR/E0195.rs:19:5
    |
-12 |     fn bar<'a,'b:'a>(x: &'a str, y: &'b str);
+LL |     fn bar<'a,'b:'a>(x: &'a str, y: &'b str);
    |     ----------------------------------------- lifetimes in impl do not match this method in trait
 ...
-19 |     fn bar<'a,'b>(x: &'a str, y: &'b str) { //~ ERROR E0195
+LL |     fn bar<'a,'b>(x: &'a str, y: &'b str) { //~ ERROR E0195
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lifetimes do not match method in trait
 
 error: aborting due to previous error

src/test/ui/error-codes/E0197.stderr

@@ -1,7 +1,7 @@
 error[E0197]: inherent impls cannot be unsafe
   --> $DIR/E0197.rs:13:1
    |
-13 | unsafe impl Foo { } //~ ERROR E0197
+LL | unsafe impl Foo { } //~ ERROR E0197
    | ^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error

src/test/ui/error-codes/E0198.stderr

@@ -1,7 +1,7 @@
 error[E0198]: negative impls cannot be unsafe
   --> $DIR/E0198.rs:15:1
    |
-15 | unsafe impl !Send for Foo { } //~ ERROR E0198
+LL | unsafe impl !Send for Foo { } //~ ERROR E0198
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error

src/test/ui/error-codes/E0199.stderr

@@ -1,7 +1,7 @@
 error[E0199]: implementing the trait `Bar` is not unsafe
   --> $DIR/E0199.rs:16:1
    |
-16 | unsafe impl Bar for Foo { } //~ ERROR implementing the trait `Bar` is not unsafe [E0199]
+LL | unsafe impl Bar for Foo { } //~ ERROR implementing the trait `Bar` is not unsafe [E0199]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error

src/test/ui/error-codes/E0200.stderr

@@ -1,7 +1,7 @@
 error[E0200]: the trait `Bar` requires an `unsafe impl` declaration
   --> $DIR/E0200.rs:15:1
    |
-15 | impl Bar for Foo { } //~ ERROR E0200
+LL | impl Bar for Foo { } //~ ERROR E0200
    | ^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error

src/test/ui/error-codes/E0201.stderr

@@ -1,26 +1,26 @@
 error[E0201]: duplicate definitions with name `bar`:
   --> $DIR/E0201.rs:15:5
    |
-14 |     fn bar(&self) -> bool { self.0 > 5 }
+LL |     fn bar(&self) -> bool { self.0 > 5 }
    |     ------------------------------------ previous definition of `bar` here
-15 |     fn bar() {} //~ ERROR E0201
+LL |     fn bar() {} //~ ERROR E0201
    |     ^^^^^^^^^^^ duplicate definition
 
 error[E0201]: duplicate definitions with name `baz`:
   --> $DIR/E0201.rs:27:5
    |
-26 |     fn baz(&self) -> bool { true }
+LL |     fn baz(&self) -> bool { true }
    |     ------------------------------ previous definition of `baz` here
-27 |     fn baz(&self) -> bool { self.0 > 5 } //~ ERROR E0201
+LL |     fn baz(&self) -> bool { self.0 > 5 } //~ ERROR E0201
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ duplicate definition
 
 error[E0201]: duplicate definitions with name `Quux`:
   --> $DIR/E0201.rs:28:5
    |
-24 |     type Quux = u32;
+LL |     type Quux = u32;
    |     ---------------- previous definition of `Quux` here
 ...
-28 |     type Quux = u32; //~ ERROR E0201
+LL |     type Quux = u32; //~ ERROR E0201
    |     ^^^^^^^^^^^^^^^^ duplicate definition
 
 error: aborting due to 3 previous errors

src/test/ui/error-codes/E0206.stderr

@@ -1,19 +1,19 @@
 error[E0206]: the trait `Copy` may not be implemented for this type
   --> $DIR/E0206.rs:13:15
    |
-13 | impl Copy for Foo { }
+LL | impl Copy for Foo { }
    |               ^^^ type is not a structure or enumeration
 
 error[E0206]: the trait `Copy` may not be implemented for this type
   --> $DIR/E0206.rs:20:15
    |
-20 | impl Copy for &'static Bar { }
+LL | impl Copy for &'static Bar { }
    |               ^^^^^^^^^^^^ type is not a structure or enumeration
 
 error[E0117]: only traits defined in the current crate can be implemented for arbitrary types
   --> $DIR/E0206.rs:13:1
    |
-13 | impl Copy for Foo { }
+LL | impl Copy for Foo { }
    | ^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate
    |
    = note: the impl does not reference any types defined in this crate

src/test/ui/error-codes/E0207.stderr

@@ -1,7 +1,7 @@
 error[E0207]: the type parameter `T` is not constrained by the impl trait, self type, or predicates
   --> $DIR/E0207.rs:13:6
    |
-13 | impl<T: Default> Foo { //~ ERROR E0207
+LL | impl<T: Default> Foo { //~ ERROR E0207
    |      ^ unconstrained type parameter
 
 error: aborting due to previous error

src/test/ui/error-codes/E0214.stderr

@@ -1,7 +1,7 @@
 error[E0214]: parenthesized parameters may only be used with a trait
   --> $DIR/E0214.rs:12:15
    |
-12 |     let v: Vec(&str) = vec!["foo"];
+LL |     let v: Vec(&str) = vec!["foo"];
    |               ^^^^^^ only traits may use parentheses
 
 error: aborting due to previous error

src/test/ui/error-codes/E0220.stderr

@@ -1,13 +1,13 @@
 error[E0220]: associated type `F` not found for `Trait`
   --> $DIR/E0220.rs:15:18
    |
-15 | type Foo = Trait<F=i32>; //~ ERROR E0220
+LL | type Foo = Trait<F=i32>; //~ ERROR E0220
    |                  ^^^^^ associated type `F` not found
 
 error[E0191]: the value of the associated type `Bar` (from the trait `Trait`) must be specified
   --> $DIR/E0220.rs:15:12
    |
-15 | type Foo = Trait<F=i32>; //~ ERROR E0220
+LL | type Foo = Trait<F=i32>; //~ ERROR E0220
    |            ^^^^^^^^^^^^ missing associated type `Bar` value
 
 error: aborting due to 2 previous errors

src/test/ui/error-codes/E0221.stderr

@@ -1,28 +1,28 @@
 error[E0221]: ambiguous associated type `A` in bounds of `Self`
   --> $DIR/E0221.rs:21:16
    |
-15 |     type A: T1;
+LL |     type A: T1;
    |     ----------- ambiguous `A` from `Foo`
 ...
-19 |     type A: T2;
+LL |     type A: T2;
    |     ----------- ambiguous `A` from `Bar`
 20 |     fn do_something() {
-21 |         let _: Self::A;
+LL |         let _: Self::A;
    |                ^^^^^^^ ambiguous associated type `A`
 
 error[E0221]: ambiguous associated type `Err` in bounds of `Self`
   --> $DIR/E0221.rs:31:16
    |
-29 |     type Err: T3;
+LL |     type Err: T3;
    |     ------------- ambiguous `Err` from `My`
 30 |     fn test() {
-31 |         let _: Self::Err;
+LL |         let _: Self::Err;
    |                ^^^^^^^^^ ambiguous associated type `Err`
    |
 note: associated type `Self` could derive from `std::str::FromStr`
   --> $DIR/E0221.rs:31:16
    |
-31 |         let _: Self::Err;
+LL |         let _: Self::Err;
    |                ^^^^^^^^^
 
 error: aborting due to 2 previous errors

src/test/ui/error-codes/E0223.stderr

@@ -1,7 +1,7 @@
 error[E0223]: ambiguous associated type
   --> $DIR/E0223.rs:14:14
    |
-14 |     let foo: MyTrait::X;
+LL |     let foo: MyTrait::X;
    |              ^^^^^^^^^^ ambiguous associated type
    |
    = note: specify the type using the syntax `<Type as MyTrait>::X`

src/test/ui/error-codes/E0225.stderr

@@ -1,7 +1,7 @@
 error[E0225]: only auto traits can be used as additional traits in a trait object
   --> $DIR/E0225.rs:12:32
    |
-12 |     let _: Box<std::io::Read + std::io::Write>;
+LL |     let _: Box<std::io::Read + std::io::Write>;
    |                                ^^^^^^^^^^^^^^ non-auto additional trait
 
 error: aborting due to previous error

src/test/ui/error-codes/E0229.stderr

@@ -1,7 +1,7 @@
 error[E0229]: associated type bindings are not allowed here
   --> $DIR/E0229.rs:23:25
    |
-23 | fn baz<I>(x: &<I as Foo<A=Bar>>::A) {}
+LL | fn baz<I>(x: &<I as Foo<A=Bar>>::A) {}
    |                         ^^^^^ associated type not allowed here
 
 error: aborting due to previous error

src/test/ui/error-codes/E0232.stderr

@@ -1,7 +1,7 @@
 error[E0232]: `#[rustc_on_unimplemented]` requires a value
   --> $DIR/E0232.rs:13:1
    |
-13 | #[rustc_on_unimplemented]
+LL | #[rustc_on_unimplemented]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^ value required here
    |
    = note: eg `#[rustc_on_unimplemented = "foo"]`

src/test/ui/error-codes/E0243.stderr

@@ -1,7 +1,7 @@
 error[E0243]: wrong number of type arguments: expected 1, found 0
   --> $DIR/E0243.rs:12:17
    |
-12 | struct Bar { x: Foo }
+LL | struct Bar { x: Foo }
    |                 ^^^ expected 1 type argument
 
 error: aborting due to previous error