about summary refs log tree commit diff
path: root/src/test/ui/error-codes
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/ui/error-codes')
-rw-r--r--src/test/ui/error-codes/E0001.stderr4
-rw-r--r--src/test/ui/error-codes/E0004-2.stderr4
-rw-r--r--src/test/ui/error-codes/E0004.stderr2
-rw-r--r--src/test/ui/error-codes/E0005.stderr2
-rw-r--r--src/test/ui/error-codes/E0007.stderr4
-rw-r--r--src/test/ui/error-codes/E0008.stderr2
-rw-r--r--src/test/ui/error-codes/E0009.stderr2
-rw-r--r--src/test/ui/error-codes/E0010-teach.stderr2
-rw-r--r--src/test/ui/error-codes/E0010.stderr2
-rw-r--r--src/test/ui/error-codes/E0017.stderr8
-rw-r--r--src/test/ui/error-codes/E0023.stderr6
-rw-r--r--src/test/ui/error-codes/E0025.stderr2
-rw-r--r--src/test/ui/error-codes/E0026-teach.stderr2
-rw-r--r--src/test/ui/error-codes/E0026.stderr2
-rw-r--r--src/test/ui/error-codes/E0027-teach.stderr2
-rw-r--r--src/test/ui/error-codes/E0027.stderr2
-rw-r--r--src/test/ui/error-codes/E0029-teach.stderr4
-rw-r--r--src/test/ui/error-codes/E0029.stderr4
-rw-r--r--src/test/ui/error-codes/E0030-teach.stderr2
-rw-r--r--src/test/ui/error-codes/E0030.stderr2
-rw-r--r--src/test/ui/error-codes/E0033-teach.stderr6
-rw-r--r--src/test/ui/error-codes/E0033.stderr6
-rw-r--r--src/test/ui/error-codes/E0034.stderr6
-rw-r--r--src/test/ui/error-codes/E0038.stderr2
-rw-r--r--src/test/ui/error-codes/E0040.stderr2
-rw-r--r--src/test/ui/error-codes/E0044.stderr4
-rw-r--r--src/test/ui/error-codes/E0045.stderr2
-rw-r--r--src/test/ui/error-codes/E0049.stderr4
-rw-r--r--src/test/ui/error-codes/E0050.stderr12
-rw-r--r--src/test/ui/error-codes/E0054.stderr2
-rw-r--r--src/test/ui/error-codes/E0055.stderr2
-rw-r--r--src/test/ui/error-codes/E0057.stderr4
-rw-r--r--src/test/ui/error-codes/E0059.stderr2
-rw-r--r--src/test/ui/error-codes/E0060.stderr4
-rw-r--r--src/test/ui/error-codes/E0061.stderr8
-rw-r--r--src/test/ui/error-codes/E0062.stderr2
-rw-r--r--src/test/ui/error-codes/E0063.stderr8
-rw-r--r--src/test/ui/error-codes/E0067.stderr4
-rw-r--r--src/test/ui/error-codes/E0069.stderr2
-rw-r--r--src/test/ui/error-codes/E0070.stderr8
-rw-r--r--src/test/ui/error-codes/E0071.stderr2
-rw-r--r--src/test/ui/error-codes/E0075.stderr2
-rw-r--r--src/test/ui/error-codes/E0076.stderr2
-rw-r--r--src/test/ui/error-codes/E0077.stderr2
-rw-r--r--src/test/ui/error-codes/E0080.stderr8
-rw-r--r--src/test/ui/error-codes/E0081.stderr4
-rw-r--r--src/test/ui/error-codes/E0084.stderr4
-rw-r--r--src/test/ui/error-codes/E0087.stderr4
-rw-r--r--src/test/ui/error-codes/E0088.stderr4
-rw-r--r--src/test/ui/error-codes/E0089.stderr2
-rw-r--r--src/test/ui/error-codes/E0090.stderr2
-rw-r--r--src/test/ui/error-codes/E0091.stderr4
-rw-r--r--src/test/ui/error-codes/E0092.stderr2
-rw-r--r--src/test/ui/error-codes/E0093.stderr2
-rw-r--r--src/test/ui/error-codes/E0094.stderr2
-rw-r--r--src/test/ui/error-codes/E0106.stderr10
-rw-r--r--src/test/ui/error-codes/E0107.stderr6
-rw-r--r--src/test/ui/error-codes/E0109.stderr2
-rw-r--r--src/test/ui/error-codes/E0110.stderr2
-rw-r--r--src/test/ui/error-codes/E0116.stderr2
-rw-r--r--src/test/ui/error-codes/E0117.stderr4
-rw-r--r--src/test/ui/error-codes/E0118.stderr2
-rw-r--r--src/test/ui/error-codes/E0119.stderr4
-rw-r--r--src/test/ui/error-codes/E0120.stderr2
-rw-r--r--src/test/ui/error-codes/E0121.stderr4
-rw-r--r--src/test/ui/error-codes/E0124.stderr4
-rw-r--r--src/test/ui/error-codes/E0128.stderr2
-rw-r--r--src/test/ui/error-codes/E0130.stderr2
-rw-r--r--src/test/ui/error-codes/E0131.stderr2
-rw-r--r--src/test/ui/error-codes/E0132.stderr2
-rw-r--r--src/test/ui/error-codes/E0133.stderr2
-rw-r--r--src/test/ui/error-codes/E0137.stderr4
-rw-r--r--src/test/ui/error-codes/E0138.stderr4
-rw-r--r--src/test/ui/error-codes/E0152.stderr2
-rw-r--r--src/test/ui/error-codes/E0161.stderr4
-rw-r--r--src/test/ui/error-codes/E0162.stderr2
-rw-r--r--src/test/ui/error-codes/E0164.stderr2
-rw-r--r--src/test/ui/error-codes/E0165.stderr2
-rw-r--r--src/test/ui/error-codes/E0184.stderr2
-rw-r--r--src/test/ui/error-codes/E0185.stderr4
-rw-r--r--src/test/ui/error-codes/E0186.stderr4
-rw-r--r--src/test/ui/error-codes/E0191.stderr2
-rw-r--r--src/test/ui/error-codes/E0192.stderr2
-rw-r--r--src/test/ui/error-codes/E0194.stderr4
-rw-r--r--src/test/ui/error-codes/E0195.stderr4
-rw-r--r--src/test/ui/error-codes/E0197.stderr2
-rw-r--r--src/test/ui/error-codes/E0198.stderr2
-rw-r--r--src/test/ui/error-codes/E0199.stderr2
-rw-r--r--src/test/ui/error-codes/E0200.stderr2
-rw-r--r--src/test/ui/error-codes/E0201.stderr12
-rw-r--r--src/test/ui/error-codes/E0206.stderr6
-rw-r--r--src/test/ui/error-codes/E0207.stderr2
-rw-r--r--src/test/ui/error-codes/E0214.stderr2
-rw-r--r--src/test/ui/error-codes/E0220.stderr4
-rw-r--r--src/test/ui/error-codes/E0221.stderr12
-rw-r--r--src/test/ui/error-codes/E0223.stderr2
-rw-r--r--src/test/ui/error-codes/E0225.stderr2
-rw-r--r--src/test/ui/error-codes/E0229.stderr2
-rw-r--r--src/test/ui/error-codes/E0232.stderr2
-rw-r--r--src/test/ui/error-codes/E0243.stderr2
-rw-r--r--src/test/ui/error-codes/E0244.stderr2
-rw-r--r--src/test/ui/error-codes/E0252.stderr4
-rw-r--r--src/test/ui/error-codes/E0253.stderr2
-rw-r--r--src/test/ui/error-codes/E0254.stderr4
-rw-r--r--src/test/ui/error-codes/E0255.stderr4
-rw-r--r--src/test/ui/error-codes/E0259.stderr4
-rw-r--r--src/test/ui/error-codes/E0260.stderr4
-rw-r--r--src/test/ui/error-codes/E0261.stderr4
-rw-r--r--src/test/ui/error-codes/E0262.stderr2
-rw-r--r--src/test/ui/error-codes/E0263.stderr2
-rw-r--r--src/test/ui/error-codes/E0264.stderr2
-rw-r--r--src/test/ui/error-codes/E0267.stderr2
-rw-r--r--src/test/ui/error-codes/E0268.stderr2
-rw-r--r--src/test/ui/error-codes/E0271.stderr4
-rw-r--r--src/test/ui/error-codes/E0275.stderr4
-rw-r--r--src/test/ui/error-codes/E0276.stderr4
-rw-r--r--src/test/ui/error-codes/E0277-2.stderr4
-rw-r--r--src/test/ui/error-codes/E0277.stderr6
-rw-r--r--src/test/ui/error-codes/E0282.stderr2
-rw-r--r--src/test/ui/error-codes/E0283.stderr4
-rw-r--r--src/test/ui/error-codes/E0296.stderr2
-rw-r--r--src/test/ui/error-codes/E0297.stderr2
-rw-r--r--src/test/ui/error-codes/E0301.stderr2
-rw-r--r--src/test/ui/error-codes/E0302.stderr2
-rw-r--r--src/test/ui/error-codes/E0303.stderr4
-rw-r--r--src/test/ui/error-codes/E0308-4.stderr2
-rw-r--r--src/test/ui/error-codes/E0308.stderr2
-rw-r--r--src/test/ui/error-codes/E0365.stderr2
-rw-r--r--src/test/ui/error-codes/E0370.stderr2
-rw-r--r--src/test/ui/error-codes/E0374.stderr4
-rw-r--r--src/test/ui/error-codes/E0375.stderr2
-rw-r--r--src/test/ui/error-codes/E0376.stderr2
-rw-r--r--src/test/ui/error-codes/E0388.stderr8
-rw-r--r--src/test/ui/error-codes/E0389.stderr2
-rw-r--r--src/test/ui/error-codes/E0390.stderr4
-rw-r--r--src/test/ui/error-codes/E0392.stderr2
-rw-r--r--src/test/ui/error-codes/E0393.stderr2
-rw-r--r--src/test/ui/error-codes/E0394.stderr2
-rw-r--r--src/test/ui/error-codes/E0395.stderr2
-rw-r--r--src/test/ui/error-codes/E0396.stderr2
-rw-r--r--src/test/ui/error-codes/E0401.stderr2
-rw-r--r--src/test/ui/error-codes/E0403.stderr2
-rw-r--r--src/test/ui/error-codes/E0404.stderr2
-rw-r--r--src/test/ui/error-codes/E0405.stderr2
-rw-r--r--src/test/ui/error-codes/E0407.stderr2
-rw-r--r--src/test/ui/error-codes/E0408.stderr2
-rw-r--r--src/test/ui/error-codes/E0411.stderr2
-rw-r--r--src/test/ui/error-codes/E0412.stderr2
-rw-r--r--src/test/ui/error-codes/E0415.stderr2
-rw-r--r--src/test/ui/error-codes/E0416.stderr2
-rw-r--r--src/test/ui/error-codes/E0423.stderr2
-rw-r--r--src/test/ui/error-codes/E0424.stderr2
-rw-r--r--src/test/ui/error-codes/E0425.stderr2
-rw-r--r--src/test/ui/error-codes/E0426.stderr2
-rw-r--r--src/test/ui/error-codes/E0428.stderr4
-rw-r--r--src/test/ui/error-codes/E0429.stderr2
-rw-r--r--src/test/ui/error-codes/E0430.stderr4
-rw-r--r--src/test/ui/error-codes/E0431.stderr2
-rw-r--r--src/test/ui/error-codes/E0432.stderr2
-rw-r--r--src/test/ui/error-codes/E0433.stderr2
-rw-r--r--src/test/ui/error-codes/E0434.stderr2
-rw-r--r--src/test/ui/error-codes/E0435.stderr2
-rw-r--r--src/test/ui/error-codes/E0437.stderr2
-rw-r--r--src/test/ui/error-codes/E0438.stderr2
-rw-r--r--src/test/ui/error-codes/E0439.stderr2
-rw-r--r--src/test/ui/error-codes/E0440.stderr2
-rw-r--r--src/test/ui/error-codes/E0441.stderr2
-rw-r--r--src/test/ui/error-codes/E0442.stderr6
-rw-r--r--src/test/ui/error-codes/E0443.stderr2
-rw-r--r--src/test/ui/error-codes/E0444.stderr2
-rw-r--r--src/test/ui/error-codes/E0445.stderr6
-rw-r--r--src/test/ui/error-codes/E0446.stderr6
-rw-r--r--src/test/ui/error-codes/E0449.stderr6
-rw-r--r--src/test/ui/error-codes/E0451.stderr4
-rw-r--r--src/test/ui/error-codes/E0452.stderr2
-rw-r--r--src/test/ui/error-codes/E0453.stderr4
-rw-r--r--src/test/ui/error-codes/E0454.stderr2
-rw-r--r--src/test/ui/error-codes/E0458.stderr4
-rw-r--r--src/test/ui/error-codes/E0459.stderr2
-rw-r--r--src/test/ui/error-codes/E0463.stderr2
-rw-r--r--src/test/ui/error-codes/E0478.stderr6
-rw-r--r--src/test/ui/error-codes/E0492.stderr2
-rw-r--r--src/test/ui/error-codes/E0494.stderr2
-rw-r--r--src/test/ui/error-codes/E0496.stderr4
-rw-r--r--src/test/ui/error-codes/E0499.stderr6
-rw-r--r--src/test/ui/error-codes/E0502.stderr6
-rw-r--r--src/test/ui/error-codes/E0503.stderr4
-rw-r--r--src/test/ui/error-codes/E0504.stderr4
-rw-r--r--src/test/ui/error-codes/E0505.stderr4
-rw-r--r--src/test/ui/error-codes/E0507.stderr2
-rw-r--r--src/test/ui/error-codes/E0509.stderr2
-rw-r--r--src/test/ui/error-codes/E0511.stderr2
-rw-r--r--src/test/ui/error-codes/E0512.stderr2
-rw-r--r--src/test/ui/error-codes/E0516.stderr2
-rw-r--r--src/test/ui/error-codes/E0517.stderr18
-rw-r--r--src/test/ui/error-codes/E0518.stderr10
-rw-r--r--src/test/ui/error-codes/E0520.stderr8
-rw-r--r--src/test/ui/error-codes/E0522.stderr2
-rw-r--r--src/test/ui/error-codes/E0527.stderr2
-rw-r--r--src/test/ui/error-codes/E0528.stderr2
-rw-r--r--src/test/ui/error-codes/E0529.stderr2
-rw-r--r--src/test/ui/error-codes/E0530.stderr4
-rw-r--r--src/test/ui/error-codes/E0532.stderr2
-rw-r--r--src/test/ui/error-codes/E0534.stderr2
-rw-r--r--src/test/ui/error-codes/E0558.stderr2
-rw-r--r--src/test/ui/error-codes/E0565-1.stderr2
-rw-r--r--src/test/ui/error-codes/E0565.stderr2
-rw-r--r--src/test/ui/error-codes/E0572.stderr2
-rw-r--r--src/test/ui/error-codes/E0582.stderr4
-rw-r--r--src/test/ui/error-codes/E0585.stderr2
-rw-r--r--src/test/ui/error-codes/E0586.stderr2
-rw-r--r--src/test/ui/error-codes/E0597.stderr4
-rw-r--r--src/test/ui/error-codes/E0599.stderr4
-rw-r--r--src/test/ui/error-codes/E0600.stderr2
-rw-r--r--src/test/ui/error-codes/E0602.stderr4
-rw-r--r--src/test/ui/error-codes/E0603.stderr2
-rw-r--r--src/test/ui/error-codes/E0604.stderr2
-rw-r--r--src/test/ui/error-codes/E0605.stderr4
-rw-r--r--src/test/ui/error-codes/E0606.stderr4
-rw-r--r--src/test/ui/error-codes/E0607.stderr2
-rw-r--r--src/test/ui/error-codes/E0608.stderr2
-rw-r--r--src/test/ui/error-codes/E0609.stderr4
-rw-r--r--src/test/ui/error-codes/E0610.stderr2
-rw-r--r--src/test/ui/error-codes/E0611.stderr2
-rw-r--r--src/test/ui/error-codes/E0612.stderr2
-rw-r--r--src/test/ui/error-codes/E0614.stderr2
-rw-r--r--src/test/ui/error-codes/E0615.stderr2
-rw-r--r--src/test/ui/error-codes/E0616.stderr2
-rw-r--r--src/test/ui/error-codes/E0617.stderr12
-rw-r--r--src/test/ui/error-codes/E0618.stderr8
-rw-r--r--src/test/ui/error-codes/E0620.stderr4
-rw-r--r--src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr10
-rw-r--r--src/test/ui/error-codes/E0622.stderr2
-rw-r--r--src/test/ui/error-codes/E0624.stderr2
-rw-r--r--src/test/ui/error-codes/E0637.stderr6
-rw-r--r--src/test/ui/error-codes/E0657.stderr8
-rw-r--r--src/test/ui/error-codes/E0658.stderr2
-rw-r--r--src/test/ui/error-codes/E0659.stderr6
238 files changed, 396 insertions, 396 deletions
diff --git a/src/test/ui/error-codes/E0001.stderr b/src/test/ui/error-codes/E0001.stderr
index d7d67af1492..af67a438f52 100644
--- a/src/test/ui/error-codes/E0001.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0004-2.stderr b/src/test/ui/error-codes/E0004-2.stderr
index a1ad127aac7..c3412e73599 100644
--- a/src/test/ui/error-codes/E0004-2.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0004.stderr b/src/test/ui/error-codes/E0004.stderr
index 204f240d27c..56351f80f9d 100644
--- a/src/test/ui/error-codes/E0004.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0005.stderr b/src/test/ui/error-codes/E0005.stderr
index cb1dc9a4a28..d02817a6675 100644
--- a/src/test/ui/error-codes/E0005.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0007.stderr b/src/test/ui/error-codes/E0007.stderr
index db62a4ec64a..c5cf140bab5 100644
--- a/src/test/ui/error-codes/E0007.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0008.stderr b/src/test/ui/error-codes/E0008.stderr
index 3fab4ad484c..cdf6eff0fab 100644
--- a/src/test/ui/error-codes/E0008.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0009.stderr b/src/test/ui/error-codes/E0009.stderr
index 0a04d5a452d..ac6c2ace1f8 100644
--- a/src/test/ui/error-codes/E0009.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0010-teach.stderr b/src/test/ui/error-codes/E0010-teach.stderr
index f414504ccd4..0d97a56b1b4 100644
--- a/src/test/ui/error-codes/E0010-teach.stderr
+++ b/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.
diff --git a/src/test/ui/error-codes/E0010.stderr b/src/test/ui/error-codes/E0010.stderr
index 8d441159ec7..0d8b0800b08 100644
--- a/src/test/ui/error-codes/E0010.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0017.stderr b/src/test/ui/error-codes/E0017.stderr
index 5eec33f96b3..540d76a6d45 100644
--- a/src/test/ui/error-codes/E0017.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0023.stderr b/src/test/ui/error-codes/E0023.stderr
index 018a59de808..2f69db3e7ef 100644
--- a/src/test/ui/error-codes/E0023.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0025.stderr b/src/test/ui/error-codes/E0025.stderr
index 91189def362..2e32ccab0dd 100644
--- a/src/test/ui/error-codes/E0025.stderr
+++ b/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`
diff --git a/src/test/ui/error-codes/E0026-teach.stderr b/src/test/ui/error-codes/E0026-teach.stderr
index b3c281ef7c9..e7ab3fbf307 100644
--- a/src/test/ui/error-codes/E0026-teach.stderr
+++ b/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.
diff --git a/src/test/ui/error-codes/E0026.stderr b/src/test/ui/error-codes/E0026.stderr
index 3b667260bc9..9415da2a819 100644
--- a/src/test/ui/error-codes/E0026.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0027-teach.stderr b/src/test/ui/error-codes/E0027-teach.stderr
index 2dd3c6150dc..d9c6a865dad 100644
--- a/src/test/ui/error-codes/E0027-teach.stderr
+++ b/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.
diff --git a/src/test/ui/error-codes/E0027.stderr b/src/test/ui/error-codes/E0027.stderr
index 19012afe1c3..6959324ccde 100644
--- a/src/test/ui/error-codes/E0027.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0029-teach.stderr b/src/test/ui/error-codes/E0029-teach.stderr
index 626839fb807..d4e9a1c3040 100644
--- a/src/test/ui/error-codes/E0029-teach.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0029.stderr b/src/test/ui/error-codes/E0029.stderr
index 123e5da1cec..ab1fa321dbd 100644
--- a/src/test/ui/error-codes/E0029.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0030-teach.stderr b/src/test/ui/error-codes/E0030-teach.stderr
index 8e129b4ae2c..e23bf89be29 100644
--- a/src/test/ui/error-codes/E0030-teach.stderr
+++ b/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.
diff --git a/src/test/ui/error-codes/E0030.stderr b/src/test/ui/error-codes/E0030.stderr
index eb5b40d2c47..9d4352888cb 100644
--- a/src/test/ui/error-codes/E0030.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0033-teach.stderr b/src/test/ui/error-codes/E0033-teach.stderr
index 8dd364ae9a3..9f2a9595b39 100644
--- a/src/test/ui/error-codes/E0033-teach.stderr
+++ b/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.
diff --git a/src/test/ui/error-codes/E0033.stderr b/src/test/ui/error-codes/E0033.stderr
index dfde76cc125..a0d73c074f8 100644
--- a/src/test/ui/error-codes/E0033.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0034.stderr b/src/test/ui/error-codes/E0034.stderr
index 850d4a74117..f457dfded7c 100644
--- a/src/test/ui/error-codes/E0034.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0038.stderr b/src/test/ui/error-codes/E0038.stderr
index edfa83a44f7..b3f3ea57a34 100644
--- a/src/test/ui/error-codes/E0038.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0040.stderr b/src/test/ui/error-codes/E0040.stderr
index 53e3768ed20..a2f6174e918 100644
--- a/src/test/ui/error-codes/E0040.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0044.stderr b/src/test/ui/error-codes/E0044.stderr
index fa4bf51d103..b823f3717b3 100644
--- a/src/test/ui/error-codes/E0044.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0045.stderr b/src/test/ui/error-codes/E0045.stderr
index 750833c2b8a..e79965aeff7 100644
--- a/src/test/ui/error-codes/E0045.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0049.stderr b/src/test/ui/error-codes/E0049.stderr
index 09fb35c0639..cdc936df270 100644
--- a/src/test/ui/error-codes/E0049.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0050.stderr b/src/test/ui/error-codes/E0050.stderr
index 2c69a970a56..d5d1677f43f 100644
--- a/src/test/ui/error-codes/E0050.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0054.stderr b/src/test/ui/error-codes/E0054.stderr
index 87a0d8ba573..ed82704e661 100644
--- a/src/test/ui/error-codes/E0054.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0055.stderr b/src/test/ui/error-codes/E0055.stderr
index 3dbdc5db2b1..3d13b144106 100644
--- a/src/test/ui/error-codes/E0055.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0057.stderr b/src/test/ui/error-codes/E0057.stderr
index f0c40578ddb..0d6cd77de07 100644
--- a/src/test/ui/error-codes/E0057.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0059.stderr b/src/test/ui/error-codes/E0059.stderr
index 92839408902..5e2907eed69 100644
--- a/src/test/ui/error-codes/E0059.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0060.stderr b/src/test/ui/error-codes/E0060.stderr
index 0cfce7d6b22..0493015cc76 100644
--- a/src/test/ui/error-codes/E0060.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0061.stderr b/src/test/ui/error-codes/E0061.stderr
index 735d99b0d98..6ddd4be9d8e 100644
--- a/src/test/ui/error-codes/E0061.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0062.stderr b/src/test/ui/error-codes/E0062.stderr
index 19ed77c9b8e..0978de24f15 100644
--- a/src/test/ui/error-codes/E0062.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0063.stderr b/src/test/ui/error-codes/E0063.stderr
index 1b98a00e20d..7f33223a7ea 100644
--- a/src/test/ui/error-codes/E0063.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0067.stderr b/src/test/ui/error-codes/E0067.stderr
index 2faea638dba..b964b9dffc1 100644
--- a/src/test/ui/error-codes/E0067.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0069.stderr b/src/test/ui/error-codes/E0069.stderr
index 130fcc69278..8a5b5984c33 100644
--- a/src/test/ui/error-codes/E0069.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0070.stderr b/src/test/ui/error-codes/E0070.stderr
index 71bac9098af..33da9030c41 100644
--- a/src/test/ui/error-codes/E0070.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0071.stderr b/src/test/ui/error-codes/E0071.stderr
index 7b09d5333c9..b28dcf90c82 100644
--- a/src/test/ui/error-codes/E0071.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0075.stderr b/src/test/ui/error-codes/E0075.stderr
index ad9d64dc970..4fd5b65f4a9 100644
--- a/src/test/ui/error-codes/E0075.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0076.stderr b/src/test/ui/error-codes/E0076.stderr
index 5e9349a282e..3cee6f4527c 100644
--- a/src/test/ui/error-codes/E0076.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0077.stderr b/src/test/ui/error-codes/E0077.stderr
index 8427ff71a09..822efe9628b 100644
--- a/src/test/ui/error-codes/E0077.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0080.stderr b/src/test/ui/error-codes/E0080.stderr
index 7b1f2d6a716..01cfa0c375b 100644
--- a/src/test/ui/error-codes/E0080.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0081.stderr b/src/test/ui/error-codes/E0081.stderr
index 6c5cca3b1bf..42d0769bb57 100644
--- a/src/test/ui/error-codes/E0081.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0084.stderr b/src/test/ui/error-codes/E0084.stderr
index 02d27ce118e..5ebe03090a0 100644
--- a/src/test/ui/error-codes/E0084.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0087.stderr b/src/test/ui/error-codes/E0087.stderr
index c30bc05e768..b1ff92d8c27 100644
--- a/src/test/ui/error-codes/E0087.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0088.stderr b/src/test/ui/error-codes/E0088.stderr
index b88d89b8772..5497eb028d8 100644
--- a/src/test/ui/error-codes/E0088.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0089.stderr b/src/test/ui/error-codes/E0089.stderr
index e279765e8e4..3a399087943 100644
--- a/src/test/ui/error-codes/E0089.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0090.stderr b/src/test/ui/error-codes/E0090.stderr
index 98f96986c91..82e8eaf69ea 100644
--- a/src/test/ui/error-codes/E0090.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0091.stderr b/src/test/ui/error-codes/E0091.stderr
index 1a4aaccdc39..003e9e7efcd 100644
--- a/src/test/ui/error-codes/E0091.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0092.stderr b/src/test/ui/error-codes/E0092.stderr
index 5c497356b81..8b53a029c35 100644
--- a/src/test/ui/error-codes/E0092.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0093.stderr b/src/test/ui/error-codes/E0093.stderr
index 72e88c598c8..4e201650837 100644
--- a/src/test/ui/error-codes/E0093.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0094.stderr b/src/test/ui/error-codes/E0094.stderr
index b38ac11b6fc..7a2dfaae279 100644
--- a/src/test/ui/error-codes/E0094.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0106.stderr b/src/test/ui/error-codes/E0106.stderr
index e7b579d90ca..645414ca1ea 100644
--- a/src/test/ui/error-codes/E0106.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0107.stderr b/src/test/ui/error-codes/E0107.stderr
index b85197034b8..a695a593429 100644
--- a/src/test/ui/error-codes/E0107.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0109.stderr b/src/test/ui/error-codes/E0109.stderr
index 3f5fab45d4f..89f3154fb48 100644
--- a/src/test/ui/error-codes/E0109.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0110.stderr b/src/test/ui/error-codes/E0110.stderr
index 7ac74d14e30..3f4d525b6e5 100644
--- a/src/test/ui/error-codes/E0110.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0116.stderr b/src/test/ui/error-codes/E0116.stderr
index 2b0c9903a09..88954b906c4 100644
--- a/src/test/ui/error-codes/E0116.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0117.stderr b/src/test/ui/error-codes/E0117.stderr
index 1f77fc153b8..240aa4240cc 100644
--- a/src/test/ui/error-codes/E0117.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0118.stderr b/src/test/ui/error-codes/E0118.stderr
index 1cfcc0fc62b..bb811ab6345 100644
--- a/src/test/ui/error-codes/E0118.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0119.stderr b/src/test/ui/error-codes/E0119.stderr
index 82993a2b3ad..55ca8c5a779 100644
--- a/src/test/ui/error-codes/E0119.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0120.stderr b/src/test/ui/error-codes/E0120.stderr
index b5d9ee2f980..cd69b8d67bf 100644
--- a/src/test/ui/error-codes/E0120.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0121.stderr b/src/test/ui/error-codes/E0121.stderr
index 3f603371b87..ca9557cdcdc 100644
--- a/src/test/ui/error-codes/E0121.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0124.stderr b/src/test/ui/error-codes/E0124.stderr
index 114af775b45..1f4b4ce0efa 100644
--- a/src/test/ui/error-codes/E0124.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0128.stderr b/src/test/ui/error-codes/E0128.stderr
index 6098dd92766..632b1196723 100644
--- a/src/test/ui/error-codes/E0128.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0130.stderr b/src/test/ui/error-codes/E0130.stderr
index f3c8d051eb4..3e00909109b 100644
--- a/src/test/ui/error-codes/E0130.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0131.stderr b/src/test/ui/error-codes/E0131.stderr
index a49986880c3..b9caca22aeb 100644
--- a/src/test/ui/error-codes/E0131.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0132.stderr b/src/test/ui/error-codes/E0132.stderr
index 2da8d2b1d4b..ce22a99e66c 100644
--- a/src/test/ui/error-codes/E0132.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0133.stderr b/src/test/ui/error-codes/E0133.stderr
index 4ca0d6dd6b3..d703ce6203e 100644
--- a/src/test/ui/error-codes/E0133.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0137.stderr b/src/test/ui/error-codes/E0137.stderr
index 2b68a4249f1..4a5b4f6da86 100644
--- a/src/test/ui/error-codes/E0137.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0138.stderr b/src/test/ui/error-codes/E0138.stderr
index 9a3597a9f67..40b476afb9a 100644
--- a/src/test/ui/error-codes/E0138.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0152.stderr b/src/test/ui/error-codes/E0152.stderr
index c164c0e6eda..99a9b85f41e 100644
--- a/src/test/ui/error-codes/E0152.stderr
+++ b/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`.
diff --git a/src/test/ui/error-codes/E0161.stderr b/src/test/ui/error-codes/E0161.stderr
index 525ab033c74..fb8f3e0e168 100644
--- a/src/test/ui/error-codes/E0161.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0162.stderr b/src/test/ui/error-codes/E0162.stderr
index 15001ffc7b1..e9a7b18fcdd 100644
--- a/src/test/ui/error-codes/E0162.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0164.stderr b/src/test/ui/error-codes/E0164.stderr
index 344b0ef4e0b..ec91d9b52a9 100644
--- a/src/test/ui/error-codes/E0164.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0165.stderr b/src/test/ui/error-codes/E0165.stderr
index 14c70ee6987..ac6a88483ec 100644
--- a/src/test/ui/error-codes/E0165.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0184.stderr b/src/test/ui/error-codes/E0184.stderr
index a42ac11bc53..bd67ed11064 100644
--- a/src/test/ui/error-codes/E0184.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0185.stderr b/src/test/ui/error-codes/E0185.stderr
index 58fbc2220d3..12ecf25811e 100644
--- a/src/test/ui/error-codes/E0185.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0186.stderr b/src/test/ui/error-codes/E0186.stderr
index e212e229001..015c6e5d0bc 100644
--- a/src/test/ui/error-codes/E0186.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0191.stderr b/src/test/ui/error-codes/E0191.stderr
index 2b00f3d346d..14ae4469f12 100644
--- a/src/test/ui/error-codes/E0191.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0192.stderr b/src/test/ui/error-codes/E0192.stderr
index 4a5df56c0cc..1b2d6eb0285 100644
--- a/src/test/ui/error-codes/E0192.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0194.stderr b/src/test/ui/error-codes/E0194.stderr
index 3b5d512a1c4..d33ce009521 100644
--- a/src/test/ui/error-codes/E0194.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0195.stderr b/src/test/ui/error-codes/E0195.stderr
index 764f302552d..735aa4283ec 100644
--- a/src/test/ui/error-codes/E0195.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0197.stderr b/src/test/ui/error-codes/E0197.stderr
index f1bb3e70ac3..250101929ee 100644
--- a/src/test/ui/error-codes/E0197.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0198.stderr b/src/test/ui/error-codes/E0198.stderr
index d3b0088905e..12120658d61 100644
--- a/src/test/ui/error-codes/E0198.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0199.stderr b/src/test/ui/error-codes/E0199.stderr
index a97b2b90ffe..826d13a7a0e 100644
--- a/src/test/ui/error-codes/E0199.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0200.stderr b/src/test/ui/error-codes/E0200.stderr
index ee70e949533..30731712045 100644
--- a/src/test/ui/error-codes/E0200.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0201.stderr b/src/test/ui/error-codes/E0201.stderr
index aa17639c13b..730453c416e 100644
--- a/src/test/ui/error-codes/E0201.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0206.stderr b/src/test/ui/error-codes/E0206.stderr
index 7874d14fe61..0cd22a454e1 100644
--- a/src/test/ui/error-codes/E0206.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0207.stderr b/src/test/ui/error-codes/E0207.stderr
index 8cb6b976e17..e1f8a68583f 100644
--- a/src/test/ui/error-codes/E0207.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0214.stderr b/src/test/ui/error-codes/E0214.stderr
index afe340cdd8d..5fd3278dc88 100644
--- a/src/test/ui/error-codes/E0214.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0220.stderr b/src/test/ui/error-codes/E0220.stderr
index b431d137520..7a4f730c725 100644
--- a/src/test/ui/error-codes/E0220.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0221.stderr b/src/test/ui/error-codes/E0221.stderr
index 1e9db4c8e7e..735b31bc053 100644
--- a/src/test/ui/error-codes/E0221.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0223.stderr b/src/test/ui/error-codes/E0223.stderr
index 65125791b2b..9df8c8975e5 100644
--- a/src/test/ui/error-codes/E0223.stderr
+++ b/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`
diff --git a/src/test/ui/error-codes/E0225.stderr b/src/test/ui/error-codes/E0225.stderr
index f1e8ca92db7..8894791a2db 100644
--- a/src/test/ui/error-codes/E0225.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0229.stderr b/src/test/ui/error-codes/E0229.stderr
index 556adc02fc9..202007a6c7c 100644
--- a/src/test/ui/error-codes/E0229.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0232.stderr b/src/test/ui/error-codes/E0232.stderr
index 6633b0b592b..84f5e45bff7 100644
--- a/src/test/ui/error-codes/E0232.stderr
+++ b/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"]`
diff --git a/src/test/ui/error-codes/E0243.stderr b/src/test/ui/error-codes/E0243.stderr
index c3aa61f106a..26c19707fa8 100644
--- a/src/test/ui/error-codes/E0243.stderr
+++ b/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
diff --git a/src/test/ui/error-codes/E0244.stderr b/src/test/ui/error-codes/E0244.stderr
index 06dd74e9a67..078c8e59261 100644
--- a/src/test/ui/error-codes/E0244.stderr
+++ b/src/test/ui/error-codes/E0244.stderr
@@ -1,7 +1,7 @@
 error[E0244]: wrong number of type arguments: expected 0, found 2
   --> $DIR/E0244.rs:12:23
    |
-12 | struct Bar<S, T> { x: Foo<S, T> }
+LL | struct Bar<S, T> { x: Foo<S, T> }
    |                       ^^^^^^^^^ expected no type arguments
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0252.stderr b/src/test/ui/error-codes/E0252.stderr
index db842bb4773..038e8b13f03 100644
--- a/src/test/ui/error-codes/E0252.stderr
+++ b/src/test/ui/error-codes/E0252.stderr
@@ -1,9 +1,9 @@
 error[E0252]: the name `baz` is defined multiple times
   --> $DIR/E0252.rs:12:5
    |
-11 | use foo::baz;
+LL | use foo::baz;
    |     -------- previous import of the type `baz` here
-12 | use bar::baz; //~ ERROR E0252
+LL | use bar::baz; //~ ERROR E0252
    |     ^^^^^^^^ `baz` reimported here
    |
    = note: `baz` must be defined only once in the type namespace of this module
diff --git a/src/test/ui/error-codes/E0253.stderr b/src/test/ui/error-codes/E0253.stderr
index 736e3037a84..74e17e2aa95 100644
--- a/src/test/ui/error-codes/E0253.stderr
+++ b/src/test/ui/error-codes/E0253.stderr
@@ -1,7 +1,7 @@
 error[E0253]: `do_something` is not directly importable
   --> $DIR/E0253.rs:17:5
    |
-17 | use foo::MyTrait::do_something;
+LL | use foo::MyTrait::do_something;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot be imported directly
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0254.stderr b/src/test/ui/error-codes/E0254.stderr
index bab28d27ec6..71d9f3b9490 100644
--- a/src/test/ui/error-codes/E0254.stderr
+++ b/src/test/ui/error-codes/E0254.stderr
@@ -1,10 +1,10 @@
 error[E0254]: the name `alloc` is defined multiple times
   --> $DIR/E0254.rs:22:5
    |
-14 | extern crate alloc;
+LL | extern crate alloc;
    | ------------------- previous import of the extern crate `alloc` here
 ...
-22 | use foo::alloc;
+LL | use foo::alloc;
    |     ^^^^^^^^^^ `alloc` reimported here
    |
    = note: `alloc` must be defined only once in the type namespace of this module
diff --git a/src/test/ui/error-codes/E0255.stderr b/src/test/ui/error-codes/E0255.stderr
index 56440936035..31d237499aa 100644
--- a/src/test/ui/error-codes/E0255.stderr
+++ b/src/test/ui/error-codes/E0255.stderr
@@ -1,10 +1,10 @@
 error[E0255]: the name `foo` is defined multiple times
   --> $DIR/E0255.rs:13:1
    |
-11 | use bar::foo;
+LL | use bar::foo;
    |     -------- previous import of the value `foo` here
 12 | 
-13 | fn foo() {} //~ ERROR E0255
+LL | fn foo() {} //~ ERROR E0255
    | ^^^^^^^^ `foo` redefined here
    |
    = note: `foo` must be defined only once in the value namespace of this module
diff --git a/src/test/ui/error-codes/E0259.stderr b/src/test/ui/error-codes/E0259.stderr
index cf1131d38af..21c327ceba1 100644
--- a/src/test/ui/error-codes/E0259.stderr
+++ b/src/test/ui/error-codes/E0259.stderr
@@ -1,10 +1,10 @@
 error[E0259]: the name `alloc` is defined multiple times
   --> $DIR/E0259.rs:16:1
    |
-14 | extern crate alloc;
+LL | extern crate alloc;
    | ------------------- previous import of the extern crate `alloc` here
 15 | 
-16 | extern crate libc as alloc;
+LL | extern crate libc as alloc;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    | |
    | `alloc` reimported here
diff --git a/src/test/ui/error-codes/E0260.stderr b/src/test/ui/error-codes/E0260.stderr
index 3a22329790e..bcf92e85630 100644
--- a/src/test/ui/error-codes/E0260.stderr
+++ b/src/test/ui/error-codes/E0260.stderr
@@ -1,10 +1,10 @@
 error[E0260]: the name `alloc` is defined multiple times
   --> $DIR/E0260.rs:16:1
    |
-14 | extern crate alloc;
+LL | extern crate alloc;
    | ------------------- previous import of the extern crate `alloc` here
 15 | 
-16 | mod alloc {
+LL | mod alloc {
    | ^^^^^^^^^ `alloc` redefined here
    |
    = note: `alloc` must be defined only once in the type namespace of this module
diff --git a/src/test/ui/error-codes/E0261.stderr b/src/test/ui/error-codes/E0261.stderr
index 34a56ff9e5e..a12878ab896 100644
--- a/src/test/ui/error-codes/E0261.stderr
+++ b/src/test/ui/error-codes/E0261.stderr
@@ -1,13 +1,13 @@
 error[E0261]: use of undeclared lifetime name `'a`
   --> $DIR/E0261.rs:11:12
    |
-11 | fn foo(x: &'a str) { } //~ ERROR E0261
+LL | fn foo(x: &'a str) { } //~ ERROR E0261
    |            ^^ undeclared lifetime
 
 error[E0261]: use of undeclared lifetime name `'a`
   --> $DIR/E0261.rs:15:9
    |
-15 |     x: &'a str, //~ ERROR E0261
+LL |     x: &'a str, //~ ERROR E0261
    |         ^^ undeclared lifetime
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/error-codes/E0262.stderr b/src/test/ui/error-codes/E0262.stderr
index f40f378d1be..8e9327b29f7 100644
--- a/src/test/ui/error-codes/E0262.stderr
+++ b/src/test/ui/error-codes/E0262.stderr
@@ -1,7 +1,7 @@
 error[E0262]: invalid lifetime parameter name: `'static`
   --> $DIR/E0262.rs:11:8
    |
-11 | fn foo<'static>(x: &'static str) { } //~ ERROR E0262
+LL | fn foo<'static>(x: &'static str) { } //~ ERROR E0262
    |        ^^^^^^^ 'static is a reserved lifetime name
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0263.stderr b/src/test/ui/error-codes/E0263.stderr
index 43febfbf236..9cd41bed984 100644
--- a/src/test/ui/error-codes/E0263.stderr
+++ b/src/test/ui/error-codes/E0263.stderr
@@ -1,7 +1,7 @@
 error[E0263]: lifetime name `'a` declared twice in the same scope
   --> $DIR/E0263.rs:11:16
    |
-11 | fn foo<'a, 'b, 'a>(x: &'a str, y: &'b str) {
+LL | fn foo<'a, 'b, 'a>(x: &'a str, y: &'b str) {
    |        --      ^^ declared twice
    |        |
    |        previous declaration here
diff --git a/src/test/ui/error-codes/E0264.stderr b/src/test/ui/error-codes/E0264.stderr
index c415bfdb865..aad8002fc46 100644
--- a/src/test/ui/error-codes/E0264.stderr
+++ b/src/test/ui/error-codes/E0264.stderr
@@ -1,7 +1,7 @@
 error[E0264]: unknown external lang item: `cake`
   --> $DIR/E0264.rs:15:5
    |
-15 |     fn cake(); //~ ERROR E0264
+LL |     fn cake(); //~ ERROR E0264
    |     ^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0267.stderr b/src/test/ui/error-codes/E0267.stderr
index cd35aeee1e6..fbd7364d966 100644
--- a/src/test/ui/error-codes/E0267.stderr
+++ b/src/test/ui/error-codes/E0267.stderr
@@ -1,7 +1,7 @@
 error[E0267]: `break` inside of a closure
   --> $DIR/E0267.rs:12:18
    |
-12 |     let w = || { break; }; //~ ERROR E0267
+LL |     let w = || { break; }; //~ ERROR E0267
    |                  ^^^^^ cannot break inside of a closure
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0268.stderr b/src/test/ui/error-codes/E0268.stderr
index 52f72e23f3a..377ec21c1dd 100644
--- a/src/test/ui/error-codes/E0268.stderr
+++ b/src/test/ui/error-codes/E0268.stderr
@@ -1,7 +1,7 @@
 error[E0268]: `break` outside of loop
   --> $DIR/E0268.rs:12:5
    |
-12 |     break; //~ ERROR E0268
+LL |     break; //~ ERROR E0268
    |     ^^^^^ cannot break outside of a loop
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0271.stderr b/src/test/ui/error-codes/E0271.stderr
index a8222549b64..1a99afd6a9b 100644
--- a/src/test/ui/error-codes/E0271.stderr
+++ b/src/test/ui/error-codes/E0271.stderr
@@ -1,7 +1,7 @@
 error[E0271]: type mismatch resolving `<i8 as Trait>::AssociatedType == u32`
   --> $DIR/E0271.rs:20:5
    |
-20 |     foo(3_i8); //~ ERROR E0271
+LL |     foo(3_i8); //~ ERROR E0271
    |     ^^^ expected reference, found u32
    |
    = note: expected type `&'static str`
@@ -9,7 +9,7 @@ error[E0271]: type mismatch resolving `<i8 as Trait>::AssociatedType == u32`
 note: required by `foo`
   --> $DIR/E0271.rs:13:1
    |
-13 | fn foo<T>(t: T) where T: Trait<AssociatedType=u32> {
+LL | fn foo<T>(t: T) where T: Trait<AssociatedType=u32> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0275.stderr b/src/test/ui/error-codes/E0275.stderr
index a9d37a7049c..11ec85a5d09 100644
--- a/src/test/ui/error-codes/E0275.stderr
+++ b/src/test/ui/error-codes/E0275.stderr
@@ -1,7 +1,7 @@
 error[E0275]: overflow evaluating the requirement `Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<T>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>: std::marker::Sized`
   --> $DIR/E0275.rs:15:1
    |
-15 | impl<T> Foo for T where Bar<T>: Foo {} //~ ERROR E0275
+LL | impl<T> Foo for T where Bar<T>: Foo {} //~ ERROR E0275
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: consider adding a `#![recursion_limit="128"]` attribute to your crate
@@ -72,7 +72,7 @@ error[E0275]: overflow evaluating the requirement `Bar<Bar<Bar<Bar<Bar<Bar<Bar<B
 note: required by `Foo`
   --> $DIR/E0275.rs:11:1
    |
-11 | trait Foo {}
+LL | trait Foo {}
    | ^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0276.stderr b/src/test/ui/error-codes/E0276.stderr
index 88f229a3188..849e2aafd5a 100644
--- a/src/test/ui/error-codes/E0276.stderr
+++ b/src/test/ui/error-codes/E0276.stderr
@@ -1,10 +1,10 @@
 error[E0276]: impl has stricter requirements than trait
   --> $DIR/E0276.rs:16:5
    |
-12 |     fn foo<T>(x: T);
+LL |     fn foo<T>(x: T);
    |     ---------------- definition of `foo` from trait
 ...
-16 |     fn foo<T>(x: T) where T: Copy {} //~ ERROR E0276
+LL |     fn foo<T>(x: T) where T: Copy {} //~ ERROR E0276
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `T: std::marker::Copy`
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0277-2.stderr b/src/test/ui/error-codes/E0277-2.stderr
index f44a65befbe..987bb94bb95 100644
--- a/src/test/ui/error-codes/E0277-2.stderr
+++ b/src/test/ui/error-codes/E0277-2.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `*const u8: std::marker::Send` is not satisfied in `Foo`
   --> $DIR/E0277-2.rs:26:5
    |
-26 |     is_send::<Foo>();
+LL |     is_send::<Foo>();
    |     ^^^^^^^^^^^^^^ `*const u8` cannot be sent between threads safely
    |
    = help: within `Foo`, the trait `std::marker::Send` is not implemented for `*const u8`
@@ -11,7 +11,7 @@ error[E0277]: the trait bound `*const u8: std::marker::Send` is not satisfied in
 note: required by `is_send`
   --> $DIR/E0277-2.rs:23:1
    |
-23 | fn is_send<T: Send>() { }
+LL | fn is_send<T: Send>() { }
    | ^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0277.stderr b/src/test/ui/error-codes/E0277.stderr
index 2e43add36b2..7541e161670 100644
--- a/src/test/ui/error-codes/E0277.stderr
+++ b/src/test/ui/error-codes/E0277.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `[u8]: std::marker::Sized` is not satisfied in `std::path::Path`
   --> $DIR/E0277.rs:23:6
    |
-23 | fn f(p: Path) { }
+LL | fn f(p: Path) { }
    |      ^ `[u8]` does not have a constant size known at compile-time
    |
    = help: within `std::path::Path`, the trait `std::marker::Sized` is not implemented for `[u8]`
@@ -11,13 +11,13 @@ error[E0277]: the trait bound `[u8]: std::marker::Sized` is not satisfied in `st
 error[E0277]: the trait bound `i32: Foo` is not satisfied
   --> $DIR/E0277.rs:27:5
    |
-27 |     some_func(5i32);
+LL |     some_func(5i32);
    |     ^^^^^^^^^ the trait `Foo` is not implemented for `i32`
    |
 note: required by `some_func`
   --> $DIR/E0277.rs:19:1
    |
-19 | fn some_func<T: Foo>(foo: T) {
+LL | fn some_func<T: Foo>(foo: T) {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/error-codes/E0282.stderr b/src/test/ui/error-codes/E0282.stderr
index 2a5a31822ee..da5a53a7359 100644
--- a/src/test/ui/error-codes/E0282.stderr
+++ b/src/test/ui/error-codes/E0282.stderr
@@ -1,7 +1,7 @@
 error[E0282]: type annotations needed
   --> $DIR/E0282.rs:12:9
    |
-12 |     let x = "hello".chars().rev().collect(); //~ ERROR E0282
+LL |     let x = "hello".chars().rev().collect(); //~ ERROR E0282
    |         ^
    |         |
    |         cannot infer type for `_`
diff --git a/src/test/ui/error-codes/E0283.stderr b/src/test/ui/error-codes/E0283.stderr
index 2eb2fb06260..9de488cc7aa 100644
--- a/src/test/ui/error-codes/E0283.stderr
+++ b/src/test/ui/error-codes/E0283.stderr
@@ -1,13 +1,13 @@
 error[E0283]: type annotations required: cannot resolve `_: Generator`
   --> $DIR/E0283.rs:28:21
    |
-28 |     let cont: u32 = Generator::create(); //~ ERROR E0283
+LL |     let cont: u32 = Generator::create(); //~ ERROR E0283
    |                     ^^^^^^^^^^^^^^^^^
    |
 note: required by `Generator::create`
   --> $DIR/E0283.rs:12:5
    |
-12 |     fn create() -> u32;
+LL |     fn create() -> u32;
    |     ^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0296.stderr b/src/test/ui/error-codes/E0296.stderr
index 9dc54f670f6..a35b634cc04 100644
--- a/src/test/ui/error-codes/E0296.stderr
+++ b/src/test/ui/error-codes/E0296.stderr
@@ -1,7 +1,7 @@
 error[E0296]: malformed recursion limit attribute, expected #![recursion_limit="N"]
   --> $DIR/E0296.rs:11:1
    |
-11 | #![recursion_limit] //~ ERROR E0296
+LL | #![recursion_limit] //~ ERROR E0296
    | ^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0297.stderr b/src/test/ui/error-codes/E0297.stderr
index 8d2489a10fa..67d5139d386 100644
--- a/src/test/ui/error-codes/E0297.stderr
+++ b/src/test/ui/error-codes/E0297.stderr
@@ -1,7 +1,7 @@
 error[E0005]: refutable pattern in `for` loop binding: `None` not covered
   --> $DIR/E0297.rs:14:9
    |
-14 |     for Some(x) in xs {}
+LL |     for Some(x) in xs {}
    |         ^^^^^^^ pattern `None` not covered
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0301.stderr b/src/test/ui/error-codes/E0301.stderr
index 9b294b055af..04ad3c97246 100644
--- a/src/test/ui/error-codes/E0301.stderr
+++ b/src/test/ui/error-codes/E0301.stderr
@@ -1,7 +1,7 @@
 error[E0301]: cannot mutably borrow in a pattern guard
   --> $DIR/E0301.rs:14:19
    |
-14 |         option if option.take().is_none() => {}, //~ ERROR E0301
+LL |         option if option.take().is_none() => {}, //~ ERROR E0301
    |                   ^^^^^^ borrowed mutably in pattern guard
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0302.stderr b/src/test/ui/error-codes/E0302.stderr
index 1a1641c0f87..a11b85850a9 100644
--- a/src/test/ui/error-codes/E0302.stderr
+++ b/src/test/ui/error-codes/E0302.stderr
@@ -1,7 +1,7 @@
 error[E0302]: cannot assign in a pattern guard
   --> $DIR/E0302.rs:14:21
    |
-14 |         option if { option = None; false } => { }, //~ ERROR E0302
+LL |         option if { option = None; false } => { }, //~ ERROR E0302
    |                     ^^^^^^^^^^^^^ assignment in pattern guard
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0303.stderr b/src/test/ui/error-codes/E0303.stderr
index 8a51a087b68..c0a92ff55d1 100644
--- a/src/test/ui/error-codes/E0303.stderr
+++ b/src/test/ui/error-codes/E0303.stderr
@@ -1,7 +1,7 @@
 error[E0009]: cannot bind by-move and by-ref in the same pattern
   --> $DIR/E0303.rs:13:34
    |
-13 |         ref op_string_ref @ Some(s) => {},
+LL |         ref op_string_ref @ Some(s) => {},
    |         -------------------------^-
    |         |                        |
    |         |                        by-move pattern here
@@ -10,7 +10,7 @@ error[E0009]: cannot bind by-move and by-ref in the same pattern
 error[E0303]: pattern bindings are not allowed after an `@`
   --> $DIR/E0303.rs:13:34
    |
-13 |         ref op_string_ref @ Some(s) => {},
+LL |         ref op_string_ref @ Some(s) => {},
    |                                  ^ not allowed after `@`
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/error-codes/E0308-4.stderr b/src/test/ui/error-codes/E0308-4.stderr
index a7b40c54184..057791b467f 100644
--- a/src/test/ui/error-codes/E0308-4.stderr
+++ b/src/test/ui/error-codes/E0308-4.stderr
@@ -1,7 +1,7 @@
 error[E0308]: mismatched types
   --> $DIR/E0308-4.rs:14:9
    |
-14 |         0u8...3i8 => (), //~ ERROR E0308
+LL |         0u8...3i8 => (), //~ ERROR E0308
    |         ^^^^^^^^^ expected u8, found i8
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0308.stderr b/src/test/ui/error-codes/E0308.stderr
index b137b840924..04e5f9da599 100644
--- a/src/test/ui/error-codes/E0308.stderr
+++ b/src/test/ui/error-codes/E0308.stderr
@@ -1,7 +1,7 @@
 error[E0308]: intrinsic has wrong type
   --> $DIR/E0308.rs:14:5
    |
-14 |     fn size_of<T>(); //~ ERROR E0308
+LL |     fn size_of<T>(); //~ ERROR E0308
    |     ^^^^^^^^^^^^^^^^ expected (), found usize
    |
    = note: expected type `unsafe extern "rust-intrinsic" fn()`
diff --git a/src/test/ui/error-codes/E0365.stderr b/src/test/ui/error-codes/E0365.stderr
index 52830fc150f..ce646eb96be 100644
--- a/src/test/ui/error-codes/E0365.stderr
+++ b/src/test/ui/error-codes/E0365.stderr
@@ -1,7 +1,7 @@
 error[E0365]: `foo` is private, and cannot be re-exported
   --> $DIR/E0365.rs:15:9
    |
-15 | pub use foo as foo2;
+LL | pub use foo as foo2;
    |         ^^^^^^^^^^^ re-export of private `foo`
    |
    = note: consider declaring type or module `foo` with `pub`
diff --git a/src/test/ui/error-codes/E0370.stderr b/src/test/ui/error-codes/E0370.stderr
index 5f96293e214..1c7a18bd6d8 100644
--- a/src/test/ui/error-codes/E0370.stderr
+++ b/src/test/ui/error-codes/E0370.stderr
@@ -1,7 +1,7 @@
 error[E0370]: enum discriminant overflowed
   --> $DIR/E0370.rs:17:5
    |
-17 |     Y, //~ ERROR E0370
+LL |     Y, //~ ERROR E0370
    |     ^ overflowed on value after 9223372036854775807i64
    |
    = note: explicitly set `Y = -9223372036854775808i64` if that is desired outcome
diff --git a/src/test/ui/error-codes/E0374.stderr b/src/test/ui/error-codes/E0374.stderr
index 4d7c53adfac..3441f71dcd1 100644
--- a/src/test/ui/error-codes/E0374.stderr
+++ b/src/test/ui/error-codes/E0374.stderr
@@ -1,8 +1,8 @@
 error[E0374]: the trait `CoerceUnsized` may only be implemented for a coercion between structures with one field being coerced, none found
   --> $DIR/E0374.rs:18:1
    |
-18 | / impl<T, U> CoerceUnsized<Foo<U>> for Foo<T> //~ ERROR E0374
-19 | |     where T: CoerceUnsized<U> {}
+LL | / impl<T, U> CoerceUnsized<Foo<U>> for Foo<T> //~ ERROR E0374
+LL | |     where T: CoerceUnsized<U> {}
    | |________________________________^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0375.stderr b/src/test/ui/error-codes/E0375.stderr
index 123ad197d93..7e5ddda61d0 100644
--- a/src/test/ui/error-codes/E0375.stderr
+++ b/src/test/ui/error-codes/E0375.stderr
@@ -1,7 +1,7 @@
 error[E0375]: implementing the trait `CoerceUnsized` requires multiple coercions
   --> $DIR/E0375.rs:22:12
    |
-22 | impl<T, U> CoerceUnsized<Foo<U, T>> for Foo<T, U> {}
+LL | impl<T, U> CoerceUnsized<Foo<U, T>> for Foo<T, U> {}
    |            ^^^^^^^^^^^^^^^^^^^^^^^^ requires multiple coercions
    |
    = note: `CoerceUnsized` may only be implemented for a coercion between structures with one field being coerced
diff --git a/src/test/ui/error-codes/E0376.stderr b/src/test/ui/error-codes/E0376.stderr
index 4b73b4aee51..13c2e443113 100644
--- a/src/test/ui/error-codes/E0376.stderr
+++ b/src/test/ui/error-codes/E0376.stderr
@@ -1,7 +1,7 @@
 error[E0376]: the trait `CoerceUnsized` may only be implemented for a coercion between structures
   --> $DIR/E0376.rs:18:1
    |
-18 | impl<T, U> CoerceUnsized<U> for Foo<T> {} //~ ERROR E0376
+LL | impl<T, U> CoerceUnsized<U> for Foo<T> {} //~ ERROR E0376
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0388.stderr b/src/test/ui/error-codes/E0388.stderr
index de32010b96a..7c327970b94 100644
--- a/src/test/ui/error-codes/E0388.stderr
+++ b/src/test/ui/error-codes/E0388.stderr
@@ -1,25 +1,25 @@
 error[E0017]: references in constants may only refer to immutable values
   --> $DIR/E0388.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/E0388.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/E0388.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/E0388.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
diff --git a/src/test/ui/error-codes/E0389.stderr b/src/test/ui/error-codes/E0389.stderr
index 0a9e63a7223..a24491770c8 100644
--- a/src/test/ui/error-codes/E0389.stderr
+++ b/src/test/ui/error-codes/E0389.stderr
@@ -1,7 +1,7 @@
 error[E0389]: cannot assign to data in a `&` reference
   --> $DIR/E0389.rs:18:5
    |
-18 |     fancy_ref.num = 6; //~ ERROR E0389
+LL |     fancy_ref.num = 6; //~ ERROR E0389
    |     ^^^^^^^^^^^^^^^^^ assignment into an immutable reference
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0390.stderr b/src/test/ui/error-codes/E0390.stderr
index 2d2b5d64bda..70b62f5771e 100644
--- a/src/test/ui/error-codes/E0390.stderr
+++ b/src/test/ui/error-codes/E0390.stderr
@@ -1,13 +1,13 @@
 error[E0390]: only a single inherent implementation marked with `#[lang = "mut_ptr"]` is allowed for the `*mut T` primitive
   --> $DIR/E0390.rs:15:1
    |
-15 | impl *mut Foo {} //~ ERROR E0390
+LL | impl *mut Foo {} //~ ERROR E0390
    | ^^^^^^^^^^^^^^^^
    |
 help: consider using a trait to implement these methods
   --> $DIR/E0390.rs:15:1
    |
-15 | impl *mut Foo {} //~ ERROR E0390
+LL | impl *mut Foo {} //~ ERROR E0390
    | ^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0392.stderr b/src/test/ui/error-codes/E0392.stderr
index c291bfc5ac7..9ee85aa4de3 100644
--- a/src/test/ui/error-codes/E0392.stderr
+++ b/src/test/ui/error-codes/E0392.stderr
@@ -1,7 +1,7 @@
 error[E0392]: parameter `T` is never used
   --> $DIR/E0392.rs:11:10
    |
-11 | enum Foo<T> { Bar } //~ ERROR E0392
+LL | enum Foo<T> { Bar } //~ ERROR E0392
    |          ^ unused type parameter
    |
    = help: consider removing `T` or using a marker such as `std::marker::PhantomData`
diff --git a/src/test/ui/error-codes/E0393.stderr b/src/test/ui/error-codes/E0393.stderr
index 33aa79f1d34..f6e77cbb800 100644
--- a/src/test/ui/error-codes/E0393.stderr
+++ b/src/test/ui/error-codes/E0393.stderr
@@ -1,7 +1,7 @@
 error[E0393]: the type parameter `T` must be explicitly specified
   --> $DIR/E0393.rs:13:43
    |
-13 | fn together_we_will_rule_the_galaxy(son: &A) {}
+LL | fn together_we_will_rule_the_galaxy(son: &A) {}
    |                                           ^ missing reference to `T`
    |
    = note: because of the default `Self` reference, type parameters must be specified on object types
diff --git a/src/test/ui/error-codes/E0394.stderr b/src/test/ui/error-codes/E0394.stderr
index 3fec25ac3d6..74cb5ed0376 100644
--- a/src/test/ui/error-codes/E0394.stderr
+++ b/src/test/ui/error-codes/E0394.stderr
@@ -1,7 +1,7 @@
 error[E0394]: cannot refer to other statics by value, use the address-of operator or a constant instead
   --> $DIR/E0394.rs:14:17
    |
-14 | static B: u32 = A;
+LL | static B: u32 = A;
    |                 ^ referring to another static by value
    |
    = note: use the address-of operator or a constant instead
diff --git a/src/test/ui/error-codes/E0395.stderr b/src/test/ui/error-codes/E0395.stderr
index 41d47397caf..5f3d962877a 100644
--- a/src/test/ui/error-codes/E0395.stderr
+++ b/src/test/ui/error-codes/E0395.stderr
@@ -1,7 +1,7 @@
 error[E0395]: raw pointers cannot be compared in statics
   --> $DIR/E0395.rs:14:22
    |
-14 | static BAZ: bool = { (&FOO as *const i32) == (&BAR as *const i32) }; //~ ERROR E0395
+LL | static BAZ: bool = { (&FOO as *const i32) == (&BAR as *const i32) }; //~ ERROR E0395
    |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ comparing raw pointers in static
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0396.stderr b/src/test/ui/error-codes/E0396.stderr
index a2b73d5789c..fe20b984216 100644
--- a/src/test/ui/error-codes/E0396.stderr
+++ b/src/test/ui/error-codes/E0396.stderr
@@ -1,7 +1,7 @@
 error[E0396]: raw pointers cannot be dereferenced in constants
   --> $DIR/E0396.rs:13:28
    |
-13 | const VALUE: u8 = unsafe { *REG_ADDR }; //~ ERROR E0396
+LL | const VALUE: u8 = unsafe { *REG_ADDR }; //~ ERROR E0396
    |                            ^^^^^^^^^ dereference of raw pointer in constant
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0401.stderr b/src/test/ui/error-codes/E0401.stderr
index a69da16477f..15e1eda7722 100644
--- a/src/test/ui/error-codes/E0401.stderr
+++ b/src/test/ui/error-codes/E0401.stderr
@@ -1,7 +1,7 @@
 error[E0401]: can't use type parameters from outer function; try using a local type parameter instead
   --> $DIR/E0401.rs:12:15
    |
-12 |     fn bar(y: T) { //~ ERROR E0401
+LL |     fn bar(y: T) { //~ ERROR E0401
    |               ^ use of type variable from outer function
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0403.stderr b/src/test/ui/error-codes/E0403.stderr
index 2589be70777..a83d6b67473 100644
--- a/src/test/ui/error-codes/E0403.stderr
+++ b/src/test/ui/error-codes/E0403.stderr
@@ -1,7 +1,7 @@
 error[E0403]: the name `T` is already used for a type parameter in this type parameter list
   --> $DIR/E0403.rs:11:11
    |
-11 | fn foo<T, T>(s: T, u: T) {} //~ ERROR E0403
+LL | fn foo<T, T>(s: T, u: T) {} //~ ERROR E0403
    |        -  ^ already used
    |        |
    |        first use of `T`
diff --git a/src/test/ui/error-codes/E0404.stderr b/src/test/ui/error-codes/E0404.stderr
index 75e36157b98..d49c0f3ea5e 100644
--- a/src/test/ui/error-codes/E0404.stderr
+++ b/src/test/ui/error-codes/E0404.stderr
@@ -1,7 +1,7 @@
 error[E0404]: expected trait, found struct `Foo`
   --> $DIR/E0404.rs:14:6
    |
-14 | impl Foo for Bar {} //~ ERROR E0404
+LL | impl Foo for Bar {} //~ ERROR E0404
    |      ^^^ not a trait
 
 error: cannot continue compilation due to previous error
diff --git a/src/test/ui/error-codes/E0405.stderr b/src/test/ui/error-codes/E0405.stderr
index 269b03179e0..0019e16d7f3 100644
--- a/src/test/ui/error-codes/E0405.stderr
+++ b/src/test/ui/error-codes/E0405.stderr
@@ -1,7 +1,7 @@
 error[E0405]: cannot find trait `SomeTrait` in this scope
   --> $DIR/E0405.rs:13:6
    |
-13 | impl SomeTrait for Foo {} //~ ERROR E0405
+LL | impl SomeTrait for Foo {} //~ ERROR E0405
    |      ^^^^^^^^^ not found in this scope
 
 error: cannot continue compilation due to previous error
diff --git a/src/test/ui/error-codes/E0407.stderr b/src/test/ui/error-codes/E0407.stderr
index 28486c92bf5..2e2bc3aeb55 100644
--- a/src/test/ui/error-codes/E0407.stderr
+++ b/src/test/ui/error-codes/E0407.stderr
@@ -1,7 +1,7 @@
 error[E0407]: method `b` is not a member of trait `Foo`
   --> $DIR/E0407.rs:19:5
    |
-19 |     fn b() {}
+LL |     fn b() {}
    |     ^^^^^^^^^ not a member of trait `Foo`
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0408.stderr b/src/test/ui/error-codes/E0408.stderr
index 4280947c574..1f928275bd5 100644
--- a/src/test/ui/error-codes/E0408.stderr
+++ b/src/test/ui/error-codes/E0408.stderr
@@ -1,7 +1,7 @@
 error[E0408]: variable `y` is not bound in all patterns
   --> $DIR/E0408.rs:15:19
    |
-15 |         Some(y) | None => {} //~  ERROR variable `y` is not bound in all patterns
+LL |         Some(y) | None => {} //~  ERROR variable `y` is not bound in all patterns
    |              -    ^^^^ pattern doesn't bind `y`
    |              |
    |              variable not in all patterns
diff --git a/src/test/ui/error-codes/E0411.stderr b/src/test/ui/error-codes/E0411.stderr
index b2727806655..b0336d7d668 100644
--- a/src/test/ui/error-codes/E0411.stderr
+++ b/src/test/ui/error-codes/E0411.stderr
@@ -1,7 +1,7 @@
 error[E0411]: cannot find type `Self` in this scope
   --> $DIR/E0411.rs:12:6
    |
-12 |     <Self>::foo; //~ ERROR E0411
+LL |     <Self>::foo; //~ ERROR E0411
    |      ^^^^ `Self` is only available in traits and impls
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0412.stderr b/src/test/ui/error-codes/E0412.stderr
index daeef5bdfce..4444af73a7e 100644
--- a/src/test/ui/error-codes/E0412.stderr
+++ b/src/test/ui/error-codes/E0412.stderr
@@ -1,7 +1,7 @@
 error[E0412]: cannot find type `Something` in this scope
   --> $DIR/E0412.rs:11:6
    |
-11 | impl Something {} //~ ERROR E0412
+LL | impl Something {} //~ ERROR E0412
    |      ^^^^^^^^^ not found in this scope
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0415.stderr b/src/test/ui/error-codes/E0415.stderr
index 9ae1700727a..82c6284e433 100644
--- a/src/test/ui/error-codes/E0415.stderr
+++ b/src/test/ui/error-codes/E0415.stderr
@@ -1,7 +1,7 @@
 error[E0415]: identifier `f` is bound more than once in this parameter list
   --> $DIR/E0415.rs:11:16
    |
-11 | fn foo(f: i32, f: i32) {} //~ ERROR E0415
+LL | fn foo(f: i32, f: i32) {} //~ ERROR E0415
    |                ^ used as parameter more than once
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0416.stderr b/src/test/ui/error-codes/E0416.stderr
index b86cc8d6729..35daf20a223 100644
--- a/src/test/ui/error-codes/E0416.stderr
+++ b/src/test/ui/error-codes/E0416.stderr
@@ -1,7 +1,7 @@
 error[E0416]: identifier `x` is bound more than once in the same pattern
   --> $DIR/E0416.rs:13:13
    |
-13 |         (x, x) => {} //~ ERROR E0416
+LL |         (x, x) => {} //~ ERROR E0416
    |             ^ used in a pattern more than once
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0423.stderr b/src/test/ui/error-codes/E0423.stderr
index 7bc9bc2b43b..112754e75b8 100644
--- a/src/test/ui/error-codes/E0423.stderr
+++ b/src/test/ui/error-codes/E0423.stderr
@@ -1,7 +1,7 @@
 error[E0423]: expected function, found struct `Foo`
   --> $DIR/E0423.rs:14:13
    |
-14 |     let f = Foo(); //~ ERROR E0423
+LL |     let f = Foo(); //~ ERROR E0423
    |             ^^^ did you mean `Foo { /* fields */ }`?
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0424.stderr b/src/test/ui/error-codes/E0424.stderr
index f778af9f411..5f2d5673067 100644
--- a/src/test/ui/error-codes/E0424.stderr
+++ b/src/test/ui/error-codes/E0424.stderr
@@ -1,7 +1,7 @@
 error[E0424]: expected value, found module `self`
   --> $DIR/E0424.rs:17:9
    |
-17 |         self.bar(); //~ ERROR E0424
+LL |         self.bar(); //~ ERROR E0424
    |         ^^^^ `self` value is only available in methods with `self` parameter
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0425.stderr b/src/test/ui/error-codes/E0425.stderr
index d836b9ddfda..9d27e4f5944 100644
--- a/src/test/ui/error-codes/E0425.stderr
+++ b/src/test/ui/error-codes/E0425.stderr
@@ -1,7 +1,7 @@
 error[E0425]: cannot find value `elf` in this scope
   --> $DIR/E0425.rs:13:9
    |
-13 |         elf; //~ ERROR E0425
+LL |         elf; //~ ERROR E0425
    |         ^^^ not found in this scope
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0426.stderr b/src/test/ui/error-codes/E0426.stderr
index 088a6db16ac..5e0bc69b1eb 100644
--- a/src/test/ui/error-codes/E0426.stderr
+++ b/src/test/ui/error-codes/E0426.stderr
@@ -1,7 +1,7 @@
 error[E0426]: use of undeclared label `'a`
   --> $DIR/E0426.rs:13:15
    |
-13 |         break 'a;
+LL |         break 'a;
    |               ^^ undeclared label `'a`
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0428.stderr b/src/test/ui/error-codes/E0428.stderr
index 1e9072e65db..20f734af081 100644
--- a/src/test/ui/error-codes/E0428.stderr
+++ b/src/test/ui/error-codes/E0428.stderr
@@ -1,9 +1,9 @@
 error[E0428]: the name `Bar` is defined multiple times
   --> $DIR/E0428.rs:12:1
    |
-11 | struct Bar; //~ previous definition of the type `Bar` here
+LL | struct Bar; //~ previous definition of the type `Bar` here
    | ----------- previous definition of the type `Bar` here
-12 | struct Bar; //~ ERROR E0428
+LL | struct Bar; //~ ERROR E0428
    | ^^^^^^^^^^^ `Bar` redefined here
    |
    = note: `Bar` must be defined only once in the type namespace of this module
diff --git a/src/test/ui/error-codes/E0429.stderr b/src/test/ui/error-codes/E0429.stderr
index b5a78e6d352..a72c77360b5 100644
--- a/src/test/ui/error-codes/E0429.stderr
+++ b/src/test/ui/error-codes/E0429.stderr
@@ -1,7 +1,7 @@
 error[E0429]: `self` imports are only allowed within a { } list
   --> $DIR/E0429.rs:11:5
    |
-11 | use std::fmt::self; //~ ERROR E0429
+LL | use std::fmt::self; //~ ERROR E0429
    |     ^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0430.stderr b/src/test/ui/error-codes/E0430.stderr
index 0bc6ffb6bf9..bdff2dd3b2f 100644
--- a/src/test/ui/error-codes/E0430.stderr
+++ b/src/test/ui/error-codes/E0430.stderr
@@ -1,7 +1,7 @@
 error[E0430]: `self` import can only appear once in an import list
   --> $DIR/E0430.rs:11:16
    |
-11 | use std::fmt::{self, self}; //~ ERROR E0430
+LL | use std::fmt::{self, self}; //~ ERROR E0430
    |                ^^^^  ---- another `self` import appears here
    |                |
    |                can only appear once in an import list
@@ -9,7 +9,7 @@ error[E0430]: `self` import can only appear once in an import list
 error[E0252]: the name `fmt` is defined multiple times
   --> $DIR/E0430.rs:11:22
    |
-11 | use std::fmt::{self, self}; //~ ERROR E0430
+LL | use std::fmt::{self, self}; //~ ERROR E0430
    |                ----  ^^^^ `fmt` reimported here
    |                |
    |                previous import of the module `fmt` here
diff --git a/src/test/ui/error-codes/E0431.stderr b/src/test/ui/error-codes/E0431.stderr
index 29fbaf2a677..364ba0aa957 100644
--- a/src/test/ui/error-codes/E0431.stderr
+++ b/src/test/ui/error-codes/E0431.stderr
@@ -1,7 +1,7 @@
 error[E0431]: `self` import can only appear in an import list with a non-empty prefix
   --> $DIR/E0431.rs:11:6
    |
-11 | use {self}; //~ ERROR E0431
+LL | use {self}; //~ ERROR E0431
    |      ^^^^ can only appear in an import list with a non-empty prefix
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0432.stderr b/src/test/ui/error-codes/E0432.stderr
index 4b47ceb3aa6..747b337d363 100644
--- a/src/test/ui/error-codes/E0432.stderr
+++ b/src/test/ui/error-codes/E0432.stderr
@@ -1,7 +1,7 @@
 error[E0432]: unresolved import `something`
   --> $DIR/E0432.rs:11:5
    |
-11 | use something::Foo; //~ ERROR E0432
+LL | use something::Foo; //~ ERROR E0432
    |     ^^^^^^^^^ Maybe a missing `extern crate something;`?
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0433.stderr b/src/test/ui/error-codes/E0433.stderr
index 46cc308992d..7635d9738ad 100644
--- a/src/test/ui/error-codes/E0433.stderr
+++ b/src/test/ui/error-codes/E0433.stderr
@@ -1,7 +1,7 @@
 error[E0433]: failed to resolve. Use of undeclared type or module `HashMap`
   --> $DIR/E0433.rs:12:15
    |
-12 |     let map = HashMap::new(); //~ ERROR E0433
+LL |     let map = HashMap::new(); //~ ERROR E0433
    |               ^^^^^^^ Use of undeclared type or module `HashMap`
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0434.stderr b/src/test/ui/error-codes/E0434.stderr
index 3963b4ec695..b13c0cf7971 100644
--- a/src/test/ui/error-codes/E0434.stderr
+++ b/src/test/ui/error-codes/E0434.stderr
@@ -1,7 +1,7 @@
 error[E0434]: can't capture dynamic environment in a fn item
   --> $DIR/E0434.rs:14:9
    |
-14 |         y //~ ERROR E0434
+LL |         y //~ ERROR E0434
    |         ^
    |
    = help: use the `|| { ... }` closure form instead
diff --git a/src/test/ui/error-codes/E0435.stderr b/src/test/ui/error-codes/E0435.stderr
index e3468ca409e..5ca79e72c2b 100644
--- a/src/test/ui/error-codes/E0435.stderr
+++ b/src/test/ui/error-codes/E0435.stderr
@@ -1,7 +1,7 @@
 error[E0435]: attempt to use a non-constant value in a constant
   --> $DIR/E0435.rs:13:17
    |
-13 |     let _: [u8; foo]; //~ ERROR E0435
+LL |     let _: [u8; foo]; //~ ERROR E0435
    |                 ^^^ non-constant value
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0437.stderr b/src/test/ui/error-codes/E0437.stderr
index 7cb07e98470..408924b0439 100644
--- a/src/test/ui/error-codes/E0437.stderr
+++ b/src/test/ui/error-codes/E0437.stderr
@@ -1,7 +1,7 @@
 error[E0437]: type `Bar` is not a member of trait `Foo`
   --> $DIR/E0437.rs:14:5
    |
-14 |     type Bar = bool; //~ ERROR E0437
+LL |     type Bar = bool; //~ ERROR E0437
    |     ^^^^^^^^^^^^^^^^ not a member of trait `Foo`
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0438.stderr b/src/test/ui/error-codes/E0438.stderr
index ecea63eb86f..b636236e41a 100644
--- a/src/test/ui/error-codes/E0438.stderr
+++ b/src/test/ui/error-codes/E0438.stderr
@@ -1,7 +1,7 @@
 error[E0438]: const `BAR` is not a member of trait `Bar`
   --> $DIR/E0438.rs:15:5
    |
-15 |     const BAR: bool = true; //~ ERROR E0438
+LL |     const BAR: bool = true; //~ ERROR E0438
    |     ^^^^^^^^^^^^^^^^^^^^^^^ not a member of trait `Bar`
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0439.stderr b/src/test/ui/error-codes/E0439.stderr
index 418a8b67005..27a09043125 100644
--- a/src/test/ui/error-codes/E0439.stderr
+++ b/src/test/ui/error-codes/E0439.stderr
@@ -1,7 +1,7 @@
 error[E0439]: invalid `simd_shuffle`, needs length: `simd_shuffle`
   --> $DIR/E0439.rs:14:5
    |
-14 |     fn simd_shuffle<A,B>(a: A, b: A, c: [u32; 8]) -> B; //~ ERROR E0439
+LL |     fn simd_shuffle<A,B>(a: A, b: A, c: [u32; 8]) -> B; //~ ERROR E0439
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0440.stderr b/src/test/ui/error-codes/E0440.stderr
index 32eef81cf59..c9ac1b8261b 100644
--- a/src/test/ui/error-codes/E0440.stderr
+++ b/src/test/ui/error-codes/E0440.stderr
@@ -1,7 +1,7 @@
 error[E0440]: platform-specific intrinsic has wrong number of type parameters: found 1, expected 0
   --> $DIR/E0440.rs:18:5
    |
-18 |     fn x86_mm_movemask_pd<T>(x: f64x2) -> i32; //~ ERROR E0440
+LL |     fn x86_mm_movemask_pd<T>(x: f64x2) -> i32; //~ ERROR E0440
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0441.stderr b/src/test/ui/error-codes/E0441.stderr
index d8bcc3d1396..1cb4193bd34 100644
--- a/src/test/ui/error-codes/E0441.stderr
+++ b/src/test/ui/error-codes/E0441.stderr
@@ -1,7 +1,7 @@
 error[E0441]: unrecognized platform-specific intrinsic function: `x86_mm_adds_ep16`
   --> $DIR/E0441.rs:18:5
    |
-18 |     fn x86_mm_adds_ep16(x: i16x8, y: i16x8) -> i16x8; //~ ERROR E0441
+LL |     fn x86_mm_adds_ep16(x: i16x8, y: i16x8) -> i16x8; //~ ERROR E0441
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0442.stderr b/src/test/ui/error-codes/E0442.stderr
index 86cfb607c2e..2119ea11a66 100644
--- a/src/test/ui/error-codes/E0442.stderr
+++ b/src/test/ui/error-codes/E0442.stderr
@@ -1,19 +1,19 @@
 error[E0442]: intrinsic argument 1 has wrong type: found vector with length 16, expected length 8
   --> $DIR/E0442.rs:23:5
    |
-23 |     fn x86_mm_adds_epi16(x: i8x16, y: i32x4) -> i64x2;
+LL |     fn x86_mm_adds_epi16(x: i8x16, y: i32x4) -> i64x2;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0442]: intrinsic argument 2 has wrong type: found vector with length 4, expected length 8
   --> $DIR/E0442.rs:23:5
    |
-23 |     fn x86_mm_adds_epi16(x: i8x16, y: i32x4) -> i64x2;
+LL |     fn x86_mm_adds_epi16(x: i8x16, y: i32x4) -> i64x2;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0442]: intrinsic return value has wrong type: found vector with length 2, expected length 8
   --> $DIR/E0442.rs:23:5
    |
-23 |     fn x86_mm_adds_epi16(x: i8x16, y: i32x4) -> i64x2;
+LL |     fn x86_mm_adds_epi16(x: i8x16, y: i32x4) -> i64x2;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/error-codes/E0443.stderr b/src/test/ui/error-codes/E0443.stderr
index b929ff049d0..8a08bd9762e 100644
--- a/src/test/ui/error-codes/E0443.stderr
+++ b/src/test/ui/error-codes/E0443.stderr
@@ -1,7 +1,7 @@
 error[E0443]: intrinsic return value has wrong type: found `i64x8`, expected `i16x8` which was used for this vector type previously in this signature
   --> $DIR/E0443.rs:20:5
    |
-20 |     fn x86_mm_adds_epi16(x: i16x8, y: i16x8) -> i64x8; //~ ERROR E0443
+LL |     fn x86_mm_adds_epi16(x: i16x8, y: i16x8) -> i64x8; //~ ERROR E0443
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0444.stderr b/src/test/ui/error-codes/E0444.stderr
index f1d3064c0de..7e20e47b165 100644
--- a/src/test/ui/error-codes/E0444.stderr
+++ b/src/test/ui/error-codes/E0444.stderr
@@ -1,7 +1,7 @@
 error[E0444]: platform-specific intrinsic has invalid number of arguments: found 3, expected 1
   --> $DIR/E0444.rs:18:5
    |
-18 |     fn x86_mm_movemask_pd(x: f64x2, y: f64x2, z: f64x2) -> i32; //~ ERROR E0444
+LL |     fn x86_mm_movemask_pd(x: f64x2, y: f64x2, z: f64x2) -> i32; //~ ERROR E0444
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0445.stderr b/src/test/ui/error-codes/E0445.stderr
index c7f59695e0c..6e0616277f4 100644
--- a/src/test/ui/error-codes/E0445.stderr
+++ b/src/test/ui/error-codes/E0445.stderr
@@ -1,19 +1,19 @@
 error[E0445]: private trait `Foo` in public interface
   --> $DIR/E0445.rs:15:1
    |
-15 | pub trait Bar : Foo {}
+LL | pub trait Bar : Foo {}
    | ^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait
 
 error[E0445]: private trait `Foo` in public interface
   --> $DIR/E0445.rs:18:1
    |
-18 | pub struct Bar2<T: Foo>(pub T);
+LL | pub struct Bar2<T: Foo>(pub T);
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait
 
 error[E0445]: private trait `Foo` in public interface
   --> $DIR/E0445.rs:21:1
    |
-21 | pub fn foo<T: Foo> (t: T) {}
+LL | pub fn foo<T: Foo> (t: T) {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/error-codes/E0446.stderr b/src/test/ui/error-codes/E0446.stderr
index ceb949f884c..067fdb47da9 100644
--- a/src/test/ui/error-codes/E0446.stderr
+++ b/src/test/ui/error-codes/E0446.stderr
@@ -1,9 +1,9 @@
 error[E0446]: private type `Foo::Bar` in public interface
   --> $DIR/E0446.rs:14:5
    |
-14 | /     pub fn bar() -> Bar { //~ ERROR E0446
-15 | |         Bar(0)
-16 | |     }
+LL | /     pub fn bar() -> Bar { //~ ERROR E0446
+LL | |         Bar(0)
+LL | |     }
    | |_____^ can't leak private type
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0449.stderr b/src/test/ui/error-codes/E0449.stderr
index 4ec7178ba6c..68ec6379d71 100644
--- a/src/test/ui/error-codes/E0449.stderr
+++ b/src/test/ui/error-codes/E0449.stderr
@@ -1,7 +1,7 @@
 error[E0449]: unnecessary visibility qualifier
   --> $DIR/E0449.rs:17:1
    |
-17 | pub impl Bar {} //~ ERROR E0449
+LL | pub impl Bar {} //~ ERROR E0449
    | ^^^ `pub` not needed here
    |
    = note: place qualifiers on individual impl items instead
@@ -9,13 +9,13 @@ error[E0449]: unnecessary visibility qualifier
 error[E0449]: unnecessary visibility qualifier
   --> $DIR/E0449.rs:19:1
    |
-19 | pub impl Foo for Bar { //~ ERROR E0449
+LL | pub impl Foo for Bar { //~ ERROR E0449
    | ^^^ `pub` not needed here
 
 error[E0449]: unnecessary visibility qualifier
   --> $DIR/E0449.rs:20:5
    |
-20 |     pub fn foo() {} //~ ERROR E0449
+LL |     pub fn foo() {} //~ ERROR E0449
    |     ^^^ `pub` not needed here
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/error-codes/E0451.stderr b/src/test/ui/error-codes/E0451.stderr
index a1c4929fce7..003a93811bd 100644
--- a/src/test/ui/error-codes/E0451.stderr
+++ b/src/test/ui/error-codes/E0451.stderr
@@ -1,13 +1,13 @@
 error[E0451]: field `b` of struct `Bar::Foo` is private
   --> $DIR/E0451.rs:24:23
    |
-24 |     let Bar::Foo{a:a, b:b} = foo; //~ ERROR E0451
+LL |     let Bar::Foo{a:a, b:b} = foo; //~ ERROR E0451
    |                       ^^^ field `b` is private
 
 error[E0451]: field `b` of struct `Bar::Foo` is private
   --> $DIR/E0451.rs:28:29
    |
-28 |     let f = Bar::Foo{ a: 0, b: 0 }; //~ ERROR E0451
+LL |     let f = Bar::Foo{ a: 0, b: 0 }; //~ ERROR E0451
    |                             ^^^^ field `b` is private
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/error-codes/E0452.stderr b/src/test/ui/error-codes/E0452.stderr
index 36c6052abb1..6e4b47e9631 100644
--- a/src/test/ui/error-codes/E0452.stderr
+++ b/src/test/ui/error-codes/E0452.stderr
@@ -1,7 +1,7 @@
 error[E0452]: malformed lint attribute
   --> $DIR/E0452.rs:11:10
    |
-11 | #![allow(foo = "")] //~ ERROR E0452
+LL | #![allow(foo = "")] //~ ERROR E0452
    |          ^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0453.stderr b/src/test/ui/error-codes/E0453.stderr
index affad8a5861..cb08dd3d7bd 100644
--- a/src/test/ui/error-codes/E0453.stderr
+++ b/src/test/ui/error-codes/E0453.stderr
@@ -1,10 +1,10 @@
 error[E0453]: allow(non_snake_case) overruled by outer forbid(non_snake_case)
   --> $DIR/E0453.rs:13:9
    |
-11 | #![forbid(non_snake_case)]
+LL | #![forbid(non_snake_case)]
    |           -------------- `forbid` level set here
 12 | 
-13 | #[allow(non_snake_case)]
+LL | #[allow(non_snake_case)]
    |         ^^^^^^^^^^^^^^ overruled by previous forbid
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0454.stderr b/src/test/ui/error-codes/E0454.stderr
index e127a54dc10..11f1958bf96 100644
--- a/src/test/ui/error-codes/E0454.stderr
+++ b/src/test/ui/error-codes/E0454.stderr
@@ -1,7 +1,7 @@
 error[E0454]: #[link(name = "")] given with empty name
   --> $DIR/E0454.rs:11:1
    |
-11 | #[link(name = "")] extern {}
+LL | #[link(name = "")] extern {}
    | ^^^^^^^^^^^^^^^^^^ empty name given
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0458.stderr b/src/test/ui/error-codes/E0458.stderr
index 2ecc7772598..4bcafa47d35 100644
--- a/src/test/ui/error-codes/E0458.stderr
+++ b/src/test/ui/error-codes/E0458.stderr
@@ -1,13 +1,13 @@
 error[E0458]: unknown kind: `wonderful_unicorn`
   --> $DIR/E0458.rs:11:1
    |
-11 | #[link(kind = "wonderful_unicorn")] extern {} //~ ERROR E0458
+LL | #[link(kind = "wonderful_unicorn")] extern {} //~ ERROR E0458
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unknown kind
 
 error[E0459]: #[link(...)] specified without `name = "foo"`
   --> $DIR/E0458.rs:11:1
    |
-11 | #[link(kind = "wonderful_unicorn")] extern {} //~ ERROR E0458
+LL | #[link(kind = "wonderful_unicorn")] extern {} //~ ERROR E0458
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `name` argument
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/error-codes/E0459.stderr b/src/test/ui/error-codes/E0459.stderr
index b6d5f8983b3..c443e78ab3a 100644
--- a/src/test/ui/error-codes/E0459.stderr
+++ b/src/test/ui/error-codes/E0459.stderr
@@ -1,7 +1,7 @@
 error[E0459]: #[link(...)] specified without `name = "foo"`
   --> $DIR/E0459.rs:11:1
    |
-11 | #[link(kind = "dylib")] extern {} //~ ERROR E0459
+LL | #[link(kind = "dylib")] extern {} //~ ERROR E0459
    | ^^^^^^^^^^^^^^^^^^^^^^^ missing `name` argument
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0463.stderr b/src/test/ui/error-codes/E0463.stderr
index 830d48e57f7..41575b70d15 100644
--- a/src/test/ui/error-codes/E0463.stderr
+++ b/src/test/ui/error-codes/E0463.stderr
@@ -1,7 +1,7 @@
 error[E0463]: can't find crate for `cookie_monster`
   --> $DIR/E0463.rs:12:11
    |
-12 | #![plugin(cookie_monster)]
+LL | #![plugin(cookie_monster)]
    |           ^^^^^^^^^^^^^^ can't find crate
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0478.stderr b/src/test/ui/error-codes/E0478.stderr
index 53d3e5c0138..bbc243a3757 100644
--- a/src/test/ui/error-codes/E0478.stderr
+++ b/src/test/ui/error-codes/E0478.stderr
@@ -1,18 +1,18 @@
 error[E0478]: lifetime bound not satisfied
   --> $DIR/E0478.rs:14:5
    |
-14 |     child: Box<Wedding<'kiss> + 'SnowWhite>, //~ ERROR E0478
+LL |     child: Box<Wedding<'kiss> + 'SnowWhite>, //~ ERROR E0478
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: lifetime parameter instantiated with the lifetime 'SnowWhite as defined on the struct at 13:1
   --> $DIR/E0478.rs:13:1
    |
-13 | struct Prince<'kiss, 'SnowWhite> {
+LL | struct Prince<'kiss, 'SnowWhite> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: but lifetime parameter must outlive the lifetime 'kiss as defined on the struct at 13:1
   --> $DIR/E0478.rs:13:1
    |
-13 | struct Prince<'kiss, 'SnowWhite> {
+LL | struct Prince<'kiss, 'SnowWhite> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0492.stderr b/src/test/ui/error-codes/E0492.stderr
index e08878a9e8d..359c63bb8ff 100644
--- a/src/test/ui/error-codes/E0492.stderr
+++ b/src/test/ui/error-codes/E0492.stderr
@@ -1,7 +1,7 @@
 error[E0492]: cannot borrow a constant which may contain interior mutability, create a static instead
   --> $DIR/E0492.rs:14:34
    |
-14 | static B: &'static AtomicUsize = &A; //~ ERROR E0492
+LL | static B: &'static AtomicUsize = &A; //~ ERROR E0492
    |                                  ^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0494.stderr b/src/test/ui/error-codes/E0494.stderr
index e0dda17cea0..82dd74c012b 100644
--- a/src/test/ui/error-codes/E0494.stderr
+++ b/src/test/ui/error-codes/E0494.stderr
@@ -1,7 +1,7 @@
 error[E0494]: cannot refer to the interior of another static, use a constant instead
   --> $DIR/E0494.rs:16:27
    |
-16 | static A : &'static u32 = &S.a; //~ ERROR E0494
+LL | static A : &'static u32 = &S.a; //~ ERROR E0494
    |                           ^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0496.stderr b/src/test/ui/error-codes/E0496.stderr
index c68e8810f56..945c2391d03 100644
--- a/src/test/ui/error-codes/E0496.stderr
+++ b/src/test/ui/error-codes/E0496.stderr
@@ -1,9 +1,9 @@
 error[E0496]: lifetime name `'a` shadows a lifetime name that is already in scope
   --> $DIR/E0496.rs:16:10
    |
-15 | impl<'a> Foo<'a> {
+LL | impl<'a> Foo<'a> {
    |      -- first declared here
-16 |     fn f<'a>(x: &'a i32) { //~ ERROR E0496
+LL |     fn f<'a>(x: &'a i32) { //~ ERROR E0496
    |          ^^ lifetime 'a already in scope
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0499.stderr b/src/test/ui/error-codes/E0499.stderr
index 7bb752be432..5332df0c235 100644
--- a/src/test/ui/error-codes/E0499.stderr
+++ b/src/test/ui/error-codes/E0499.stderr
@@ -1,11 +1,11 @@
 error[E0499]: cannot borrow `i` as mutable more than once at a time
   --> $DIR/E0499.rs:14:22
    |
-13 |     let mut x = &mut i;
+LL |     let mut x = &mut i;
    |                      - first mutable borrow occurs here
-14 |     let mut a = &mut i; //~ ERROR E0499
+LL |     let mut a = &mut i; //~ ERROR E0499
    |                      ^ second mutable borrow occurs here
-15 | }
+LL | }
    | - first borrow ends here
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0502.stderr b/src/test/ui/error-codes/E0502.stderr
index ae96fa38f64..07430990f0a 100644
--- a/src/test/ui/error-codes/E0502.stderr
+++ b/src/test/ui/error-codes/E0502.stderr
@@ -1,11 +1,11 @@
 error[E0502]: cannot borrow `*a` as mutable because `a` is also borrowed as immutable
   --> $DIR/E0502.rs:14:9
    |
-13 |     let ref y = a;
+LL |     let ref y = a;
    |         ----- immutable borrow occurs here
-14 |     bar(a); //~ ERROR E0502
+LL |     bar(a); //~ ERROR E0502
    |         ^ mutable borrow occurs here
-15 | }
+LL | }
    | - immutable borrow ends here
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0503.stderr b/src/test/ui/error-codes/E0503.stderr
index 23a1e13b4a5..ac6634cb64f 100644
--- a/src/test/ui/error-codes/E0503.stderr
+++ b/src/test/ui/error-codes/E0503.stderr
@@ -1,9 +1,9 @@
 error[E0503]: cannot use `value` because it was mutably borrowed
   --> $DIR/E0503.rs:14:16
    |
-13 |     let _borrow = &mut value;
+LL |     let _borrow = &mut value;
    |                        ----- borrow of `value` occurs here
-14 |     let _sum = value + 1; //~ ERROR E0503
+LL |     let _sum = value + 1; //~ ERROR E0503
    |                ^^^^^ use of borrowed `value`
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0504.stderr b/src/test/ui/error-codes/E0504.stderr
index 4003c8ed4dd..9f3bd79dcfe 100644
--- a/src/test/ui/error-codes/E0504.stderr
+++ b/src/test/ui/error-codes/E0504.stderr
@@ -1,10 +1,10 @@
 error[E0504]: cannot move `fancy_num` into closure because it is borrowed
   --> $DIR/E0504.rs:20:40
    |
-17 |     let fancy_ref = &fancy_num;
+LL |     let fancy_ref = &fancy_num;
    |                      --------- borrow of `fancy_num` occurs here
 ...
-20 |         println!("child function: {}", fancy_num.num); //~ ERROR E0504
+LL |         println!("child function: {}", fancy_num.num); //~ ERROR E0504
    |                                        ^^^^^^^^^ move into closure occurs here
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0505.stderr b/src/test/ui/error-codes/E0505.stderr
index d2db97835b8..71392857d0a 100644
--- a/src/test/ui/error-codes/E0505.stderr
+++ b/src/test/ui/error-codes/E0505.stderr
@@ -1,9 +1,9 @@
 error[E0505]: cannot move out of `x` because it is borrowed
   --> $DIR/E0505.rs:19:13
    |
-18 |         let _ref_to_val: &Value = &x;
+LL |         let _ref_to_val: &Value = &x;
    |                                    - borrow of `x` occurs here
-19 |         eat(x); //~ ERROR E0505
+LL |         eat(x); //~ ERROR E0505
    |             ^ move out of `x` occurs here
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0507.stderr b/src/test/ui/error-codes/E0507.stderr
index 59345a23703..de94648ec0b 100644
--- a/src/test/ui/error-codes/E0507.stderr
+++ b/src/test/ui/error-codes/E0507.stderr
@@ -1,7 +1,7 @@
 error[E0507]: cannot move out of borrowed content
   --> $DIR/E0507.rs:22:5
    |
-22 |     x.borrow().nothing_is_true(); //~ ERROR E0507
+LL |     x.borrow().nothing_is_true(); //~ ERROR E0507
    |     ^^^^^^^^^^ cannot move out of borrowed content
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0509.stderr b/src/test/ui/error-codes/E0509.stderr
index 8e0638697c6..3bc2a4450a1 100644
--- a/src/test/ui/error-codes/E0509.stderr
+++ b/src/test/ui/error-codes/E0509.stderr
@@ -1,7 +1,7 @@
 error[E0509]: cannot move out of type `DropStruct`, which implements the `Drop` trait
   --> $DIR/E0509.rs:26:23
    |
-26 |     let fancy_field = drop_struct.fancy; //~ ERROR E0509
+LL |     let fancy_field = drop_struct.fancy; //~ ERROR E0509
    |                       ^^^^^^^^^^^^^^^^^
    |                       |
    |                       cannot move out of here
diff --git a/src/test/ui/error-codes/E0511.stderr b/src/test/ui/error-codes/E0511.stderr
index a926535c938..0273735562d 100644
--- a/src/test/ui/error-codes/E0511.stderr
+++ b/src/test/ui/error-codes/E0511.stderr
@@ -1,7 +1,7 @@
 error[E0511]: invalid monomorphization of `simd_add` intrinsic: expected SIMD input type, found non-SIMD `i32`
   --> $DIR/E0511.rs:18:14
    |
-18 |     unsafe { simd_add(0, 1); } //~ ERROR E0511
+LL |     unsafe { simd_add(0, 1); } //~ ERROR E0511
    |              ^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0512.stderr b/src/test/ui/error-codes/E0512.stderr
index ca2845d6e55..bcce48c0cd5 100644
--- a/src/test/ui/error-codes/E0512.stderr
+++ b/src/test/ui/error-codes/E0512.stderr
@@ -1,7 +1,7 @@
 error[E0512]: transmute called with types of different sizes
   --> $DIR/E0512.rs:14:23
    |
-14 |     unsafe { takes_u8(::std::mem::transmute(0u16)); } //~ ERROR E0512
+LL |     unsafe { takes_u8(::std::mem::transmute(0u16)); } //~ ERROR E0512
    |                       ^^^^^^^^^^^^^^^^^^^^^
    |
    = note: source type: u16 (16 bits)
diff --git a/src/test/ui/error-codes/E0516.stderr b/src/test/ui/error-codes/E0516.stderr
index 3417ac19ab0..bae85cabced 100644
--- a/src/test/ui/error-codes/E0516.stderr
+++ b/src/test/ui/error-codes/E0516.stderr
@@ -1,7 +1,7 @@
 error[E0516]: `typeof` is a reserved keyword but unimplemented
   --> $DIR/E0516.rs:12:12
    |
-12 |     let x: typeof(92) = 92; //~ ERROR E0516
+LL |     let x: typeof(92) = 92; //~ ERROR E0516
    |            ^^^^^^^^^^ reserved keyword
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0517.stderr b/src/test/ui/error-codes/E0517.stderr
index 8dc45703fe9..fbaeb6fabbb 100644
--- a/src/test/ui/error-codes/E0517.stderr
+++ b/src/test/ui/error-codes/E0517.stderr
@@ -1,34 +1,34 @@
 error[E0517]: attribute should be applied to struct, enum or union
   --> $DIR/E0517.rs:11:8
    |
-11 | #[repr(C)] //~ ERROR: E0517
+LL | #[repr(C)] //~ ERROR: E0517
    |        ^
-12 | type Foo = u8;
+LL | type Foo = u8;
    | -------------- not a struct, enum or union
 
 error[E0517]: attribute should be applied to struct or union
   --> $DIR/E0517.rs:14:8
    |
-14 | #[repr(packed)] //~ ERROR: E0517
+LL | #[repr(packed)] //~ ERROR: E0517
    |        ^^^^^^
-15 | enum Foo2 {Bar, Baz}
+LL | enum Foo2 {Bar, Baz}
    | -------------------- not a struct or union
 
 error[E0517]: attribute should be applied to enum
   --> $DIR/E0517.rs:17:8
    |
-17 | #[repr(u8)] //~ ERROR: E0517
+LL | #[repr(u8)] //~ ERROR: E0517
    |        ^^
-18 | struct Foo3 {bar: bool, baz: bool}
+LL | struct Foo3 {bar: bool, baz: bool}
    | ---------------------------------- not an enum
 
 error[E0517]: attribute should be applied to struct, enum or union
   --> $DIR/E0517.rs:20:8
    |
-20 |   #[repr(C)] //~ ERROR: E0517
+LL |   #[repr(C)] //~ ERROR: E0517
    |          ^
-21 | / impl Foo3 {
-22 | | }
+LL | / impl Foo3 {
+LL | | }
    | |_- not a struct, enum or union
 
 error: aborting due to 4 previous errors
diff --git a/src/test/ui/error-codes/E0518.stderr b/src/test/ui/error-codes/E0518.stderr
index 3120b6a8bfb..3d199c7fa7f 100644
--- a/src/test/ui/error-codes/E0518.stderr
+++ b/src/test/ui/error-codes/E0518.stderr
@@ -1,18 +1,18 @@
 error[E0518]: attribute should be applied to function
   --> $DIR/E0518.rs:11:1
    |
-11 | #[inline(always)] //~ ERROR: E0518
+LL | #[inline(always)] //~ ERROR: E0518
    | ^^^^^^^^^^^^^^^^^
-12 | struct Foo;
+LL | struct Foo;
    | ----------- not a function
 
 error[E0518]: attribute should be applied to function
   --> $DIR/E0518.rs:14:1
    |
-14 |   #[inline(never)] //~ ERROR: E0518
+LL |   #[inline(never)] //~ ERROR: E0518
    |   ^^^^^^^^^^^^^^^^
-15 | / impl Foo {
-16 | | }
+LL | / impl Foo {
+LL | | }
    | |_- not a function
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/error-codes/E0520.stderr b/src/test/ui/error-codes/E0520.stderr
index 9d9e86ac6fc..a79f11f63e7 100644
--- a/src/test/ui/error-codes/E0520.stderr
+++ b/src/test/ui/error-codes/E0520.stderr
@@ -1,12 +1,12 @@
 error[E0520]: `fly` specializes an item from a parent `impl`, but that item is not marked `default`
   --> $DIR/E0520.rs:26:5
    |
-21 | / impl<T: Clone> SpaceLlama for T {
-22 | |     fn fly(&self) {}
-23 | | }
+LL | / impl<T: Clone> SpaceLlama for T {
+LL | |     fn fly(&self) {}
+LL | | }
    | |_- parent `impl` is here
 ...
-26 |       default fn fly(&self) {}
+LL |       default fn fly(&self) {}
    |       ^^^^^^^^^^^^^^^^^^^^^^^^ cannot specialize default item `fly`
    |
    = note: to specialize, `fly` in the parent `impl` must be marked `default`
diff --git a/src/test/ui/error-codes/E0522.stderr b/src/test/ui/error-codes/E0522.stderr
index 3c3527c7ef7..c67e7bea34d 100644
--- a/src/test/ui/error-codes/E0522.stderr
+++ b/src/test/ui/error-codes/E0522.stderr
@@ -3,7 +3,7 @@ error[E0601]: main function not found
 error[E0522]: definition of an unknown language item: `cookie`
   --> $DIR/E0522.rs:13:1
    |
-13 | #[lang = "cookie"]
+LL | #[lang = "cookie"]
    | ^^^^^^^^^^^^^^^^^^ definition of unknown language item `cookie`
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/error-codes/E0527.stderr b/src/test/ui/error-codes/E0527.stderr
index 2041ed2282a..d9f99224057 100644
--- a/src/test/ui/error-codes/E0527.stderr
+++ b/src/test/ui/error-codes/E0527.stderr
@@ -1,7 +1,7 @@
 error[E0527]: pattern requires 2 elements but array has 4
   --> $DIR/E0527.rs:16:10
    |
-16 |         &[a, b] => {
+LL |         &[a, b] => {
    |          ^^^^^^ expected 4 elements
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0528.stderr b/src/test/ui/error-codes/E0528.stderr
index 1b353efd3a9..824fae59588 100644
--- a/src/test/ui/error-codes/E0528.stderr
+++ b/src/test/ui/error-codes/E0528.stderr
@@ -1,7 +1,7 @@
 error[E0528]: pattern requires at least 3 elements but array has 2
   --> $DIR/E0528.rs:16:10
    |
-16 |         &[a, b, c, rest..] => {
+LL |         &[a, b, c, rest..] => {
    |          ^^^^^^^^^^^^^^^^^ pattern cannot match array of 2 elements
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0529.stderr b/src/test/ui/error-codes/E0529.stderr
index bb49f9d6451..5031f717c82 100644
--- a/src/test/ui/error-codes/E0529.stderr
+++ b/src/test/ui/error-codes/E0529.stderr
@@ -1,7 +1,7 @@
 error[E0529]: expected an array or slice, found `f32`
   --> $DIR/E0529.rs:16:9
    |
-16 |         [a, b] => {
+LL |         [a, b] => {
    |         ^^^^^^ pattern cannot match with input type `f32`
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0530.stderr b/src/test/ui/error-codes/E0530.stderr
index 4e92db34b04..2a76eb14087 100644
--- a/src/test/ui/error-codes/E0530.stderr
+++ b/src/test/ui/error-codes/E0530.stderr
@@ -1,10 +1,10 @@
 error[E0530]: match bindings cannot shadow statics
   --> $DIR/E0530.rs:16:9
    |
-12 |     static TEST: i32 = 0;
+LL |     static TEST: i32 = 0;
    |     --------------------- a static `TEST` is defined here
 ...
-16 |         TEST => {} //~ ERROR E0530
+LL |         TEST => {} //~ ERROR E0530
    |         ^^^^ cannot be named the same as a static
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0532.stderr b/src/test/ui/error-codes/E0532.stderr
index 48d7cd5d545..04102f4dbef 100644
--- a/src/test/ui/error-codes/E0532.stderr
+++ b/src/test/ui/error-codes/E0532.stderr
@@ -1,7 +1,7 @@
 error[E0532]: expected tuple struct/variant, found constant `StructConst1`
   --> $DIR/E0532.rs:15:9
    |
-15 |         StructConst1(_) => { },
+LL |         StructConst1(_) => { },
    |         ^^^^^^^^^^^^ not a tuple struct/variant
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0534.stderr b/src/test/ui/error-codes/E0534.stderr
index 58b183cd98d..7f56f6b11f1 100644
--- a/src/test/ui/error-codes/E0534.stderr
+++ b/src/test/ui/error-codes/E0534.stderr
@@ -1,7 +1,7 @@
 error[E0534]: expected one argument
   --> $DIR/E0534.rs:11:1
    |
-11 | #[inline()] //~ ERROR E0534
+LL | #[inline()] //~ ERROR E0534
    | ^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0558.stderr b/src/test/ui/error-codes/E0558.stderr
index 5a4219a5b7d..cf2ee9a1160 100644
--- a/src/test/ui/error-codes/E0558.stderr
+++ b/src/test/ui/error-codes/E0558.stderr
@@ -1,7 +1,7 @@
 error[E0558]: export_name attribute has invalid format
   --> $DIR/E0558.rs:11:1
    |
-11 | #[export_name]
+LL | #[export_name]
    | ^^^^^^^^^^^^^^ did you mean #[export_name="*"]?
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0565-1.stderr b/src/test/ui/error-codes/E0565-1.stderr
index 9491f5ac7e3..f393aa56f9c 100644
--- a/src/test/ui/error-codes/E0565-1.stderr
+++ b/src/test/ui/error-codes/E0565-1.stderr
@@ -1,7 +1,7 @@
 error[E0565]: unsupported literal
   --> $DIR/E0565-1.rs:14:14
    |
-14 | #[deprecated("since")] //~ ERROR E0565
+LL | #[deprecated("since")] //~ ERROR E0565
    |              ^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0565.stderr b/src/test/ui/error-codes/E0565.stderr
index 757c3fcdd7a..c0c1b7b2743 100644
--- a/src/test/ui/error-codes/E0565.stderr
+++ b/src/test/ui/error-codes/E0565.stderr
@@ -1,7 +1,7 @@
 error[E0565]: unsupported literal
   --> $DIR/E0565.rs:14:8
    |
-14 | #[repr("C")] //~ ERROR E0565
+LL | #[repr("C")] //~ ERROR E0565
    |        ^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0572.stderr b/src/test/ui/error-codes/E0572.stderr
index 1abc2222f0e..199476248a4 100644
--- a/src/test/ui/error-codes/E0572.stderr
+++ b/src/test/ui/error-codes/E0572.stderr
@@ -1,7 +1,7 @@
 error[E0572]: return statement outside of function body
   --> $DIR/E0572.rs:11:18
    |
-11 | const FOO: u32 = return 0; //~ ERROR E0572
+LL | const FOO: u32 = return 0; //~ ERROR E0572
    |                  ^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0582.stderr b/src/test/ui/error-codes/E0582.stderr
index 21dd0d4f80a..1bb3049a3f7 100644
--- a/src/test/ui/error-codes/E0582.stderr
+++ b/src/test/ui/error-codes/E0582.stderr
@@ -1,13 +1,13 @@
 error[E0582]: binding for associated type `Output` references lifetime `'a`, which does not appear in the trait input types
   --> $DIR/E0582.rs:38:30
    |
-38 |     where F: for<'a> Fn() -> Option<&'a i32>
+LL |     where F: for<'a> Fn() -> Option<&'a i32>
    |                              ^^^^^^^^^^^^^^^
 
 error[E0582]: binding for associated type `Item` references lifetime `'a`, which does not appear in the trait input types
   --> $DIR/E0582.rs:46:31
    |
-46 |     where F: for<'a> Iterator<Item=&'a i32>
+LL |     where F: for<'a> Iterator<Item=&'a i32>
    |                               ^^^^^^^^^^^^
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/error-codes/E0585.stderr b/src/test/ui/error-codes/E0585.stderr
index 28528c90626..063acd2e653 100644
--- a/src/test/ui/error-codes/E0585.stderr
+++ b/src/test/ui/error-codes/E0585.stderr
@@ -1,7 +1,7 @@
 error[E0585]: found a documentation comment that doesn't document anything
   --> $DIR/E0585.rs:12:5
    |
-12 |     /// Hello! I'm useless...
+LL |     /// Hello! I'm useless...
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: doc comments must come before what they document, maybe a comment was intended with `//`?
diff --git a/src/test/ui/error-codes/E0586.stderr b/src/test/ui/error-codes/E0586.stderr
index 9b4263507a8..35292724498 100644
--- a/src/test/ui/error-codes/E0586.stderr
+++ b/src/test/ui/error-codes/E0586.stderr
@@ -1,7 +1,7 @@
 error[E0586]: inclusive range with no end
   --> $DIR/E0586.rs:13:22
    |
-13 |     let x = &tmp[1..=]; //~ ERROR E0586
+LL |     let x = &tmp[1..=]; //~ ERROR E0586
    |                      ^
    |
    = help: inclusive ranges must be bounded at the end (`..=b` or `a..=b`)
diff --git a/src/test/ui/error-codes/E0597.stderr b/src/test/ui/error-codes/E0597.stderr
index 87a961dbcd2..d0676019687 100644
--- a/src/test/ui/error-codes/E0597.stderr
+++ b/src/test/ui/error-codes/E0597.stderr
@@ -1,10 +1,10 @@
 error[E0597]: `y` does not live long enough
   --> $DIR/E0597.rs:18:17
    |
-18 |     x.x = Some(&y);
+LL |     x.x = Some(&y);
    |                 ^ borrowed value does not live long enough
 19 |     //~^ `y` does not live long enough [E0597]
-20 | }
+LL | }
    | - `y` dropped here while still borrowed
    |
    = note: values in a scope are dropped in the opposite order they are created
diff --git a/src/test/ui/error-codes/E0599.stderr b/src/test/ui/error-codes/E0599.stderr
index ff9ac3cefc0..a9bb3e50295 100644
--- a/src/test/ui/error-codes/E0599.stderr
+++ b/src/test/ui/error-codes/E0599.stderr
@@ -1,10 +1,10 @@
 error[E0599]: no associated item named `NotEvenReal` found for type `Foo` in the current scope
   --> $DIR/E0599.rs:14:15
    |
-11 | struct Foo;
+LL | struct Foo;
    | ----------- associated item `NotEvenReal` not found for this
 ...
-14 |     || if let Foo::NotEvenReal() = Foo {}; //~ ERROR E0599
+LL |     || if let Foo::NotEvenReal() = Foo {}; //~ ERROR E0599
    |               ^^^^^^^^^^^^^^^^^^ associated item not found in `Foo`
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0600.stderr b/src/test/ui/error-codes/E0600.stderr
index 34e1c56fe2f..add05ac3062 100644
--- a/src/test/ui/error-codes/E0600.stderr
+++ b/src/test/ui/error-codes/E0600.stderr
@@ -1,7 +1,7 @@
 error[E0600]: cannot apply unary operator `!` to type `&'static str`
   --> $DIR/E0600.rs:12:5
    |
-12 |     !"a"; //~ ERROR E0600
+LL |     !"a"; //~ ERROR E0600
    |     ^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0602.stderr b/src/test/ui/error-codes/E0602.stderr
index d72b426cf82..fb1144b616d 100644
--- a/src/test/ui/error-codes/E0602.stderr
+++ b/src/test/ui/error-codes/E0602.stderr
@@ -1,6 +1,6 @@
 error[E0602]: unknown lint: `bogus`
-  |
-  = note: requested on the command line with `-D bogus`
+   |
+   = note: requested on the command line with `-D bogus`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/error-codes/E0603.stderr b/src/test/ui/error-codes/E0603.stderr
index 71af28add7b..db451cbc0fc 100644
--- a/src/test/ui/error-codes/E0603.stderr
+++ b/src/test/ui/error-codes/E0603.stderr
@@ -1,7 +1,7 @@
 error[E0603]: constant `PRIVATE` is private
   --> $DIR/E0603.rs:16:5
    |
-16 |     SomeModule::PRIVATE; //~ ERROR E0603
+LL |     SomeModule::PRIVATE; //~ ERROR E0603
    |     ^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0604.stderr b/src/test/ui/error-codes/E0604.stderr
index 28f77417ecc..875f326df37 100644
--- a/src/test/ui/error-codes/E0604.stderr
+++ b/src/test/ui/error-codes/E0604.stderr
@@ -1,7 +1,7 @@
 error[E0604]: only `u8` can be cast as `char`, not `u32`
   --> $DIR/E0604.rs:12:5
    |
-12 |     1u32 as char; //~ ERROR E0604
+LL |     1u32 as char; //~ ERROR E0604
    |     ^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0605.stderr b/src/test/ui/error-codes/E0605.stderr
index fe694b3eb19..4e1f47cebb7 100644
--- a/src/test/ui/error-codes/E0605.stderr
+++ b/src/test/ui/error-codes/E0605.stderr
@@ -1,7 +1,7 @@
 error[E0605]: non-primitive cast: `u8` as `std::vec::Vec<u8>`
   --> $DIR/E0605.rs:13:5
    |
-13 |     x as Vec<u8>; //~ ERROR E0605
+LL |     x as Vec<u8>; //~ ERROR E0605
    |     ^^^^^^^^^^^^
    |
    = note: an `as` expression can only be used to convert between primitive types. Consider using the `From` trait
@@ -9,7 +9,7 @@ error[E0605]: non-primitive cast: `u8` as `std::vec::Vec<u8>`
 error[E0605]: non-primitive cast: `*const u8` as `&u8`
   --> $DIR/E0605.rs:16:5
    |
-16 |     v as &u8; //~ ERROR E0605
+LL |     v as &u8; //~ ERROR E0605
    |     ^^^^^^^^
    |
    = note: an `as` expression can only be used to convert between primitive types. Consider using the `From` trait
diff --git a/src/test/ui/error-codes/E0606.stderr b/src/test/ui/error-codes/E0606.stderr
index b606bd9113b..3c90e2d4beb 100644
--- a/src/test/ui/error-codes/E0606.stderr
+++ b/src/test/ui/error-codes/E0606.stderr
@@ -1,13 +1,13 @@
 error[E0606]: casting `&u8` as `u8` is invalid
   --> $DIR/E0606.rs:12:5
    |
-12 |     &0u8 as u8; //~ ERROR E0606
+LL |     &0u8 as u8; //~ ERROR E0606
    |     ^^^^^^^^^^ cannot cast `&u8` as `u8`
    |
 help: did you mean `*&0u8`?
   --> $DIR/E0606.rs:12:5
    |
-12 |     &0u8 as u8; //~ ERROR E0606
+LL |     &0u8 as u8; //~ ERROR E0606
    |     ^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0607.stderr b/src/test/ui/error-codes/E0607.stderr
index 2fcb050e628..62d2c2163bf 100644
--- a/src/test/ui/error-codes/E0607.stderr
+++ b/src/test/ui/error-codes/E0607.stderr
@@ -1,7 +1,7 @@
 error[E0607]: cannot cast thin pointer `*const u8` to fat pointer `*const [u8]`
   --> $DIR/E0607.rs:13:5
    |
-13 |     v as *const [u8]; //~ ERROR E0607
+LL |     v as *const [u8]; //~ ERROR E0607
    |     ^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0608.stderr b/src/test/ui/error-codes/E0608.stderr
index 89095cbdf81..43227b4f0a3 100644
--- a/src/test/ui/error-codes/E0608.stderr
+++ b/src/test/ui/error-codes/E0608.stderr
@@ -1,7 +1,7 @@
 error[E0608]: cannot index into a value of type `u8`
   --> $DIR/E0608.rs:12:5
    |
-12 |     0u8[2]; //~ ERROR E0608
+LL |     0u8[2]; //~ ERROR E0608
    |     ^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0609.stderr b/src/test/ui/error-codes/E0609.stderr
index 56c088fd2be..70deb168168 100644
--- a/src/test/ui/error-codes/E0609.stderr
+++ b/src/test/ui/error-codes/E0609.stderr
@@ -1,7 +1,7 @@
 error[E0609]: no field `foo` on type `Foo`
   --> $DIR/E0609.rs:18:15
    |
-18 |     let _ = x.foo; //~ ERROR E0609
+LL |     let _ = x.foo; //~ ERROR E0609
    |               ^^^ unknown field
    |
    = note: available fields are: `x`
@@ -9,7 +9,7 @@ error[E0609]: no field `foo` on type `Foo`
 error[E0609]: no field `1` on type `Bar`
   --> $DIR/E0609.rs:21:5
    |
-21 |     y.1; //~ ERROR E0609
+LL |     y.1; //~ ERROR E0609
    |     ^^^
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/error-codes/E0610.stderr b/src/test/ui/error-codes/E0610.stderr
index 3fa9be7e0de..d6b14642546 100644
--- a/src/test/ui/error-codes/E0610.stderr
+++ b/src/test/ui/error-codes/E0610.stderr
@@ -1,7 +1,7 @@
 error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
   --> $DIR/E0610.rs:13:15
    |
-13 |     let _ = x.foo; //~ ERROR E0610
+LL |     let _ = x.foo; //~ ERROR E0610
    |               ^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0611.stderr b/src/test/ui/error-codes/E0611.stderr
index e08b2edd63f..90194afe4ff 100644
--- a/src/test/ui/error-codes/E0611.stderr
+++ b/src/test/ui/error-codes/E0611.stderr
@@ -1,7 +1,7 @@
 error[E0611]: field `0` of tuple-struct `a::Foo` is private
   --> $DIR/E0611.rs:21:4
    |
-21 |    y.0; //~ ERROR E0611
+LL |    y.0; //~ ERROR E0611
    |    ^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0612.stderr b/src/test/ui/error-codes/E0612.stderr
index 0535f13a4c4..5c27635097f 100644
--- a/src/test/ui/error-codes/E0612.stderr
+++ b/src/test/ui/error-codes/E0612.stderr
@@ -1,7 +1,7 @@
 error[E0612]: attempted out-of-bounds tuple index `1` on type `Foo`
   --> $DIR/E0612.rs:15:4
    |
-15 |    y.1; //~ ERROR E0612
+LL |    y.1; //~ ERROR E0612
    |    ^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0614.stderr b/src/test/ui/error-codes/E0614.stderr
index 806fed59f79..b68887ef36b 100644
--- a/src/test/ui/error-codes/E0614.stderr
+++ b/src/test/ui/error-codes/E0614.stderr
@@ -1,7 +1,7 @@
 error[E0614]: type `u32` cannot be dereferenced
   --> $DIR/E0614.rs:13:5
    |
-13 |     *y; //~ ERROR E0614
+LL |     *y; //~ ERROR E0614
    |     ^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0615.stderr b/src/test/ui/error-codes/E0615.stderr
index 3481a1e3a05..39e63825d6a 100644
--- a/src/test/ui/error-codes/E0615.stderr
+++ b/src/test/ui/error-codes/E0615.stderr
@@ -1,7 +1,7 @@
 error[E0615]: attempted to take value of method `method` on type `Foo`
   --> $DIR/E0615.rs:21:7
    |
-21 |     f.method; //~ ERROR E0615
+LL |     f.method; //~ ERROR E0615
    |       ^^^^^^
    |
    = help: maybe a `()` to call it is missing?
diff --git a/src/test/ui/error-codes/E0616.stderr b/src/test/ui/error-codes/E0616.stderr
index 2cf889ce6fb..38065f048ad 100644
--- a/src/test/ui/error-codes/E0616.stderr
+++ b/src/test/ui/error-codes/E0616.stderr
@@ -1,7 +1,7 @@
 error[E0616]: field `x` of struct `a::Foo` is private
   --> $DIR/E0616.rs:23:5
    |
-23 |     f.x; //~ ERROR E0616
+LL |     f.x; //~ ERROR E0616
    |     ^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0617.stderr b/src/test/ui/error-codes/E0617.stderr
index b72ab2de414..e9fa58e3cf7 100644
--- a/src/test/ui/error-codes/E0617.stderr
+++ b/src/test/ui/error-codes/E0617.stderr
@@ -1,37 +1,37 @@
 error[E0617]: can't pass `f32` to variadic function
   --> $DIR/E0617.rs:19:36
    |
-19 |         printf(::std::ptr::null(), 0f32);
+LL |         printf(::std::ptr::null(), 0f32);
    |                                    ^^^^ help: cast the value to `c_double`: `0f32 as c_double`
 
 error[E0617]: can't pass `i8` to variadic function
   --> $DIR/E0617.rs:22:36
    |
-22 |         printf(::std::ptr::null(), 0i8);
+LL |         printf(::std::ptr::null(), 0i8);
    |                                    ^^^ help: cast the value to `c_int`: `0i8 as c_int`
 
 error[E0617]: can't pass `i16` to variadic function
   --> $DIR/E0617.rs:25:36
    |
-25 |         printf(::std::ptr::null(), 0i16);
+LL |         printf(::std::ptr::null(), 0i16);
    |                                    ^^^^ help: cast the value to `c_int`: `0i16 as c_int`
 
 error[E0617]: can't pass `u8` to variadic function
   --> $DIR/E0617.rs:28:36
    |
-28 |         printf(::std::ptr::null(), 0u8);
+LL |         printf(::std::ptr::null(), 0u8);
    |                                    ^^^ help: cast the value to `c_uint`: `0u8 as c_uint`
 
 error[E0617]: can't pass `u16` to variadic function
   --> $DIR/E0617.rs:31:36
    |
-31 |         printf(::std::ptr::null(), 0u16);
+LL |         printf(::std::ptr::null(), 0u16);
    |                                    ^^^^ help: cast the value to `c_uint`: `0u16 as c_uint`
 
 error[E0617]: can't pass `unsafe extern "C" fn(*const i8, ...) {printf}` to variadic function
   --> $DIR/E0617.rs:34:36
    |
-34 |         printf(::std::ptr::null(), printf);
+LL |         printf(::std::ptr::null(), printf);
    |                                    ^^^^^^
 help: cast the value to `unsafe extern "C" fn(*const i8, ...)`
    |
diff --git a/src/test/ui/error-codes/E0618.stderr b/src/test/ui/error-codes/E0618.stderr
index 9f364f55dd6..020bd281b78 100644
--- a/src/test/ui/error-codes/E0618.stderr
+++ b/src/test/ui/error-codes/E0618.stderr
@@ -1,10 +1,10 @@
 error[E0618]: expected function, found enum variant `X::Entry`
   --> $DIR/E0618.rs:16:5
    |
-12 |     Entry,
+LL |     Entry,
    |     ----- `X::Entry` defined here
 ...
-16 |     X::Entry();
+LL |     X::Entry();
    |     ^^^^^^^^^^ not a function
 help: `X::Entry` is a unit variant, you need to write it without the parenthesis
    |
@@ -14,9 +14,9 @@ help: `X::Entry` is a unit variant, you need to write it without the parenthesis
 error[E0618]: expected function, found `i32`
   --> $DIR/E0618.rs:19:5
    |
-18 |     let x = 0i32;
+LL |     let x = 0i32;
    |         - `i32` defined here
-19 |     x();
+LL |     x();
    |     ^^^ not a function
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/error-codes/E0620.stderr b/src/test/ui/error-codes/E0620.stderr
index 5c18afebf5a..310dddc26f0 100644
--- a/src/test/ui/error-codes/E0620.stderr
+++ b/src/test/ui/error-codes/E0620.stderr
@@ -1,13 +1,13 @@
 error[E0620]: cast to unsized type: `&[usize; 2]` as `[usize]`
   --> $DIR/E0620.rs:12:16
    |
-12 |     let _foo = &[1_usize, 2] as [usize]; //~ ERROR E0620
+LL |     let _foo = &[1_usize, 2] as [usize]; //~ ERROR E0620
    |                ^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: consider using an implicit coercion to `&[usize]` instead
   --> $DIR/E0620.rs:12:16
    |
-12 |     let _foo = &[1_usize, 2] as [usize]; //~ ERROR E0620
+LL |     let _foo = &[1_usize, 2] as [usize]; //~ ERROR E0620
    |                ^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr b/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr
index c9d5542ee17..fa11d7c77c0 100644
--- a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr
+++ b/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr
@@ -1,28 +1,28 @@
 error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'a` due to conflicting requirements
   --> $DIR/E0621-does-not-trigger-for-closures.rs:25:5
    |
-25 |     invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495
+LL |     invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495
    |     ^^^^^^
    |
 note: first, the lifetime cannot outlive the anonymous lifetime #2 defined on the body at 25:16...
   --> $DIR/E0621-does-not-trigger-for-closures.rs:25:16
    |
-25 |     invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495
+LL |     invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495
    |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: ...so that reference does not outlive borrowed content
   --> $DIR/E0621-does-not-trigger-for-closures.rs:25:45
    |
-25 |     invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495
+LL |     invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495
    |                                             ^
 note: but, the lifetime must be valid for the call at 25:5...
   --> $DIR/E0621-does-not-trigger-for-closures.rs:25:5
    |
-25 |     invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495
+LL |     invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: ...so type `&i32` of expression is valid during the expression
   --> $DIR/E0621-does-not-trigger-for-closures.rs:25:5
    |
-25 |     invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495
+LL |     invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0622.stderr b/src/test/ui/error-codes/E0622.stderr
index 9135da97825..da4d43f6041 100644
--- a/src/test/ui/error-codes/E0622.stderr
+++ b/src/test/ui/error-codes/E0622.stderr
@@ -1,7 +1,7 @@
 error[E0622]: intrinsic must be a function
   --> $DIR/E0622.rs:13:5
    |
-13 |     pub static breakpoint : unsafe extern "rust-intrinsic" fn();
+LL |     pub static breakpoint : unsafe extern "rust-intrinsic" fn();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected a function
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0624.stderr b/src/test/ui/error-codes/E0624.stderr
index 621b82df43c..39061f9ec77 100644
--- a/src/test/ui/error-codes/E0624.stderr
+++ b/src/test/ui/error-codes/E0624.stderr
@@ -1,7 +1,7 @@
 error[E0624]: method `method` is private
   --> $DIR/E0624.rs:21:9
    |
-21 |     foo.method(); //~ ERROR method `method` is private [E0624]
+LL |     foo.method(); //~ ERROR method `method` is private [E0624]
    |         ^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0637.stderr b/src/test/ui/error-codes/E0637.stderr
index d035359b73a..d44a60760a7 100644
--- a/src/test/ui/error-codes/E0637.stderr
+++ b/src/test/ui/error-codes/E0637.stderr
@@ -1,19 +1,19 @@
 error[E0637]: invalid lifetime bound name: `'_`
   --> $DIR/E0637.rs:12:16
    |
-12 | struct Foo<'a: '_>(&'a u8); //~ ERROR invalid lifetime bound name: `'_`
+LL | struct Foo<'a: '_>(&'a u8); //~ ERROR invalid lifetime bound name: `'_`
    |                ^^ `'_` is a reserved lifetime name
 
 error[E0637]: invalid lifetime bound name: `'_`
   --> $DIR/E0637.rs:13:12
    |
-13 | fn foo<'a: '_>(_: &'a u8) {} //~ ERROR invalid lifetime bound name: `'_`
+LL | fn foo<'a: '_>(_: &'a u8) {} //~ ERROR invalid lifetime bound name: `'_`
    |            ^^ `'_` is a reserved lifetime name
 
 error[E0637]: invalid lifetime bound name: `'_`
   --> $DIR/E0637.rs:16:10
    |
-16 | impl<'a: '_> Bar<'a> { //~ ERROR invalid lifetime bound name: `'_`
+LL | impl<'a: '_> Bar<'a> { //~ ERROR invalid lifetime bound name: `'_`
    |          ^^ `'_` is a reserved lifetime name
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/error-codes/E0657.stderr b/src/test/ui/error-codes/E0657.stderr
index 82b0568b59a..13734d1eefa 100644
--- a/src/test/ui/error-codes/E0657.stderr
+++ b/src/test/ui/error-codes/E0657.stderr
@@ -1,14 +1,14 @@
 error[E0657]: `impl Trait` can only capture lifetimes bound at the fn or impl level
   --> $DIR/E0657.rs:20:31
    |
-20 |     -> Box<for<'a> Id<impl Lt<'a>>>
-   |                               ^^
+LL |     -> impl for<'a> Id<impl Lt<'a>>
+   |                                ^^
 
 error[E0657]: `impl Trait` can only capture lifetimes bound at the fn or impl level
   --> $DIR/E0657.rs:29:35
    |
-29 |         -> Box<for<'a> Id<impl Lt<'a>>>
-   |                                   ^^
+LL |         -> impl for<'a> Id<impl Lt<'a>>
+   |                                    ^^
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/error-codes/E0658.stderr b/src/test/ui/error-codes/E0658.stderr
index 461edabf5c9..b3425b59f31 100644
--- a/src/test/ui/error-codes/E0658.stderr
+++ b/src/test/ui/error-codes/E0658.stderr
@@ -1,7 +1,7 @@
 error[E0658]: use of unstable library feature 'i128' (see issue #35118)
   --> $DIR/E0658.rs:12:13
    |
-12 |     let _ = ::std::u128::MAX; //~ ERROR E0658
+LL |     let _ = ::std::u128::MAX; //~ ERROR E0658
    |             ^^^^^^^^^^^^^^^^
    |
    = help: add #![feature(i128)] to the crate attributes to enable
diff --git a/src/test/ui/error-codes/E0659.stderr b/src/test/ui/error-codes/E0659.stderr
index 266afa893bf..31a381a6edd 100644
--- a/src/test/ui/error-codes/E0659.stderr
+++ b/src/test/ui/error-codes/E0659.stderr
@@ -1,18 +1,18 @@
 error[E0659]: `foo` is ambiguous
   --> $DIR/E0659.rs:25:5
    |
-25 |     collider::foo(); //~ ERROR E0659
+LL |     collider::foo(); //~ ERROR E0659
    |     ^^^^^^^^^^^^^
    |
 note: `foo` could refer to the name imported here
   --> $DIR/E0659.rs:20:13
    |
-20 |     pub use moon::*;
+LL |     pub use moon::*;
    |             ^^^^^^^
 note: `foo` could also refer to the name imported here
   --> $DIR/E0659.rs:21:13
    |
-21 |     pub use earth::*;
+LL |     pub use earth::*;
    |             ^^^^^^^^
    = note: consider adding an explicit import of `foo` to disambiguate