summary refs log tree commit diff
path: root/src/test/ui/error-codes
diff options
context:
space:
mode:
authorMark Rousskov <mark.simulacrum@gmail.com>2018-12-25 08:56:47 -0700
committerMark Rousskov <mark.simulacrum@gmail.com>2018-12-25 21:08:33 -0700
commit2a663555ddf36f6b041445894a8c175cd1bc718c (patch)
tree98a0185efa6c05885b8d75c76d65880d514ff8d3 /src/test/ui/error-codes
parent14b96659e4e9b2f31431df48f47c219957e2666a (diff)
downloadrust-2a663555ddf36f6b041445894a8c175cd1bc718c.tar.gz
rust-2a663555ddf36f6b041445894a8c175cd1bc718c.zip
Remove licenses
Diffstat (limited to 'src/test/ui/error-codes')
-rw-r--r--src/test/ui/error-codes/E0001.rs10
-rw-r--r--src/test/ui/error-codes/E0001.stderr4
-rw-r--r--src/test/ui/error-codes/E0004-2.rs10
-rw-r--r--src/test/ui/error-codes/E0004-2.stderr4
-rw-r--r--src/test/ui/error-codes/E0004.rs10
-rw-r--r--src/test/ui/error-codes/E0004.stderr2
-rw-r--r--src/test/ui/error-codes/E0005.rs10
-rw-r--r--src/test/ui/error-codes/E0005.stderr2
-rw-r--r--src/test/ui/error-codes/E0007.rs10
-rw-r--r--src/test/ui/error-codes/E0007.stderr4
-rw-r--r--src/test/ui/error-codes/E0008.nll.stderr2
-rw-r--r--src/test/ui/error-codes/E0008.rs10
-rw-r--r--src/test/ui/error-codes/E0008.stderr2
-rw-r--r--src/test/ui/error-codes/E0009.rs10
-rw-r--r--src/test/ui/error-codes/E0009.stderr2
-rw-r--r--src/test/ui/error-codes/E0010-teach.rs10
-rw-r--r--src/test/ui/error-codes/E0010-teach.stderr2
-rw-r--r--src/test/ui/error-codes/E0010.rs10
-rw-r--r--src/test/ui/error-codes/E0010.stderr2
-rw-r--r--src/test/ui/error-codes/E0017.nll.stderr10
-rw-r--r--src/test/ui/error-codes/E0017.rs10
-rw-r--r--src/test/ui/error-codes/E0017.stderr10
-rw-r--r--src/test/ui/error-codes/E0023.rs10
-rw-r--r--src/test/ui/error-codes/E0023.stderr6
-rw-r--r--src/test/ui/error-codes/E0025.rs10
-rw-r--r--src/test/ui/error-codes/E0025.stderr2
-rw-r--r--src/test/ui/error-codes/E0026-teach.rs10
-rw-r--r--src/test/ui/error-codes/E0026-teach.stderr2
-rw-r--r--src/test/ui/error-codes/E0026.rs10
-rw-r--r--src/test/ui/error-codes/E0026.stderr2
-rw-r--r--src/test/ui/error-codes/E0027-teach.rs10
-rw-r--r--src/test/ui/error-codes/E0027-teach.stderr2
-rw-r--r--src/test/ui/error-codes/E0027.rs10
-rw-r--r--src/test/ui/error-codes/E0027.stderr2
-rw-r--r--src/test/ui/error-codes/E0029-teach.rs10
-rw-r--r--src/test/ui/error-codes/E0029-teach.stderr2
-rw-r--r--src/test/ui/error-codes/E0029.rs10
-rw-r--r--src/test/ui/error-codes/E0029.stderr2
-rw-r--r--src/test/ui/error-codes/E0030-teach.rs10
-rw-r--r--src/test/ui/error-codes/E0030-teach.stderr2
-rw-r--r--src/test/ui/error-codes/E0030.rs11
-rw-r--r--src/test/ui/error-codes/E0030.stderr2
-rw-r--r--src/test/ui/error-codes/E0033-teach.rs10
-rw-r--r--src/test/ui/error-codes/E0033-teach.stderr6
-rw-r--r--src/test/ui/error-codes/E0033.rs10
-rw-r--r--src/test/ui/error-codes/E0033.stderr6
-rw-r--r--src/test/ui/error-codes/E0034.rs10
-rw-r--r--src/test/ui/error-codes/E0034.stderr6
-rw-r--r--src/test/ui/error-codes/E0038.rs10
-rw-r--r--src/test/ui/error-codes/E0038.stderr2
-rw-r--r--src/test/ui/error-codes/E0040.rs10
-rw-r--r--src/test/ui/error-codes/E0040.stderr2
-rw-r--r--src/test/ui/error-codes/E0044.rs10
-rw-r--r--src/test/ui/error-codes/E0044.stderr2
-rw-r--r--src/test/ui/error-codes/E0045.rs10
-rw-r--r--src/test/ui/error-codes/E0045.stderr2
-rw-r--r--src/test/ui/error-codes/E0049.rs10
-rw-r--r--src/test/ui/error-codes/E0049.stderr2
-rw-r--r--src/test/ui/error-codes/E0050.rs10
-rw-r--r--src/test/ui/error-codes/E0050.stderr6
-rw-r--r--src/test/ui/error-codes/E0054.rs10
-rw-r--r--src/test/ui/error-codes/E0054.stderr2
-rw-r--r--src/test/ui/error-codes/E0055.rs10
-rw-r--r--src/test/ui/error-codes/E0055.stderr2
-rw-r--r--src/test/ui/error-codes/E0057.rs10
-rw-r--r--src/test/ui/error-codes/E0057.stderr4
-rw-r--r--src/test/ui/error-codes/E0059.rs10
-rw-r--r--src/test/ui/error-codes/E0059.stderr2
-rw-r--r--src/test/ui/error-codes/E0060.rs10
-rw-r--r--src/test/ui/error-codes/E0060.stderr2
-rw-r--r--src/test/ui/error-codes/E0061.rs10
-rw-r--r--src/test/ui/error-codes/E0061.stderr4
-rw-r--r--src/test/ui/error-codes/E0062.rs10
-rw-r--r--src/test/ui/error-codes/E0062.stderr2
-rw-r--r--src/test/ui/error-codes/E0063.rs10
-rw-r--r--src/test/ui/error-codes/E0063.stderr8
-rw-r--r--src/test/ui/error-codes/E0067.rs10
-rw-r--r--src/test/ui/error-codes/E0067.stderr4
-rw-r--r--src/test/ui/error-codes/E0069.rs10
-rw-r--r--src/test/ui/error-codes/E0069.stderr2
-rw-r--r--src/test/ui/error-codes/E0070.rs10
-rw-r--r--src/test/ui/error-codes/E0070.stderr8
-rw-r--r--src/test/ui/error-codes/E0071.rs10
-rw-r--r--src/test/ui/error-codes/E0071.stderr2
-rw-r--r--src/test/ui/error-codes/E0075.rs10
-rw-r--r--src/test/ui/error-codes/E0075.stderr2
-rw-r--r--src/test/ui/error-codes/E0076.rs10
-rw-r--r--src/test/ui/error-codes/E0076.stderr2
-rw-r--r--src/test/ui/error-codes/E0077.rs10
-rw-r--r--src/test/ui/error-codes/E0077.stderr2
-rw-r--r--src/test/ui/error-codes/E0080.rs10
-rw-r--r--src/test/ui/error-codes/E0080.stderr4
-rw-r--r--src/test/ui/error-codes/E0081.rs10
-rw-r--r--src/test/ui/error-codes/E0081.stderr2
-rw-r--r--src/test/ui/error-codes/E0084.rs10
-rw-r--r--src/test/ui/error-codes/E0084.stderr2
-rw-r--r--src/test/ui/error-codes/E0091.rs10
-rw-r--r--src/test/ui/error-codes/E0091.stderr4
-rw-r--r--src/test/ui/error-codes/E0092.rs10
-rw-r--r--src/test/ui/error-codes/E0092.stderr2
-rw-r--r--src/test/ui/error-codes/E0093.rs10
-rw-r--r--src/test/ui/error-codes/E0093.stderr2
-rw-r--r--src/test/ui/error-codes/E0094.rs10
-rw-r--r--src/test/ui/error-codes/E0094.stderr2
-rw-r--r--src/test/ui/error-codes/E0106.rs10
-rw-r--r--src/test/ui/error-codes/E0106.stderr10
-rw-r--r--src/test/ui/error-codes/E0107.rs10
-rw-r--r--src/test/ui/error-codes/E0107.stderr6
-rw-r--r--src/test/ui/error-codes/E0109.rs10
-rw-r--r--src/test/ui/error-codes/E0109.stderr2
-rw-r--r--src/test/ui/error-codes/E0110.rs10
-rw-r--r--src/test/ui/error-codes/E0110.stderr2
-rw-r--r--src/test/ui/error-codes/E0116.rs10
-rw-r--r--src/test/ui/error-codes/E0116.stderr2
-rw-r--r--src/test/ui/error-codes/E0117.rs10
-rw-r--r--src/test/ui/error-codes/E0117.stderr4
-rw-r--r--src/test/ui/error-codes/E0118.rs10
-rw-r--r--src/test/ui/error-codes/E0118.stderr2
-rw-r--r--src/test/ui/error-codes/E0119.rs10
-rw-r--r--src/test/ui/error-codes/E0119.stderr2
-rw-r--r--src/test/ui/error-codes/E0120.rs10
-rw-r--r--src/test/ui/error-codes/E0120.stderr2
-rw-r--r--src/test/ui/error-codes/E0121.rs10
-rw-r--r--src/test/ui/error-codes/E0121.stderr4
-rw-r--r--src/test/ui/error-codes/E0124.rs10
-rw-r--r--src/test/ui/error-codes/E0124.stderr2
-rw-r--r--src/test/ui/error-codes/E0128.rs10
-rw-r--r--src/test/ui/error-codes/E0128.stderr2
-rw-r--r--src/test/ui/error-codes/E0130.rs10
-rw-r--r--src/test/ui/error-codes/E0130.stderr2
-rw-r--r--src/test/ui/error-codes/E0131.rs10
-rw-r--r--src/test/ui/error-codes/E0131.stderr2
-rw-r--r--src/test/ui/error-codes/E0132.rs10
-rw-r--r--src/test/ui/error-codes/E0132.stderr2
-rw-r--r--src/test/ui/error-codes/E0133.rs10
-rw-r--r--src/test/ui/error-codes/E0133.stderr2
-rw-r--r--src/test/ui/error-codes/E0137.rs10
-rw-r--r--src/test/ui/error-codes/E0137.stderr2
-rw-r--r--src/test/ui/error-codes/E0138.rs10
-rw-r--r--src/test/ui/error-codes/E0138.stderr2
-rw-r--r--src/test/ui/error-codes/E0152.rs10
-rw-r--r--src/test/ui/error-codes/E0152.stderr2
-rw-r--r--src/test/ui/error-codes/E0161.ast.stderr2
-rw-r--r--src/test/ui/error-codes/E0161.astul.stderr2
-rw-r--r--src/test/ui/error-codes/E0161.edition.stderr2
-rw-r--r--src/test/ui/error-codes/E0161.editionul.stderr2
-rw-r--r--src/test/ui/error-codes/E0161.nll.stderr2
-rw-r--r--src/test/ui/error-codes/E0161.nllul.stderr2
-rw-r--r--src/test/ui/error-codes/E0161.rs10
-rw-r--r--src/test/ui/error-codes/E0161.zflags.stderr2
-rw-r--r--src/test/ui/error-codes/E0161.zflagsul.stderr2
-rw-r--r--src/test/ui/error-codes/E0162.rs10
-rw-r--r--src/test/ui/error-codes/E0162.stderr2
-rw-r--r--src/test/ui/error-codes/E0164.rs11
-rw-r--r--src/test/ui/error-codes/E0164.stderr2
-rw-r--r--src/test/ui/error-codes/E0165.rs10
-rw-r--r--src/test/ui/error-codes/E0165.stderr2
-rw-r--r--src/test/ui/error-codes/E0184.rs10
-rw-r--r--src/test/ui/error-codes/E0184.stderr2
-rw-r--r--src/test/ui/error-codes/E0185.rs10
-rw-r--r--src/test/ui/error-codes/E0185.stderr2
-rw-r--r--src/test/ui/error-codes/E0186.rs10
-rw-r--r--src/test/ui/error-codes/E0186.stderr2
-rw-r--r--src/test/ui/error-codes/E0191.rs10
-rw-r--r--src/test/ui/error-codes/E0191.stderr2
-rw-r--r--src/test/ui/error-codes/E0192.rs10
-rw-r--r--src/test/ui/error-codes/E0192.stderr2
-rw-r--r--src/test/ui/error-codes/E0194.rs10
-rw-r--r--src/test/ui/error-codes/E0194.stderr2
-rw-r--r--src/test/ui/error-codes/E0195.rs10
-rw-r--r--src/test/ui/error-codes/E0195.stderr2
-rw-r--r--src/test/ui/error-codes/E0197.rs10
-rw-r--r--src/test/ui/error-codes/E0197.stderr2
-rw-r--r--src/test/ui/error-codes/E0198.rs10
-rw-r--r--src/test/ui/error-codes/E0198.stderr2
-rw-r--r--src/test/ui/error-codes/E0199.rs10
-rw-r--r--src/test/ui/error-codes/E0199.stderr2
-rw-r--r--src/test/ui/error-codes/E0200.rs10
-rw-r--r--src/test/ui/error-codes/E0200.stderr2
-rw-r--r--src/test/ui/error-codes/E0201.rs10
-rw-r--r--src/test/ui/error-codes/E0201.stderr6
-rw-r--r--src/test/ui/error-codes/E0206.rs10
-rw-r--r--src/test/ui/error-codes/E0206.stderr6
-rw-r--r--src/test/ui/error-codes/E0207.rs10
-rw-r--r--src/test/ui/error-codes/E0207.stderr2
-rw-r--r--src/test/ui/error-codes/E0214.rs10
-rw-r--r--src/test/ui/error-codes/E0214.stderr2
-rw-r--r--src/test/ui/error-codes/E0220.rs10
-rw-r--r--src/test/ui/error-codes/E0220.stderr4
-rw-r--r--src/test/ui/error-codes/E0221.rs10
-rw-r--r--src/test/ui/error-codes/E0221.stderr6
-rw-r--r--src/test/ui/error-codes/E0223.rs10
-rw-r--r--src/test/ui/error-codes/E0223.stderr2
-rw-r--r--src/test/ui/error-codes/E0225.rs10
-rw-r--r--src/test/ui/error-codes/E0225.stderr2
-rw-r--r--src/test/ui/error-codes/E0229.rs10
-rw-r--r--src/test/ui/error-codes/E0229.stderr2
-rw-r--r--src/test/ui/error-codes/E0232.rs10
-rw-r--r--src/test/ui/error-codes/E0232.stderr2
-rw-r--r--src/test/ui/error-codes/E0252.rs10
-rw-r--r--src/test/ui/error-codes/E0252.stderr2
-rw-r--r--src/test/ui/error-codes/E0253.rs10
-rw-r--r--src/test/ui/error-codes/E0253.stderr2
-rw-r--r--src/test/ui/error-codes/E0254.rs10
-rw-r--r--src/test/ui/error-codes/E0254.stderr2
-rw-r--r--src/test/ui/error-codes/E0255.rs10
-rw-r--r--src/test/ui/error-codes/E0255.stderr2
-rw-r--r--src/test/ui/error-codes/E0259.rs10
-rw-r--r--src/test/ui/error-codes/E0259.stderr2
-rw-r--r--src/test/ui/error-codes/E0260.rs10
-rw-r--r--src/test/ui/error-codes/E0260.stderr2
-rw-r--r--src/test/ui/error-codes/E0261.rs10
-rw-r--r--src/test/ui/error-codes/E0261.stderr4
-rw-r--r--src/test/ui/error-codes/E0262.rs10
-rw-r--r--src/test/ui/error-codes/E0262.stderr2
-rw-r--r--src/test/ui/error-codes/E0263.rs10
-rw-r--r--src/test/ui/error-codes/E0263.stderr2
-rw-r--r--src/test/ui/error-codes/E0264.rs10
-rw-r--r--src/test/ui/error-codes/E0264.stderr2
-rw-r--r--src/test/ui/error-codes/E0267.rs10
-rw-r--r--src/test/ui/error-codes/E0267.stderr2
-rw-r--r--src/test/ui/error-codes/E0268.rs10
-rw-r--r--src/test/ui/error-codes/E0268.stderr2
-rw-r--r--src/test/ui/error-codes/E0271.rs10
-rw-r--r--src/test/ui/error-codes/E0271.stderr4
-rw-r--r--src/test/ui/error-codes/E0275.rs10
-rw-r--r--src/test/ui/error-codes/E0275.stderr4
-rw-r--r--src/test/ui/error-codes/E0276.rs10
-rw-r--r--src/test/ui/error-codes/E0276.stderr2
-rw-r--r--src/test/ui/error-codes/E0277-2.rs10
-rw-r--r--src/test/ui/error-codes/E0277-2.stderr4
-rw-r--r--src/test/ui/error-codes/E0277.rs10
-rw-r--r--src/test/ui/error-codes/E0277.stderr6
-rw-r--r--src/test/ui/error-codes/E0282.rs10
-rw-r--r--src/test/ui/error-codes/E0282.stderr2
-rw-r--r--src/test/ui/error-codes/E0283.rs10
-rw-r--r--src/test/ui/error-codes/E0283.stderr4
-rw-r--r--src/test/ui/error-codes/E0296.rs10
-rw-r--r--src/test/ui/error-codes/E0296.stderr2
-rw-r--r--src/test/ui/error-codes/E0297.rs10
-rw-r--r--src/test/ui/error-codes/E0297.stderr2
-rw-r--r--src/test/ui/error-codes/E0301.nll.stderr2
-rw-r--r--src/test/ui/error-codes/E0301.rs10
-rw-r--r--src/test/ui/error-codes/E0301.stderr2
-rw-r--r--src/test/ui/error-codes/E0302.rs10
-rw-r--r--src/test/ui/error-codes/E0302.stderr2
-rw-r--r--src/test/ui/error-codes/E0303.rs10
-rw-r--r--src/test/ui/error-codes/E0303.stderr4
-rw-r--r--src/test/ui/error-codes/E0308-4.rs10
-rw-r--r--src/test/ui/error-codes/E0308-4.stderr2
-rw-r--r--src/test/ui/error-codes/E0308.rs10
-rw-r--r--src/test/ui/error-codes/E0308.stderr2
-rw-r--r--src/test/ui/error-codes/E0328.rs10
-rw-r--r--src/test/ui/error-codes/E0328.stderr2
-rw-r--r--src/test/ui/error-codes/E0365.rs10
-rw-r--r--src/test/ui/error-codes/E0365.stderr2
-rw-r--r--src/test/ui/error-codes/E0370.rs10
-rw-r--r--src/test/ui/error-codes/E0370.stderr2
-rw-r--r--src/test/ui/error-codes/E0374.rs10
-rw-r--r--src/test/ui/error-codes/E0374.stderr2
-rw-r--r--src/test/ui/error-codes/E0375.rs10
-rw-r--r--src/test/ui/error-codes/E0375.stderr2
-rw-r--r--src/test/ui/error-codes/E0376.rs10
-rw-r--r--src/test/ui/error-codes/E0376.stderr2
-rw-r--r--src/test/ui/error-codes/E0388.nll.stderr10
-rw-r--r--src/test/ui/error-codes/E0388.rs10
-rw-r--r--src/test/ui/error-codes/E0388.stderr10
-rw-r--r--src/test/ui/error-codes/E0389.nll.stderr2
-rw-r--r--src/test/ui/error-codes/E0389.rs10
-rw-r--r--src/test/ui/error-codes/E0389.stderr2
-rw-r--r--src/test/ui/error-codes/E0390.rs10
-rw-r--r--src/test/ui/error-codes/E0390.stderr4
-rw-r--r--src/test/ui/error-codes/E0392.rs10
-rw-r--r--src/test/ui/error-codes/E0392.stderr2
-rw-r--r--src/test/ui/error-codes/E0393.rs10
-rw-r--r--src/test/ui/error-codes/E0393.stderr2
-rw-r--r--src/test/ui/error-codes/E0395.rs10
-rw-r--r--src/test/ui/error-codes/E0395.stderr2
-rw-r--r--src/test/ui/error-codes/E0396-fixed.rs10
-rw-r--r--src/test/ui/error-codes/E0396-fixed.stderr2
-rw-r--r--src/test/ui/error-codes/E0396.rs10
-rw-r--r--src/test/ui/error-codes/E0396.stderr2
-rw-r--r--src/test/ui/error-codes/E0401.rs10
-rw-r--r--src/test/ui/error-codes/E0401.stderr6
-rw-r--r--src/test/ui/error-codes/E0403.rs10
-rw-r--r--src/test/ui/error-codes/E0403.stderr2
-rw-r--r--src/test/ui/error-codes/E0404.rs10
-rw-r--r--src/test/ui/error-codes/E0404.stderr4
-rw-r--r--src/test/ui/error-codes/E0405.rs10
-rw-r--r--src/test/ui/error-codes/E0405.stderr2
-rw-r--r--src/test/ui/error-codes/E0407.rs10
-rw-r--r--src/test/ui/error-codes/E0407.stderr2
-rw-r--r--src/test/ui/error-codes/E0408.rs10
-rw-r--r--src/test/ui/error-codes/E0408.stderr2
-rw-r--r--src/test/ui/error-codes/E0411.rs10
-rw-r--r--src/test/ui/error-codes/E0411.stderr2
-rw-r--r--src/test/ui/error-codes/E0412.rs10
-rw-r--r--src/test/ui/error-codes/E0412.stderr2
-rw-r--r--src/test/ui/error-codes/E0415.rs10
-rw-r--r--src/test/ui/error-codes/E0415.stderr2
-rw-r--r--src/test/ui/error-codes/E0416.rs10
-rw-r--r--src/test/ui/error-codes/E0416.stderr2
-rw-r--r--src/test/ui/error-codes/E0423.rs10
-rw-r--r--src/test/ui/error-codes/E0423.stderr14
-rw-r--r--src/test/ui/error-codes/E0424.rs10
-rw-r--r--src/test/ui/error-codes/E0424.stderr4
-rw-r--r--src/test/ui/error-codes/E0425.rs10
-rw-r--r--src/test/ui/error-codes/E0425.stderr2
-rw-r--r--src/test/ui/error-codes/E0426.rs10
-rw-r--r--src/test/ui/error-codes/E0426.stderr2
-rw-r--r--src/test/ui/error-codes/E0428.rs10
-rw-r--r--src/test/ui/error-codes/E0428.stderr2
-rw-r--r--src/test/ui/error-codes/E0429.rs10
-rw-r--r--src/test/ui/error-codes/E0429.stderr2
-rw-r--r--src/test/ui/error-codes/E0430.rs10
-rw-r--r--src/test/ui/error-codes/E0430.stderr4
-rw-r--r--src/test/ui/error-codes/E0431.rs10
-rw-r--r--src/test/ui/error-codes/E0431.stderr2
-rw-r--r--src/test/ui/error-codes/E0432.rs10
-rw-r--r--src/test/ui/error-codes/E0432.stderr2
-rw-r--r--src/test/ui/error-codes/E0433.rs10
-rw-r--r--src/test/ui/error-codes/E0433.stderr2
-rw-r--r--src/test/ui/error-codes/E0434.rs10
-rw-r--r--src/test/ui/error-codes/E0434.stderr2
-rw-r--r--src/test/ui/error-codes/E0435.rs10
-rw-r--r--src/test/ui/error-codes/E0435.stderr2
-rw-r--r--src/test/ui/error-codes/E0437.rs10
-rw-r--r--src/test/ui/error-codes/E0437.stderr2
-rw-r--r--src/test/ui/error-codes/E0438.rs11
-rw-r--r--src/test/ui/error-codes/E0438.stderr2
-rw-r--r--src/test/ui/error-codes/E0439.rs10
-rw-r--r--src/test/ui/error-codes/E0439.stderr2
-rw-r--r--src/test/ui/error-codes/E0440.rs10
-rw-r--r--src/test/ui/error-codes/E0440.stderr2
-rw-r--r--src/test/ui/error-codes/E0441.rs10
-rw-r--r--src/test/ui/error-codes/E0441.stderr2
-rw-r--r--src/test/ui/error-codes/E0442.rs10
-rw-r--r--src/test/ui/error-codes/E0442.stderr6
-rw-r--r--src/test/ui/error-codes/E0443.rs10
-rw-r--r--src/test/ui/error-codes/E0443.stderr2
-rw-r--r--src/test/ui/error-codes/E0444.rs10
-rw-r--r--src/test/ui/error-codes/E0444.stderr2
-rw-r--r--src/test/ui/error-codes/E0445.rs10
-rw-r--r--src/test/ui/error-codes/E0445.stderr6
-rw-r--r--src/test/ui/error-codes/E0446.rs10
-rw-r--r--src/test/ui/error-codes/E0446.stderr2
-rw-r--r--src/test/ui/error-codes/E0449.rs10
-rw-r--r--src/test/ui/error-codes/E0449.stderr6
-rw-r--r--src/test/ui/error-codes/E0451.rs10
-rw-r--r--src/test/ui/error-codes/E0451.stderr4
-rw-r--r--src/test/ui/error-codes/E0452.rs10
-rw-r--r--src/test/ui/error-codes/E0452.stderr2
-rw-r--r--src/test/ui/error-codes/E0453.rs10
-rw-r--r--src/test/ui/error-codes/E0453.stderr2
-rw-r--r--src/test/ui/error-codes/E0454.rs10
-rw-r--r--src/test/ui/error-codes/E0454.stderr2
-rw-r--r--src/test/ui/error-codes/E0458.rs10
-rw-r--r--src/test/ui/error-codes/E0458.stderr4
-rw-r--r--src/test/ui/error-codes/E0459.rs10
-rw-r--r--src/test/ui/error-codes/E0459.stderr2
-rw-r--r--src/test/ui/error-codes/E0463.rs10
-rw-r--r--src/test/ui/error-codes/E0463.stderr2
-rw-r--r--src/test/ui/error-codes/E0478.rs10
-rw-r--r--src/test/ui/error-codes/E0478.stderr10
-rw-r--r--src/test/ui/error-codes/E0492.rs10
-rw-r--r--src/test/ui/error-codes/E0492.stderr2
-rw-r--r--src/test/ui/error-codes/E0496.rs10
-rw-r--r--src/test/ui/error-codes/E0496.stderr2
-rw-r--r--src/test/ui/error-codes/E0499.nll.stderr2
-rw-r--r--src/test/ui/error-codes/E0499.rs10
-rw-r--r--src/test/ui/error-codes/E0499.stderr2
-rw-r--r--src/test/ui/error-codes/E0502.nll.stderr2
-rw-r--r--src/test/ui/error-codes/E0502.rs10
-rw-r--r--src/test/ui/error-codes/E0502.stderr2
-rw-r--r--src/test/ui/error-codes/E0503.nll.stderr2
-rw-r--r--src/test/ui/error-codes/E0503.rs10
-rw-r--r--src/test/ui/error-codes/E0503.stderr2
-rw-r--r--src/test/ui/error-codes/E0504.nll.stderr2
-rw-r--r--src/test/ui/error-codes/E0504.rs10
-rw-r--r--src/test/ui/error-codes/E0504.stderr2
-rw-r--r--src/test/ui/error-codes/E0505.nll.stderr2
-rw-r--r--src/test/ui/error-codes/E0505.rs10
-rw-r--r--src/test/ui/error-codes/E0505.stderr2
-rw-r--r--src/test/ui/error-codes/E0507.rs10
-rw-r--r--src/test/ui/error-codes/E0507.stderr2
-rw-r--r--src/test/ui/error-codes/E0509.nll.stderr2
-rw-r--r--src/test/ui/error-codes/E0509.rs10
-rw-r--r--src/test/ui/error-codes/E0509.stderr2
-rw-r--r--src/test/ui/error-codes/E0511.rs10
-rw-r--r--src/test/ui/error-codes/E0511.stderr2
-rw-r--r--src/test/ui/error-codes/E0512.rs10
-rw-r--r--src/test/ui/error-codes/E0512.stderr2
-rw-r--r--src/test/ui/error-codes/E0516.rs10
-rw-r--r--src/test/ui/error-codes/E0516.stderr2
-rw-r--r--src/test/ui/error-codes/E0517.rs10
-rw-r--r--src/test/ui/error-codes/E0517.stderr8
-rw-r--r--src/test/ui/error-codes/E0518.rs10
-rw-r--r--src/test/ui/error-codes/E0518.stderr4
-rw-r--r--src/test/ui/error-codes/E0520.rs10
-rw-r--r--src/test/ui/error-codes/E0520.stderr2
-rw-r--r--src/test/ui/error-codes/E0522.rs10
-rw-r--r--src/test/ui/error-codes/E0522.stderr2
-rw-r--r--src/test/ui/error-codes/E0527.rs10
-rw-r--r--src/test/ui/error-codes/E0527.stderr2
-rw-r--r--src/test/ui/error-codes/E0528.rs10
-rw-r--r--src/test/ui/error-codes/E0528.stderr2
-rw-r--r--src/test/ui/error-codes/E0529.rs10
-rw-r--r--src/test/ui/error-codes/E0529.stderr2
-rw-r--r--src/test/ui/error-codes/E0530.rs10
-rw-r--r--src/test/ui/error-codes/E0530.stderr2
-rw-r--r--src/test/ui/error-codes/E0532.rs10
-rw-r--r--src/test/ui/error-codes/E0532.stderr2
-rw-r--r--src/test/ui/error-codes/E0534.rs10
-rw-r--r--src/test/ui/error-codes/E0534.stderr2
-rw-r--r--src/test/ui/error-codes/E0558.rs10
-rw-r--r--src/test/ui/error-codes/E0558.stderr2
-rw-r--r--src/test/ui/error-codes/E0559.rs10
-rw-r--r--src/test/ui/error-codes/E0559.stderr2
-rw-r--r--src/test/ui/error-codes/E0560.rs10
-rw-r--r--src/test/ui/error-codes/E0560.stderr2
-rw-r--r--src/test/ui/error-codes/E0565-1.rs10
-rw-r--r--src/test/ui/error-codes/E0565-1.stderr2
-rw-r--r--src/test/ui/error-codes/E0565-2.rs10
-rw-r--r--src/test/ui/error-codes/E0565-2.stderr2
-rw-r--r--src/test/ui/error-codes/E0565.rs10
-rw-r--r--src/test/ui/error-codes/E0565.stderr2
-rw-r--r--src/test/ui/error-codes/E0572.rs10
-rw-r--r--src/test/ui/error-codes/E0572.stderr2
-rw-r--r--src/test/ui/error-codes/E0582.rs10
-rw-r--r--src/test/ui/error-codes/E0582.stderr4
-rw-r--r--src/test/ui/error-codes/E0585.rs10
-rw-r--r--src/test/ui/error-codes/E0585.stderr2
-rw-r--r--src/test/ui/error-codes/E0586.rs10
-rw-r--r--src/test/ui/error-codes/E0586.stderr2
-rw-r--r--src/test/ui/error-codes/E0597.nll.stderr2
-rw-r--r--src/test/ui/error-codes/E0597.rs10
-rw-r--r--src/test/ui/error-codes/E0597.stderr2
-rw-r--r--src/test/ui/error-codes/E0599.rs10
-rw-r--r--src/test/ui/error-codes/E0599.stderr2
-rw-r--r--src/test/ui/error-codes/E0600.rs10
-rw-r--r--src/test/ui/error-codes/E0600.stderr2
-rw-r--r--src/test/ui/error-codes/E0601.rs10
-rw-r--r--src/test/ui/error-codes/E0602.rs10
-rw-r--r--src/test/ui/error-codes/E0603.rs10
-rw-r--r--src/test/ui/error-codes/E0603.stderr2
-rw-r--r--src/test/ui/error-codes/E0604.rs10
-rw-r--r--src/test/ui/error-codes/E0604.stderr2
-rw-r--r--src/test/ui/error-codes/E0605.rs10
-rw-r--r--src/test/ui/error-codes/E0605.stderr4
-rw-r--r--src/test/ui/error-codes/E0606.rs10
-rw-r--r--src/test/ui/error-codes/E0606.stderr4
-rw-r--r--src/test/ui/error-codes/E0607.rs10
-rw-r--r--src/test/ui/error-codes/E0607.stderr2
-rw-r--r--src/test/ui/error-codes/E0608.rs10
-rw-r--r--src/test/ui/error-codes/E0608.stderr2
-rw-r--r--src/test/ui/error-codes/E0609.rs10
-rw-r--r--src/test/ui/error-codes/E0609.stderr4
-rw-r--r--src/test/ui/error-codes/E0610.rs10
-rw-r--r--src/test/ui/error-codes/E0610.stderr2
-rw-r--r--src/test/ui/error-codes/E0614.rs10
-rw-r--r--src/test/ui/error-codes/E0614.stderr2
-rw-r--r--src/test/ui/error-codes/E0615.rs10
-rw-r--r--src/test/ui/error-codes/E0615.stderr2
-rw-r--r--src/test/ui/error-codes/E0616.rs10
-rw-r--r--src/test/ui/error-codes/E0616.stderr2
-rw-r--r--src/test/ui/error-codes/E0617.rs10
-rw-r--r--src/test/ui/error-codes/E0617.stderr12
-rw-r--r--src/test/ui/error-codes/E0618.rs10
-rw-r--r--src/test/ui/error-codes/E0618.stderr4
-rw-r--r--src/test/ui/error-codes/E0620.rs10
-rw-r--r--src/test/ui/error-codes/E0620.stderr4
-rw-r--r--src/test/ui/error-codes/E0621-does-not-trigger-for-closures.rs10
-rw-r--r--src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr14
-rw-r--r--src/test/ui/error-codes/E0622.rs10
-rw-r--r--src/test/ui/error-codes/E0622.stderr2
-rw-r--r--src/test/ui/error-codes/E0624.rs10
-rw-r--r--src/test/ui/error-codes/E0624.stderr2
-rw-r--r--src/test/ui/error-codes/E0637.rs10
-rw-r--r--src/test/ui/error-codes/E0637.stderr6
-rw-r--r--src/test/ui/error-codes/E0646.rs10
-rw-r--r--src/test/ui/error-codes/E0646.stderr2
-rw-r--r--src/test/ui/error-codes/E0647.rs10
-rw-r--r--src/test/ui/error-codes/E0647.stderr2
-rw-r--r--src/test/ui/error-codes/E0648.rs10
-rw-r--r--src/test/ui/error-codes/E0648.stderr2
-rw-r--r--src/test/ui/error-codes/E0657.rs9
-rw-r--r--src/test/ui/error-codes/E0657.stderr4
-rw-r--r--src/test/ui/error-codes/E0658.rs10
-rw-r--r--src/test/ui/error-codes/E0658.stderr2
-rw-r--r--src/test/ui/error-codes/E0659.rs10
-rw-r--r--src/test/ui/error-codes/E0659.stderr6
-rw-r--r--src/test/ui/error-codes/E0718.rs10
-rw-r--r--src/test/ui/error-codes/E0718.stderr2
-rw-r--r--src/test/ui/error-codes/E0719.rs10
-rw-r--r--src/test/ui/error-codes/E0719.stderr4
-rw-r--r--src/test/ui/error-codes/ex-E0611.rs10
-rw-r--r--src/test/ui/error-codes/ex-E0611.stderr2
-rw-r--r--src/test/ui/error-codes/ex-E0612.rs10
-rw-r--r--src/test/ui/error-codes/ex-E0612.stderr2
499 files changed, 372 insertions, 2784 deletions
diff --git a/src/test/ui/error-codes/E0001.rs b/src/test/ui/error-codes/E0001.rs
index b72b0d66190..2c95f02bf34 100644
--- a/src/test/ui/error-codes/E0001.rs
+++ b/src/test/ui/error-codes/E0001.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![deny(unreachable_patterns)]
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0001.stderr b/src/test/ui/error-codes/E0001.stderr
index af67a438f52..0b884c54a82 100644
--- a/src/test/ui/error-codes/E0001.stderr
+++ b/src/test/ui/error-codes/E0001.stderr
@@ -1,11 +1,11 @@
 error: unreachable pattern
-  --> $DIR/E0001.rs:18:9
+  --> $DIR/E0001.rs:8:9
    |
 LL |         _ => {/* ... */} //~ ERROR unreachable pattern
    |         ^
    |
 note: lint level defined here
-  --> $DIR/E0001.rs:11:9
+  --> $DIR/E0001.rs:1:9
    |
 LL | #![deny(unreachable_patterns)]
    |         ^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0004-2.rs b/src/test/ui/error-codes/E0004-2.rs
index 824b86cfa83..c7612fd50a7 100644
--- a/src/test/ui/error-codes/E0004-2.rs
+++ b/src/test/ui/error-codes/E0004-2.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     let x = Some(1);
 
diff --git a/src/test/ui/error-codes/E0004-2.stderr b/src/test/ui/error-codes/E0004-2.stderr
index 2d46196ddda..8b262cc6eb7 100644
--- a/src/test/ui/error-codes/E0004-2.stderr
+++ b/src/test/ui/error-codes/E0004-2.stderr
@@ -1,11 +1,11 @@
 error[E0004]: non-exhaustive patterns: type `std::option::Option<i32>` is non-empty
-  --> $DIR/E0004-2.rs:14:11
+  --> $DIR/E0004-2.rs:4:11
    |
 LL |     match x { } //~ ERROR E0004
    |           ^
    |
 help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
-  --> $DIR/E0004-2.rs:14:11
+  --> $DIR/E0004-2.rs:4:11
    |
 LL |     match x { } //~ ERROR E0004
    |           ^
diff --git a/src/test/ui/error-codes/E0004.rs b/src/test/ui/error-codes/E0004.rs
index 8df07a0c1c5..1ee9d2bad14 100644
--- a/src/test/ui/error-codes/E0004.rs
+++ b/src/test/ui/error-codes/E0004.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 enum Terminator {
     HastaLaVistaBaby,
     TalkToMyHand,
diff --git a/src/test/ui/error-codes/E0004.stderr b/src/test/ui/error-codes/E0004.stderr
index cf364a88689..a66dd929032 100644
--- a/src/test/ui/error-codes/E0004.stderr
+++ b/src/test/ui/error-codes/E0004.stderr
@@ -1,5 +1,5 @@
 error[E0004]: non-exhaustive patterns: `HastaLaVistaBaby` not covered
-  --> $DIR/E0004.rs:19:11
+  --> $DIR/E0004.rs:9:11
    |
 LL |     match x { //~ ERROR E0004
    |           ^ pattern `HastaLaVistaBaby` not covered
diff --git a/src/test/ui/error-codes/E0005.rs b/src/test/ui/error-codes/E0005.rs
index 0405bba81b5..f4730697e18 100644
--- a/src/test/ui/error-codes/E0005.rs
+++ b/src/test/ui/error-codes/E0005.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     let x = Some(1);
     let Some(y) = x; //~ ERROR E0005
diff --git a/src/test/ui/error-codes/E0005.stderr b/src/test/ui/error-codes/E0005.stderr
index b321a69805e..2a38aae0873 100644
--- a/src/test/ui/error-codes/E0005.stderr
+++ b/src/test/ui/error-codes/E0005.stderr
@@ -1,5 +1,5 @@
 error[E0005]: refutable pattern in local binding: `None` not covered
-  --> $DIR/E0005.rs:13:9
+  --> $DIR/E0005.rs:3:9
    |
 LL |     let Some(y) = x; //~ ERROR E0005
    |         ^^^^^^^ pattern `None` not covered
diff --git a/src/test/ui/error-codes/E0007.rs b/src/test/ui/error-codes/E0007.rs
index d5acbdebbe9..8fc6342002b 100644
--- a/src/test/ui/error-codes/E0007.rs
+++ b/src/test/ui/error-codes/E0007.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     let x = Some("s".to_string());
     match x {
diff --git a/src/test/ui/error-codes/E0007.stderr b/src/test/ui/error-codes/E0007.stderr
index f662365b8f1..a5d694976cf 100644
--- a/src/test/ui/error-codes/E0007.stderr
+++ b/src/test/ui/error-codes/E0007.stderr
@@ -1,11 +1,11 @@
 error[E0007]: cannot bind by-move with sub-bindings
-  --> $DIR/E0007.rs:14:9
+  --> $DIR/E0007.rs:4:9
    |
 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
+  --> $DIR/E0007.rs:4:26
    |
 LL |         op_string @ Some(s) => {},
    |                          ^ not allowed after `@`
diff --git a/src/test/ui/error-codes/E0008.nll.stderr b/src/test/ui/error-codes/E0008.nll.stderr
index ce627cb741a..2505c03a148 100644
--- a/src/test/ui/error-codes/E0008.nll.stderr
+++ b/src/test/ui/error-codes/E0008.nll.stderr
@@ -1,5 +1,5 @@
 error[E0008]: cannot bind by-move into a pattern guard
-  --> $DIR/E0008.rs:13:14
+  --> $DIR/E0008.rs:3:14
    |
 LL |         Some(s) if s.len() == 0 => {},
    |              ^ moves value into pattern guard
diff --git a/src/test/ui/error-codes/E0008.rs b/src/test/ui/error-codes/E0008.rs
index ba5720e6f0a..c87ef4cb854 100644
--- a/src/test/ui/error-codes/E0008.rs
+++ b/src/test/ui/error-codes/E0008.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     match Some("hi".to_string()) {
         Some(s) if s.len() == 0 => {},
diff --git a/src/test/ui/error-codes/E0008.stderr b/src/test/ui/error-codes/E0008.stderr
index e9af3166ed5..d5c44efd667 100644
--- a/src/test/ui/error-codes/E0008.stderr
+++ b/src/test/ui/error-codes/E0008.stderr
@@ -1,5 +1,5 @@
 error[E0008]: cannot bind by-move into a pattern guard
-  --> $DIR/E0008.rs:13:14
+  --> $DIR/E0008.rs:3:14
    |
 LL |         Some(s) if s.len() == 0 => {},
    |              ^ moves value into pattern guard
diff --git a/src/test/ui/error-codes/E0009.rs b/src/test/ui/error-codes/E0009.rs
index 02e2e80e7ea..0610d03cfe9 100644
--- a/src/test/ui/error-codes/E0009.rs
+++ b/src/test/ui/error-codes/E0009.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     struct X { x: (), }
     let x = Some((X { x: () }, X { x: () }));
diff --git a/src/test/ui/error-codes/E0009.stderr b/src/test/ui/error-codes/E0009.stderr
index 8b3071420dd..f8acb9a09d9 100644
--- a/src/test/ui/error-codes/E0009.stderr
+++ b/src/test/ui/error-codes/E0009.stderr
@@ -1,5 +1,5 @@
 error[E0009]: cannot bind by-move and by-ref in the same pattern
-  --> $DIR/E0009.rs:15:15
+  --> $DIR/E0009.rs:5:15
    |
 LL |         Some((y, ref z)) => {},
    |               ^  ----- both by-ref and by-move used
diff --git a/src/test/ui/error-codes/E0010-teach.rs b/src/test/ui/error-codes/E0010-teach.rs
index e5ccf32af14..fc5dffb37cf 100644
--- a/src/test/ui/error-codes/E0010-teach.rs
+++ b/src/test/ui/error-codes/E0010-teach.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // compile-flags: -Z teach
 
 #![feature(box_syntax)]
diff --git a/src/test/ui/error-codes/E0010-teach.stderr b/src/test/ui/error-codes/E0010-teach.stderr
index fa5c767caf2..da0aadfded5 100644
--- a/src/test/ui/error-codes/E0010-teach.stderr
+++ b/src/test/ui/error-codes/E0010-teach.stderr
@@ -1,5 +1,5 @@
 error[E0010]: allocations are not allowed in constants
-  --> $DIR/E0010-teach.rs:16:24
+  --> $DIR/E0010-teach.rs:6:24
    |
 LL | const CON : Box<i32> = box 0; //~ ERROR E0010
    |                        ^^^^^ allocation not allowed in constants
diff --git a/src/test/ui/error-codes/E0010.rs b/src/test/ui/error-codes/E0010.rs
index 66a9319a7df..e62997640f4 100644
--- a/src/test/ui/error-codes/E0010.rs
+++ b/src/test/ui/error-codes/E0010.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(box_syntax)]
 #![allow(warnings)]
 
diff --git a/src/test/ui/error-codes/E0010.stderr b/src/test/ui/error-codes/E0010.stderr
index 83c1b409a51..b4b490922c4 100644
--- a/src/test/ui/error-codes/E0010.stderr
+++ b/src/test/ui/error-codes/E0010.stderr
@@ -1,5 +1,5 @@
 error[E0010]: allocations are not allowed in constants
-  --> $DIR/E0010.rs:14:24
+  --> $DIR/E0010.rs:4:24
    |
 LL | const CON : Box<i32> = box 0; //~ ERROR E0010
    |                        ^^^^^ allocation not allowed in constants
diff --git a/src/test/ui/error-codes/E0017.nll.stderr b/src/test/ui/error-codes/E0017.nll.stderr
index 8f8d87739b8..305e85563eb 100644
--- a/src/test/ui/error-codes/E0017.nll.stderr
+++ b/src/test/ui/error-codes/E0017.nll.stderr
@@ -1,29 +1,29 @@
 error[E0017]: references in constants may only refer to immutable values
-  --> $DIR/E0017.rs:14:30
+  --> $DIR/E0017.rs:4:30
    |
 LL | const CR: &'static mut i32 = &mut C; //~ ERROR E0017
    |                              ^^^^^^ constants require immutable values
 
 error: cannot mutate statics in the initializer of another static
-  --> $DIR/E0017.rs:15:39
+  --> $DIR/E0017.rs:5:39
    |
 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:15:39
+  --> $DIR/E0017.rs:5:39
    |
 LL | static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017
    |                                       ^^^^^^ statics require immutable values
 
 error[E0596]: cannot borrow immutable static item `X` as mutable
-  --> $DIR/E0017.rs:15:39
+  --> $DIR/E0017.rs:5:39
    |
 LL | static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017
    |                                       ^^^^^^ cannot borrow as mutable
 
 error[E0017]: references in statics may only refer to immutable values
-  --> $DIR/E0017.rs:18:38
+  --> $DIR/E0017.rs:8:38
    |
 LL | static CONST_REF: &'static mut i32 = &mut C; //~ ERROR E0017
    |                                      ^^^^^^ statics require immutable values
diff --git a/src/test/ui/error-codes/E0017.rs b/src/test/ui/error-codes/E0017.rs
index bf400fde365..71250eb4621 100644
--- a/src/test/ui/error-codes/E0017.rs
+++ b/src/test/ui/error-codes/E0017.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 static X: i32 = 1;
 const C: i32 = 2;
 
diff --git a/src/test/ui/error-codes/E0017.stderr b/src/test/ui/error-codes/E0017.stderr
index 94a90d92d3e..93f5ca55455 100644
--- a/src/test/ui/error-codes/E0017.stderr
+++ b/src/test/ui/error-codes/E0017.stderr
@@ -1,29 +1,29 @@
 error[E0017]: references in constants may only refer to immutable values
-  --> $DIR/E0017.rs:14:30
+  --> $DIR/E0017.rs:4:30
    |
 LL | const CR: &'static mut i32 = &mut C; //~ ERROR E0017
    |                              ^^^^^^ constants require immutable values
 
 error: cannot mutate statics in the initializer of another static
-  --> $DIR/E0017.rs:15:39
+  --> $DIR/E0017.rs:5:39
    |
 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:15:39
+  --> $DIR/E0017.rs:5:39
    |
 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
+  --> $DIR/E0017.rs:5:44
    |
 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:18:38
+  --> $DIR/E0017.rs:8:38
    |
 LL | static CONST_REF: &'static mut i32 = &mut C; //~ ERROR E0017
    |                                      ^^^^^^ statics require immutable values
diff --git a/src/test/ui/error-codes/E0023.rs b/src/test/ui/error-codes/E0023.rs
index 24032c59844..2a97e9048a4 100644
--- a/src/test/ui/error-codes/E0023.rs
+++ b/src/test/ui/error-codes/E0023.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 enum Fruit {
     Apple(String, String),
     Pear(u32),
diff --git a/src/test/ui/error-codes/E0023.stderr b/src/test/ui/error-codes/E0023.stderr
index 26f7baeb1a4..37704fc3233 100644
--- a/src/test/ui/error-codes/E0023.stderr
+++ b/src/test/ui/error-codes/E0023.stderr
@@ -1,17 +1,17 @@
 error[E0023]: this pattern has 1 field, but the corresponding tuple variant has 2 fields
-  --> $DIR/E0023.rs:20:9
+  --> $DIR/E0023.rs:10:9
    |
 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
+  --> $DIR/E0023.rs:11:9
    |
 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
+  --> $DIR/E0023.rs:12:9
    |
 LL |         Fruit::Pear(1, 2) => {}, //~ ERROR E0023
    |         ^^^^^^^^^^^^^^^^^ expected 1 field, found 2
diff --git a/src/test/ui/error-codes/E0025.rs b/src/test/ui/error-codes/E0025.rs
index 81d0ea8a5e2..549269a7542 100644
--- a/src/test/ui/error-codes/E0025.rs
+++ b/src/test/ui/error-codes/E0025.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Foo {
     a: u8,
     b: u8,
diff --git a/src/test/ui/error-codes/E0025.stderr b/src/test/ui/error-codes/E0025.stderr
index f60372559a3..dfec6d0276a 100644
--- a/src/test/ui/error-codes/E0025.stderr
+++ b/src/test/ui/error-codes/E0025.stderr
@@ -1,5 +1,5 @@
 error[E0025]: field `a` bound multiple times in the pattern
-  --> $DIR/E0025.rs:18:21
+  --> $DIR/E0025.rs:8:21
    |
 LL |     let Foo { a: x, a: y, b: 0 } = x;
    |               ----  ^^^^ multiple uses of `a` in pattern
diff --git a/src/test/ui/error-codes/E0026-teach.rs b/src/test/ui/error-codes/E0026-teach.rs
index e0ce44a8b6f..7c51004ffe4 100644
--- a/src/test/ui/error-codes/E0026-teach.rs
+++ b/src/test/ui/error-codes/E0026-teach.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // compile-flags: -Z teach
 
 struct Thing {
diff --git a/src/test/ui/error-codes/E0026-teach.stderr b/src/test/ui/error-codes/E0026-teach.stderr
index 67ea32fba86..1a80edcbbe2 100644
--- a/src/test/ui/error-codes/E0026-teach.stderr
+++ b/src/test/ui/error-codes/E0026-teach.stderr
@@ -1,5 +1,5 @@
 error[E0026]: struct `Thing` does not have a field named `z`
-  --> $DIR/E0026-teach.rs:21:23
+  --> $DIR/E0026-teach.rs:11:23
    |
 LL |         Thing { x, y, z } => {}
    |                       ^ struct `Thing` does not have this field
diff --git a/src/test/ui/error-codes/E0026.rs b/src/test/ui/error-codes/E0026.rs
index f8ad7b5a30e..0b1ea1c7bcd 100644
--- a/src/test/ui/error-codes/E0026.rs
+++ b/src/test/ui/error-codes/E0026.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Thing {
     x: u32,
     y: u32
diff --git a/src/test/ui/error-codes/E0026.stderr b/src/test/ui/error-codes/E0026.stderr
index 9dabbc8a775..031481812d0 100644
--- a/src/test/ui/error-codes/E0026.stderr
+++ b/src/test/ui/error-codes/E0026.stderr
@@ -1,5 +1,5 @@
 error[E0026]: struct `Thing` does not have a field named `z`
-  --> $DIR/E0026.rs:19:23
+  --> $DIR/E0026.rs:9:23
    |
 LL |         Thing { x, y, z } => {}
    |                       ^ struct `Thing` does not have this field
diff --git a/src/test/ui/error-codes/E0027-teach.rs b/src/test/ui/error-codes/E0027-teach.rs
index 17e045bb8b0..11402f01484 100644
--- a/src/test/ui/error-codes/E0027-teach.rs
+++ b/src/test/ui/error-codes/E0027-teach.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // compile-flags: -Z teach
 
 struct Dog {
diff --git a/src/test/ui/error-codes/E0027-teach.stderr b/src/test/ui/error-codes/E0027-teach.stderr
index 1c5333d76a8..aa4cb9d4d18 100644
--- a/src/test/ui/error-codes/E0027-teach.stderr
+++ b/src/test/ui/error-codes/E0027-teach.stderr
@@ -1,5 +1,5 @@
 error[E0027]: pattern does not mention field `name`
-  --> $DIR/E0027-teach.rs:22:9
+  --> $DIR/E0027-teach.rs:12:9
    |
 LL |         Dog { age: x } => {}
    |         ^^^^^^^^^^^^^^ missing field `name`
diff --git a/src/test/ui/error-codes/E0027.rs b/src/test/ui/error-codes/E0027.rs
index b63b0ab5dfd..b8c6a2b7fcd 100644
--- a/src/test/ui/error-codes/E0027.rs
+++ b/src/test/ui/error-codes/E0027.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Dog {
     name: String,
     age: u32,
diff --git a/src/test/ui/error-codes/E0027.stderr b/src/test/ui/error-codes/E0027.stderr
index 208b263e0f8..4f17bba6477 100644
--- a/src/test/ui/error-codes/E0027.stderr
+++ b/src/test/ui/error-codes/E0027.stderr
@@ -1,5 +1,5 @@
 error[E0027]: pattern does not mention field `name`
-  --> $DIR/E0027.rs:20:9
+  --> $DIR/E0027.rs:10:9
    |
 LL |         Dog { age: x } => {}
    |         ^^^^^^^^^^^^^^ missing field `name`
diff --git a/src/test/ui/error-codes/E0029-teach.rs b/src/test/ui/error-codes/E0029-teach.rs
index 328c46311af..83058d397cf 100644
--- a/src/test/ui/error-codes/E0029-teach.rs
+++ b/src/test/ui/error-codes/E0029-teach.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // compile-flags: -Z teach
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0029-teach.stderr b/src/test/ui/error-codes/E0029-teach.stderr
index bb4fac9a4cb..998ef4bc1d7 100644
--- a/src/test/ui/error-codes/E0029-teach.stderr
+++ b/src/test/ui/error-codes/E0029-teach.stderr
@@ -1,5 +1,5 @@
 error[E0029]: only char and numeric types are allowed in range patterns
-  --> $DIR/E0029-teach.rs:17:9
+  --> $DIR/E0029-teach.rs:7:9
    |
 LL |         "hello" ..= "world" => {}
    |         ^^^^^^^^^^^^^^^^^^^ ranges require char or numeric types
diff --git a/src/test/ui/error-codes/E0029.rs b/src/test/ui/error-codes/E0029.rs
index c89b4f5b377..fe0d851832b 100644
--- a/src/test/ui/error-codes/E0029.rs
+++ b/src/test/ui/error-codes/E0029.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     let s = "hoho";
 
diff --git a/src/test/ui/error-codes/E0029.stderr b/src/test/ui/error-codes/E0029.stderr
index d25666f9cf8..209d219191c 100644
--- a/src/test/ui/error-codes/E0029.stderr
+++ b/src/test/ui/error-codes/E0029.stderr
@@ -1,5 +1,5 @@
 error[E0029]: only char and numeric types are allowed in range patterns
-  --> $DIR/E0029.rs:15:9
+  --> $DIR/E0029.rs:5:9
    |
 LL |         "hello" ..= "world" => {}
    |         ^^^^^^^^^^^^^^^^^^^ ranges require char or numeric types
diff --git a/src/test/ui/error-codes/E0030-teach.rs b/src/test/ui/error-codes/E0030-teach.rs
index cf860cea24c..388064fb0fa 100644
--- a/src/test/ui/error-codes/E0030-teach.rs
+++ b/src/test/ui/error-codes/E0030-teach.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // compile-flags: -Z teach
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0030-teach.stderr b/src/test/ui/error-codes/E0030-teach.stderr
index 2a7243a9569..3f1ad4af3a9 100644
--- a/src/test/ui/error-codes/E0030-teach.stderr
+++ b/src/test/ui/error-codes/E0030-teach.stderr
@@ -1,5 +1,5 @@
 error[E0030]: lower range bound must be less than or equal to upper
-  --> $DIR/E0030-teach.rs:15:9
+  --> $DIR/E0030-teach.rs:5:9
    |
 LL |         1000 ..= 5 => {}
    |         ^^^^ lower bound larger than upper bound
diff --git a/src/test/ui/error-codes/E0030.rs b/src/test/ui/error-codes/E0030.rs
index e147dd932b0..58d856b7c9d 100644
--- a/src/test/ui/error-codes/E0030.rs
+++ b/src/test/ui/error-codes/E0030.rs
@@ -1,14 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-
 fn main() {
     match 5u32 {
         1000 ..= 5 => {}
diff --git a/src/test/ui/error-codes/E0030.stderr b/src/test/ui/error-codes/E0030.stderr
index 020655ee45b..db8161d8fd5 100644
--- a/src/test/ui/error-codes/E0030.stderr
+++ b/src/test/ui/error-codes/E0030.stderr
@@ -1,5 +1,5 @@
 error[E0030]: lower range bound must be less than or equal to upper
-  --> $DIR/E0030.rs:14:9
+  --> $DIR/E0030.rs:3:9
    |
 LL |         1000 ..= 5 => {}
    |         ^^^^ lower bound larger than upper bound
diff --git a/src/test/ui/error-codes/E0033-teach.rs b/src/test/ui/error-codes/E0033-teach.rs
index 51a1390bf79..0f0b8d864dc 100644
--- a/src/test/ui/error-codes/E0033-teach.rs
+++ b/src/test/ui/error-codes/E0033-teach.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // compile-flags: -Z teach
 
 trait SomeTrait {
diff --git a/src/test/ui/error-codes/E0033-teach.stderr b/src/test/ui/error-codes/E0033-teach.stderr
index 2fac6080f49..81a8f164b94 100644
--- a/src/test/ui/error-codes/E0033-teach.stderr
+++ b/src/test/ui/error-codes/E0033-teach.stderr
@@ -1,11 +1,11 @@
 error[E0423]: expected value, found trait `SomeTrait`
-  --> $DIR/E0033-teach.rs:18:33
+  --> $DIR/E0033-teach.rs:8:33
    |
 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
+  --> $DIR/E0033-teach.rs:8:20
    |
 LL |     let trait_obj: &SomeTrait = SomeTrait;
    |                    ^^^^^^^^^^ the trait `SomeTrait` cannot be made into an object
@@ -13,7 +13,7 @@ LL |     let trait_obj: &SomeTrait = SomeTrait;
    = note: method `foo` has no receiver
 
 error[E0033]: type `&dyn SomeTrait` cannot be dereferenced
-  --> $DIR/E0033-teach.rs:23:9
+  --> $DIR/E0033-teach.rs:13:9
    |
 LL |     let &invalid = trait_obj;
    |         ^^^^^^^^ type `&dyn SomeTrait` cannot be dereferenced
diff --git a/src/test/ui/error-codes/E0033.rs b/src/test/ui/error-codes/E0033.rs
index 3cdbb55f6de..5a4f3cbce60 100644
--- a/src/test/ui/error-codes/E0033.rs
+++ b/src/test/ui/error-codes/E0033.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait SomeTrait {
     fn foo();
 }
diff --git a/src/test/ui/error-codes/E0033.stderr b/src/test/ui/error-codes/E0033.stderr
index 5d789566beb..e250df81c14 100644
--- a/src/test/ui/error-codes/E0033.stderr
+++ b/src/test/ui/error-codes/E0033.stderr
@@ -1,11 +1,11 @@
 error[E0423]: expected value, found trait `SomeTrait`
-  --> $DIR/E0033.rs:16:33
+  --> $DIR/E0033.rs:6:33
    |
 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
+  --> $DIR/E0033.rs:6:20
    |
 LL |     let trait_obj: &SomeTrait = SomeTrait;
    |                    ^^^^^^^^^^ the trait `SomeTrait` cannot be made into an object
@@ -13,7 +13,7 @@ LL |     let trait_obj: &SomeTrait = SomeTrait;
    = note: method `foo` has no receiver
 
 error[E0033]: type `&dyn SomeTrait` cannot be dereferenced
-  --> $DIR/E0033.rs:21:9
+  --> $DIR/E0033.rs:11:9
    |
 LL |     let &invalid = trait_obj;
    |         ^^^^^^^^ type `&dyn SomeTrait` cannot be dereferenced
diff --git a/src/test/ui/error-codes/E0034.rs b/src/test/ui/error-codes/E0034.rs
index 6eebd4d4d53..f962da115e0 100644
--- a/src/test/ui/error-codes/E0034.rs
+++ b/src/test/ui/error-codes/E0034.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Test;
 
 trait Trait1 {
diff --git a/src/test/ui/error-codes/E0034.stderr b/src/test/ui/error-codes/E0034.stderr
index cec0f2d2a80..3c5569eb79f 100644
--- a/src/test/ui/error-codes/E0034.stderr
+++ b/src/test/ui/error-codes/E0034.stderr
@@ -1,16 +1,16 @@
 error[E0034]: multiple applicable items in scope
-  --> $DIR/E0034.rs:30:5
+  --> $DIR/E0034.rs:20:5
    |
 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
+  --> $DIR/E0034.rs:12:5
    |
 LL |     fn foo() {}
    |     ^^^^^^^^
 note: candidate #2 is defined in an impl of the trait `Trait2` for the type `Test`
-  --> $DIR/E0034.rs:26:5
+  --> $DIR/E0034.rs:16:5
    |
 LL |     fn foo() {}
    |     ^^^^^^^^
diff --git a/src/test/ui/error-codes/E0038.rs b/src/test/ui/error-codes/E0038.rs
index 8087928c051..b2226803da7 100644
--- a/src/test/ui/error-codes/E0038.rs
+++ b/src/test/ui/error-codes/E0038.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait Trait {
     fn foo(&self) -> Self;
 }
diff --git a/src/test/ui/error-codes/E0038.stderr b/src/test/ui/error-codes/E0038.stderr
index bc76323f183..74b77338c85 100644
--- a/src/test/ui/error-codes/E0038.stderr
+++ b/src/test/ui/error-codes/E0038.stderr
@@ -1,5 +1,5 @@
 error[E0038]: the trait `Trait` cannot be made into an object
-  --> $DIR/E0038.rs:15:1
+  --> $DIR/E0038.rs:5:1
    |
 LL | fn call_foo(x: Box<Trait>) {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Trait` cannot be made into an object
diff --git a/src/test/ui/error-codes/E0040.rs b/src/test/ui/error-codes/E0040.rs
index 8385d68c540..113efae82c5 100644
--- a/src/test/ui/error-codes/E0040.rs
+++ b/src/test/ui/error-codes/E0040.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Foo {
     x: i32,
 }
diff --git a/src/test/ui/error-codes/E0040.stderr b/src/test/ui/error-codes/E0040.stderr
index 01636ae98b8..96645590281 100644
--- a/src/test/ui/error-codes/E0040.stderr
+++ b/src/test/ui/error-codes/E0040.stderr
@@ -1,5 +1,5 @@
 error[E0040]: explicit use of destructor method
-  --> $DIR/E0040.rs:23:7
+  --> $DIR/E0040.rs:13:7
    |
 LL |     x.drop();
    |       ^^^^ explicit destructor calls not allowed
diff --git a/src/test/ui/error-codes/E0044.rs b/src/test/ui/error-codes/E0044.rs
index 35e3c768558..a5265e7dc17 100644
--- a/src/test/ui/error-codes/E0044.rs
+++ b/src/test/ui/error-codes/E0044.rs
@@ -1,13 +1,3 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 extern {
     fn sqrt<T>(f: T) -> T;
     //~^ ERROR foreign items may not have type parameters [E0044]
diff --git a/src/test/ui/error-codes/E0044.stderr b/src/test/ui/error-codes/E0044.stderr
index ce966251bf4..57c21116b28 100644
--- a/src/test/ui/error-codes/E0044.stderr
+++ b/src/test/ui/error-codes/E0044.stderr
@@ -1,5 +1,5 @@
 error[E0044]: foreign items may not have type parameters
-  --> $DIR/E0044.rs:12:5
+  --> $DIR/E0044.rs:2:5
    |
 LL |     fn sqrt<T>(f: T) -> T;
    |     ^^^^^^^^^^^^^^^^^^^^^^ can't have type parameters
diff --git a/src/test/ui/error-codes/E0045.rs b/src/test/ui/error-codes/E0045.rs
index 57c639dd143..fb3df56f706 100644
--- a/src/test/ui/error-codes/E0045.rs
+++ b/src/test/ui/error-codes/E0045.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 extern "Rust" { fn foo(x: u8, ...); }   //~ ERROR E0045
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0045.stderr b/src/test/ui/error-codes/E0045.stderr
index 35a592a6986..b38bbc169bd 100644
--- a/src/test/ui/error-codes/E0045.stderr
+++ b/src/test/ui/error-codes/E0045.stderr
@@ -1,5 +1,5 @@
 error[E0045]: variadic function must have C or cdecl calling convention
-  --> $DIR/E0045.rs:11:17
+  --> $DIR/E0045.rs:1:17
    |
 LL | extern "Rust" { fn foo(x: u8, ...); }   //~ ERROR E0045
    |                 ^^^^^^^^^^^^^^^^^^^ variadics require C or cdecl calling convention
diff --git a/src/test/ui/error-codes/E0049.rs b/src/test/ui/error-codes/E0049.rs
index 5867e11e9ac..c141f8a8828 100644
--- a/src/test/ui/error-codes/E0049.rs
+++ b/src/test/ui/error-codes/E0049.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait Foo {
     fn foo<T: Default>(x: T) -> Self;
 }
diff --git a/src/test/ui/error-codes/E0049.stderr b/src/test/ui/error-codes/E0049.stderr
index b7eaad57043..0d132bdbbdd 100644
--- a/src/test/ui/error-codes/E0049.stderr
+++ b/src/test/ui/error-codes/E0049.stderr
@@ -1,5 +1,5 @@
 error[E0049]: method `foo` has 0 type parameters but its trait declaration has 1 type parameter
-  --> $DIR/E0049.rs:18:5
+  --> $DIR/E0049.rs:8:5
    |
 LL |     fn foo<T: Default>(x: T) -> Self;
    |     --------------------------------- expected 1 type parameter
diff --git a/src/test/ui/error-codes/E0050.rs b/src/test/ui/error-codes/E0050.rs
index 2ccc380c540..98fb62785ee 100644
--- a/src/test/ui/error-codes/E0050.rs
+++ b/src/test/ui/error-codes/E0050.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait Foo {
     fn foo(&self, x: u8) -> bool;
     fn bar(&self, x: u8, y: u8, z: u8);
diff --git a/src/test/ui/error-codes/E0050.stderr b/src/test/ui/error-codes/E0050.stderr
index 6c797e00731..2c1fd111d26 100644
--- a/src/test/ui/error-codes/E0050.stderr
+++ b/src/test/ui/error-codes/E0050.stderr
@@ -1,5 +1,5 @@
 error[E0050]: method `foo` has 1 parameter but the declaration in trait `Foo::foo` has 2
-  --> $DIR/E0050.rs:20:12
+  --> $DIR/E0050.rs:10:12
    |
 LL |     fn foo(&self, x: u8) -> bool;
    |            ------------ trait requires 2 parameters
@@ -8,7 +8,7 @@ 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
+  --> $DIR/E0050.rs:11:12
    |
 LL |     fn bar(&self, x: u8, y: u8, z: u8);
    |            -------------------------- trait requires 4 parameters
@@ -17,7 +17,7 @@ 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:13
+  --> $DIR/E0050.rs:12:13
    |
 LL |     fn less(&self);
    |             ----- trait requires 1 parameter
diff --git a/src/test/ui/error-codes/E0054.rs b/src/test/ui/error-codes/E0054.rs
index 158cd6ff9bb..55bda4ead96 100644
--- a/src/test/ui/error-codes/E0054.rs
+++ b/src/test/ui/error-codes/E0054.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     let x = 5;
     let x_is_nonzero = x as bool; //~ ERROR E0054
diff --git a/src/test/ui/error-codes/E0054.stderr b/src/test/ui/error-codes/E0054.stderr
index d5cf18460fd..416029c5f86 100644
--- a/src/test/ui/error-codes/E0054.stderr
+++ b/src/test/ui/error-codes/E0054.stderr
@@ -1,5 +1,5 @@
 error[E0054]: cannot cast as `bool`
-  --> $DIR/E0054.rs:13:24
+  --> $DIR/E0054.rs:3:24
    |
 LL |     let x_is_nonzero = x as bool; //~ ERROR E0054
    |                        ^^^^^^^^^ unsupported cast
diff --git a/src/test/ui/error-codes/E0055.rs b/src/test/ui/error-codes/E0055.rs
index 6e186b81cad..a3ade92d24f 100644
--- a/src/test/ui/error-codes/E0055.rs
+++ b/src/test/ui/error-codes/E0055.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![recursion_limit="2"]
 struct Foo;
 
diff --git a/src/test/ui/error-codes/E0055.stderr b/src/test/ui/error-codes/E0055.stderr
index dddbd92765a..cd2bd923d5a 100644
--- a/src/test/ui/error-codes/E0055.stderr
+++ b/src/test/ui/error-codes/E0055.stderr
@@ -1,5 +1,5 @@
 error[E0055]: reached the recursion limit while auto-dereferencing `Foo`
-  --> $DIR/E0055.rs:21:13
+  --> $DIR/E0055.rs:11:13
    |
 LL |     ref_foo.foo();
    |             ^^^ deref recursion limit reached
diff --git a/src/test/ui/error-codes/E0057.rs b/src/test/ui/error-codes/E0057.rs
index 1fb5498b099..83f941f65b9 100644
--- a/src/test/ui/error-codes/E0057.rs
+++ b/src/test/ui/error-codes/E0057.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     let f = |x| x * 3;
     let a = f(); //~ ERROR E0057
diff --git a/src/test/ui/error-codes/E0057.stderr b/src/test/ui/error-codes/E0057.stderr
index fb3e710b8cf..5906a05c32c 100644
--- a/src/test/ui/error-codes/E0057.stderr
+++ b/src/test/ui/error-codes/E0057.stderr
@@ -1,11 +1,11 @@
 error[E0057]: this function takes 1 parameter but 0 parameters were supplied
-  --> $DIR/E0057.rs:13:13
+  --> $DIR/E0057.rs:3:13
    |
 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
+  --> $DIR/E0057.rs:5:13
    |
 LL |     let c = f(2, 3); //~ ERROR E0057
    |             ^^^^^^^ expected 1 parameter
diff --git a/src/test/ui/error-codes/E0059.rs b/src/test/ui/error-codes/E0059.rs
index 4ae9b2f91d2..f775089bfb9 100644
--- a/src/test/ui/error-codes/E0059.rs
+++ b/src/test/ui/error-codes/E0059.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(unboxed_closures)]
 
 fn foo<F: Fn<i32>>(f: F) -> F::Output { f(3) } //~ ERROR E0059
diff --git a/src/test/ui/error-codes/E0059.stderr b/src/test/ui/error-codes/E0059.stderr
index abe8b729c93..a96e1a0beab 100644
--- a/src/test/ui/error-codes/E0059.stderr
+++ b/src/test/ui/error-codes/E0059.stderr
@@ -1,5 +1,5 @@
 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
+  --> $DIR/E0059.rs:3:41
    |
 LL | fn foo<F: Fn<i32>>(f: F) -> F::Output { f(3) } //~ ERROR E0059
    |                                         ^^^^
diff --git a/src/test/ui/error-codes/E0060.rs b/src/test/ui/error-codes/E0060.rs
index f4505209b66..2bb490fb3ea 100644
--- a/src/test/ui/error-codes/E0060.rs
+++ b/src/test/ui/error-codes/E0060.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 extern "C" {
     fn printf(_: *const u8, ...) -> u32;
 }
diff --git a/src/test/ui/error-codes/E0060.stderr b/src/test/ui/error-codes/E0060.stderr
index c6aac6e41c6..8a2e7d1a72c 100644
--- a/src/test/ui/error-codes/E0060.stderr
+++ b/src/test/ui/error-codes/E0060.stderr
@@ -1,5 +1,5 @@
 error[E0060]: this function takes at least 1 parameter but 0 parameters were supplied
-  --> $DIR/E0060.rs:16:14
+  --> $DIR/E0060.rs:6:14
    |
 LL |     fn printf(_: *const u8, ...) -> u32;
    |     ------------------------------------ defined here
diff --git a/src/test/ui/error-codes/E0061.rs b/src/test/ui/error-codes/E0061.rs
index 221e18cf89d..e64ea36ac92 100644
--- a/src/test/ui/error-codes/E0061.rs
+++ b/src/test/ui/error-codes/E0061.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn f(a: u16, b: &str) {}
 
 fn f2(a: u16) {}
diff --git a/src/test/ui/error-codes/E0061.stderr b/src/test/ui/error-codes/E0061.stderr
index d5842a18bc8..73103241f7a 100644
--- a/src/test/ui/error-codes/E0061.stderr
+++ b/src/test/ui/error-codes/E0061.stderr
@@ -1,5 +1,5 @@
 error[E0061]: this function takes 2 parameters but 1 parameter was supplied
-  --> $DIR/E0061.rs:16:5
+  --> $DIR/E0061.rs:6:5
    |
 LL | fn f(a: u16, b: &str) {}
    | --------------------- defined here
@@ -8,7 +8,7 @@ LL |     f(0);
    |     ^^^^ expected 2 parameters
 
 error[E0061]: this function takes 1 parameter but 0 parameters were supplied
-  --> $DIR/E0061.rs:20:5
+  --> $DIR/E0061.rs:10:5
    |
 LL | fn f2(a: u16) {}
    | ------------- defined here
diff --git a/src/test/ui/error-codes/E0062.rs b/src/test/ui/error-codes/E0062.rs
index 684c9464ff8..3b7f8875086 100644
--- a/src/test/ui/error-codes/E0062.rs
+++ b/src/test/ui/error-codes/E0062.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Foo {
     x: i32
 }
diff --git a/src/test/ui/error-codes/E0062.stderr b/src/test/ui/error-codes/E0062.stderr
index c5c38c6f5ff..a3e14099507 100644
--- a/src/test/ui/error-codes/E0062.stderr
+++ b/src/test/ui/error-codes/E0062.stderr
@@ -1,5 +1,5 @@
 error[E0062]: field `x` specified more than once
-  --> $DIR/E0062.rs:18:9
+  --> $DIR/E0062.rs:8:9
    |
 LL |         x: 0,
    |         ---- first use of `x`
diff --git a/src/test/ui/error-codes/E0063.rs b/src/test/ui/error-codes/E0063.rs
index 0208aff066b..37fc0a2987d 100644
--- a/src/test/ui/error-codes/E0063.rs
+++ b/src/test/ui/error-codes/E0063.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // ignore-tidy-linelength
 
 struct SingleFoo {
diff --git a/src/test/ui/error-codes/E0063.stderr b/src/test/ui/error-codes/E0063.stderr
index 1ed54b4e7ba..5d366e0c1c4 100644
--- a/src/test/ui/error-codes/E0063.stderr
+++ b/src/test/ui/error-codes/E0063.stderr
@@ -1,23 +1,23 @@
 error[E0063]: missing field `x` in initializer of `SingleFoo`
-  --> $DIR/E0063.rs:42:13
+  --> $DIR/E0063.rs:32:13
    |
 LL |     let w = SingleFoo { };
    |             ^^^^^^^^^ missing `x`
 
 error[E0063]: missing fields `y`, `z` in initializer of `PluralFoo`
-  --> $DIR/E0063.rs:44:13
+  --> $DIR/E0063.rs:34:13
    |
 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
+  --> $DIR/E0063.rs:36:13
    |
 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
+  --> $DIR/E0063.rs:38:13
    |
 LL |     let z = TruncatedPluralFoo{x:1};
    |             ^^^^^^^^^^^^^^^^^^ missing `a`, `b`, `c` and 2 other fields
diff --git a/src/test/ui/error-codes/E0067.rs b/src/test/ui/error-codes/E0067.rs
index a3fc30ee1c7..5925443ddc4 100644
--- a/src/test/ui/error-codes/E0067.rs
+++ b/src/test/ui/error-codes/E0067.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use std::collections::LinkedList;
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0067.stderr b/src/test/ui/error-codes/E0067.stderr
index 43e1ca4096c..fd4ca7c9f70 100644
--- a/src/test/ui/error-codes/E0067.stderr
+++ b/src/test/ui/error-codes/E0067.stderr
@@ -1,5 +1,5 @@
 error[E0368]: binary assignment operation `+=` cannot be applied to type `std::collections::LinkedList<_>`
-  --> $DIR/E0067.rs:14:5
+  --> $DIR/E0067.rs:4:5
    |
 LL |     LinkedList::new() += 1; //~ ERROR E0368
    |     -----------------^^^^^
@@ -9,7 +9,7 @@ LL |     LinkedList::new() += 1; //~ ERROR E0368
    = note: an implementation of `std::ops::AddAssign` might be missing for `std::collections::LinkedList<_>`
 
 error[E0067]: invalid left-hand side expression
-  --> $DIR/E0067.rs:14:5
+  --> $DIR/E0067.rs:4:5
    |
 LL |     LinkedList::new() += 1; //~ ERROR E0368
    |     ^^^^^^^^^^^^^^^^^ invalid expression for left-hand side
diff --git a/src/test/ui/error-codes/E0069.rs b/src/test/ui/error-codes/E0069.rs
index a6a7898ed4e..a4ba9fd8deb 100644
--- a/src/test/ui/error-codes/E0069.rs
+++ b/src/test/ui/error-codes/E0069.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn foo() -> u8 {
     return;
     //~^ ERROR `return;` in a function whose return type is not `()`
diff --git a/src/test/ui/error-codes/E0069.stderr b/src/test/ui/error-codes/E0069.stderr
index 12b778f42e2..ff9bbe01dd5 100644
--- a/src/test/ui/error-codes/E0069.stderr
+++ b/src/test/ui/error-codes/E0069.stderr
@@ -1,5 +1,5 @@
 error[E0069]: `return;` in a function whose return type is not `()`
-  --> $DIR/E0069.rs:12:5
+  --> $DIR/E0069.rs:2:5
    |
 LL | fn foo() -> u8 {
    |             -- expected `u8` because of this return type
diff --git a/src/test/ui/error-codes/E0070.rs b/src/test/ui/error-codes/E0070.rs
index ba66bd03aef..ab956d81098 100644
--- a/src/test/ui/error-codes/E0070.rs
+++ b/src/test/ui/error-codes/E0070.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 const SOME_CONST : i32 = 12;
 
 fn some_other_func() {}
diff --git a/src/test/ui/error-codes/E0070.stderr b/src/test/ui/error-codes/E0070.stderr
index 892e6943112..a6a8925d991 100644
--- a/src/test/ui/error-codes/E0070.stderr
+++ b/src/test/ui/error-codes/E0070.stderr
@@ -1,17 +1,17 @@
 error[E0070]: invalid left-hand side expression
-  --> $DIR/E0070.rs:16:5
+  --> $DIR/E0070.rs:6:5
    |
 LL |     SOME_CONST = 14; //~ ERROR E0070
    |     ^^^^^^^^^^^^^^^ left-hand of expression not valid
 
 error[E0070]: invalid left-hand side expression
-  --> $DIR/E0070.rs:17:5
+  --> $DIR/E0070.rs:7:5
    |
 LL |     1 = 3; //~ ERROR E0070
    |     ^^^^^ left-hand of expression not valid
 
 error[E0308]: mismatched types
-  --> $DIR/E0070.rs:18:25
+  --> $DIR/E0070.rs:8:25
    |
 LL |     some_other_func() = 4; //~ ERROR E0070
    |                         ^ expected (), found integral variable
@@ -20,7 +20,7 @@ LL |     some_other_func() = 4; //~ ERROR E0070
               found type `{integer}`
 
 error[E0070]: invalid left-hand side expression
-  --> $DIR/E0070.rs:18:5
+  --> $DIR/E0070.rs:8:5
    |
 LL |     some_other_func() = 4; //~ ERROR E0070
    |     ^^^^^^^^^^^^^^^^^^^^^ left-hand of expression not valid
diff --git a/src/test/ui/error-codes/E0071.rs b/src/test/ui/error-codes/E0071.rs
index d71dc7966fa..bd8469de75d 100644
--- a/src/test/ui/error-codes/E0071.rs
+++ b/src/test/ui/error-codes/E0071.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 enum Foo {}
 type FooAlias = Foo;
 
diff --git a/src/test/ui/error-codes/E0071.stderr b/src/test/ui/error-codes/E0071.stderr
index 637338672e0..ae312fc400a 100644
--- a/src/test/ui/error-codes/E0071.stderr
+++ b/src/test/ui/error-codes/E0071.stderr
@@ -1,5 +1,5 @@
 error[E0071]: expected struct, variant or union type, found enum `Foo`
-  --> $DIR/E0071.rs:15:13
+  --> $DIR/E0071.rs:5:13
    |
 LL |     let u = FooAlias { value: 0 };
    |             ^^^^^^^^ not a struct
diff --git a/src/test/ui/error-codes/E0075.rs b/src/test/ui/error-codes/E0075.rs
index d7783904e2e..7feab0a8bd7 100644
--- a/src/test/ui/error-codes/E0075.rs
+++ b/src/test/ui/error-codes/E0075.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(repr_simd)]
 
 #[repr(simd)]
diff --git a/src/test/ui/error-codes/E0075.stderr b/src/test/ui/error-codes/E0075.stderr
index d29d5d78803..abf68897096 100644
--- a/src/test/ui/error-codes/E0075.stderr
+++ b/src/test/ui/error-codes/E0075.stderr
@@ -1,5 +1,5 @@
 error[E0075]: SIMD vector cannot be empty
-  --> $DIR/E0075.rs:14:1
+  --> $DIR/E0075.rs:4:1
    |
 LL | struct Bad; //~ ERROR E0075
    | ^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0076.rs b/src/test/ui/error-codes/E0076.rs
index b159cf107ce..a27072eb71e 100644
--- a/src/test/ui/error-codes/E0076.rs
+++ b/src/test/ui/error-codes/E0076.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(repr_simd)]
 
 #[repr(simd)]
diff --git a/src/test/ui/error-codes/E0076.stderr b/src/test/ui/error-codes/E0076.stderr
index ae349403810..2c2842d152b 100644
--- a/src/test/ui/error-codes/E0076.stderr
+++ b/src/test/ui/error-codes/E0076.stderr
@@ -1,5 +1,5 @@
 error[E0076]: SIMD vector should be homogeneous
-  --> $DIR/E0076.rs:14:1
+  --> $DIR/E0076.rs:4:1
    |
 LL | struct Bad(u16, u32, u32);
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^ SIMD elements must have the same type
diff --git a/src/test/ui/error-codes/E0077.rs b/src/test/ui/error-codes/E0077.rs
index b074e90b2c0..fa2d5e24fa3 100644
--- a/src/test/ui/error-codes/E0077.rs
+++ b/src/test/ui/error-codes/E0077.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(repr_simd)]
 
 #[repr(simd)]
diff --git a/src/test/ui/error-codes/E0077.stderr b/src/test/ui/error-codes/E0077.stderr
index 42a169f5a20..9f3e1fa5c35 100644
--- a/src/test/ui/error-codes/E0077.stderr
+++ b/src/test/ui/error-codes/E0077.stderr
@@ -1,5 +1,5 @@
 error[E0077]: SIMD vector element type should be machine type
-  --> $DIR/E0077.rs:14:1
+  --> $DIR/E0077.rs:4:1
    |
 LL | struct Bad(String); //~ ERROR E0077
    | ^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0080.rs b/src/test/ui/error-codes/E0080.rs
index 2ab15dfedca..ac0e7737f43 100644
--- a/src/test/ui/error-codes/E0080.rs
+++ b/src/test/ui/error-codes/E0080.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 enum Enum {
     X = (1 << 500), //~ ERROR E0080
     //~| shift left with overflow
diff --git a/src/test/ui/error-codes/E0080.stderr b/src/test/ui/error-codes/E0080.stderr
index e60c905587d..4d37881c1e1 100644
--- a/src/test/ui/error-codes/E0080.stderr
+++ b/src/test/ui/error-codes/E0080.stderr
@@ -1,11 +1,11 @@
 error[E0080]: evaluation of constant value failed
-  --> $DIR/E0080.rs:12:9
+  --> $DIR/E0080.rs:2:9
    |
 LL |     X = (1 << 500), //~ ERROR E0080
    |         ^^^^^^^^^^ attempt to shift left with overflow
 
 error[E0080]: evaluation of constant value failed
-  --> $DIR/E0080.rs:14:9
+  --> $DIR/E0080.rs:4:9
    |
 LL |     Y = (1 / 0) //~ ERROR E0080
    |         ^^^^^^^ attempt to divide by zero
diff --git a/src/test/ui/error-codes/E0081.rs b/src/test/ui/error-codes/E0081.rs
index c0cdad25868..33c8c14306b 100644
--- a/src/test/ui/error-codes/E0081.rs
+++ b/src/test/ui/error-codes/E0081.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 enum Enum {
     P = 3,
     X = 3,
diff --git a/src/test/ui/error-codes/E0081.stderr b/src/test/ui/error-codes/E0081.stderr
index 36150d7c526..0b3d351e1ac 100644
--- a/src/test/ui/error-codes/E0081.stderr
+++ b/src/test/ui/error-codes/E0081.stderr
@@ -1,5 +1,5 @@
 error[E0081]: discriminant value `3` already exists
-  --> $DIR/E0081.rs:13:9
+  --> $DIR/E0081.rs:3:9
    |
 LL |     P = 3,
    |         - first use of `3`
diff --git a/src/test/ui/error-codes/E0084.rs b/src/test/ui/error-codes/E0084.rs
index 2be206c9702..a550e04129a 100644
--- a/src/test/ui/error-codes/E0084.rs
+++ b/src/test/ui/error-codes/E0084.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[repr(i32)] //~ ERROR: E0084
 enum Foo {}
 
diff --git a/src/test/ui/error-codes/E0084.stderr b/src/test/ui/error-codes/E0084.stderr
index d0bc519c996..353c825f528 100644
--- a/src/test/ui/error-codes/E0084.stderr
+++ b/src/test/ui/error-codes/E0084.stderr
@@ -1,5 +1,5 @@
 error[E0084]: unsupported representation for zero-variant enum
-  --> $DIR/E0084.rs:11:1
+  --> $DIR/E0084.rs:1:1
    |
 LL | #[repr(i32)] //~ ERROR: E0084
    | ^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0091.rs b/src/test/ui/error-codes/E0091.rs
index da988dbf819..2427f5cfe13 100644
--- a/src/test/ui/error-codes/E0091.rs
+++ b/src/test/ui/error-codes/E0091.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 type Foo<T> = u32; //~ ERROR E0091
 type Foo2<A, B> = Box<A>; //~ ERROR E0091
 
diff --git a/src/test/ui/error-codes/E0091.stderr b/src/test/ui/error-codes/E0091.stderr
index 2116f8f6476..d32960f82cb 100644
--- a/src/test/ui/error-codes/E0091.stderr
+++ b/src/test/ui/error-codes/E0091.stderr
@@ -1,11 +1,11 @@
 error[E0091]: type parameter `T` is unused
-  --> $DIR/E0091.rs:11:10
+  --> $DIR/E0091.rs:1:10
    |
 LL | type Foo<T> = u32; //~ ERROR E0091
    |          ^ unused type parameter
 
 error[E0091]: type parameter `B` is unused
-  --> $DIR/E0091.rs:12:14
+  --> $DIR/E0091.rs:2:14
    |
 LL | type Foo2<A, B> = Box<A>; //~ ERROR E0091
    |              ^ unused type parameter
diff --git a/src/test/ui/error-codes/E0092.rs b/src/test/ui/error-codes/E0092.rs
index b08164ac06d..ddaace98bd4 100644
--- a/src/test/ui/error-codes/E0092.rs
+++ b/src/test/ui/error-codes/E0092.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(intrinsics)]
 extern "rust-intrinsic" {
     fn atomic_foo(); //~ ERROR E0092
diff --git a/src/test/ui/error-codes/E0092.stderr b/src/test/ui/error-codes/E0092.stderr
index 50d6d63b99c..a4535177526 100644
--- a/src/test/ui/error-codes/E0092.stderr
+++ b/src/test/ui/error-codes/E0092.stderr
@@ -1,5 +1,5 @@
 error[E0092]: unrecognized atomic operation function: `foo`
-  --> $DIR/E0092.rs:13:5
+  --> $DIR/E0092.rs:3:5
    |
 LL |     fn atomic_foo(); //~ ERROR E0092
    |     ^^^^^^^^^^^^^^^^ unrecognized atomic operation
diff --git a/src/test/ui/error-codes/E0093.rs b/src/test/ui/error-codes/E0093.rs
index d84f9f64911..a2f0b1ae443 100644
--- a/src/test/ui/error-codes/E0093.rs
+++ b/src/test/ui/error-codes/E0093.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(intrinsics)]
 extern "rust-intrinsic" {
     fn foo();
diff --git a/src/test/ui/error-codes/E0093.stderr b/src/test/ui/error-codes/E0093.stderr
index f261b83a0b8..cb0305593a7 100644
--- a/src/test/ui/error-codes/E0093.stderr
+++ b/src/test/ui/error-codes/E0093.stderr
@@ -1,5 +1,5 @@
 error[E0093]: unrecognized intrinsic function: `foo`
-  --> $DIR/E0093.rs:13:5
+  --> $DIR/E0093.rs:3:5
    |
 LL |     fn foo();
    |     ^^^^^^^^^ unrecognized intrinsic
diff --git a/src/test/ui/error-codes/E0094.rs b/src/test/ui/error-codes/E0094.rs
index 3a31874b244..0d58e5a2862 100644
--- a/src/test/ui/error-codes/E0094.rs
+++ b/src/test/ui/error-codes/E0094.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(intrinsics)]
 extern "rust-intrinsic" {
     fn size_of<T, U>() -> usize; //~ ERROR E0094
diff --git a/src/test/ui/error-codes/E0094.stderr b/src/test/ui/error-codes/E0094.stderr
index 322802fc44f..97bdbfbe5ab 100644
--- a/src/test/ui/error-codes/E0094.stderr
+++ b/src/test/ui/error-codes/E0094.stderr
@@ -1,5 +1,5 @@
 error[E0094]: intrinsic has wrong number of type parameters: found 2, expected 1
-  --> $DIR/E0094.rs:13:15
+  --> $DIR/E0094.rs:3:15
    |
 LL |     fn size_of<T, U>() -> usize; //~ ERROR E0094
    |               ^^^^^^ expected 1 type parameter
diff --git a/src/test/ui/error-codes/E0106.rs b/src/test/ui/error-codes/E0106.rs
index 0674930a11c..d6537d12363 100644
--- a/src/test/ui/error-codes/E0106.rs
+++ b/src/test/ui/error-codes/E0106.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Foo {
     x: &bool,
     //~^ ERROR E0106
diff --git a/src/test/ui/error-codes/E0106.stderr b/src/test/ui/error-codes/E0106.stderr
index 9862dca3fde..cea9581e701 100644
--- a/src/test/ui/error-codes/E0106.stderr
+++ b/src/test/ui/error-codes/E0106.stderr
@@ -1,29 +1,29 @@
 error[E0106]: missing lifetime specifier
-  --> $DIR/E0106.rs:12:8
+  --> $DIR/E0106.rs:2:8
    |
 LL |     x: &bool,
    |        ^ expected lifetime parameter
 
 error[E0106]: missing lifetime specifier
-  --> $DIR/E0106.rs:17:7
+  --> $DIR/E0106.rs:7:7
    |
 LL |     B(&bool),
    |       ^ expected lifetime parameter
 
 error[E0106]: missing lifetime specifier
-  --> $DIR/E0106.rs:20:14
+  --> $DIR/E0106.rs:10:14
    |
 LL | type MyStr = &str;
    |              ^ expected lifetime parameter
 
 error[E0106]: missing lifetime specifier
-  --> $DIR/E0106.rs:27:10
+  --> $DIR/E0106.rs:17:10
    |
 LL |     baz: Baz,
    |          ^^^ expected lifetime parameter
 
 error[E0106]: missing lifetime specifiers
-  --> $DIR/E0106.rs:30:11
+  --> $DIR/E0106.rs:20:11
    |
 LL |     buzz: Buzz,
    |           ^^^^ expected 2 lifetime parameters
diff --git a/src/test/ui/error-codes/E0107.rs b/src/test/ui/error-codes/E0107.rs
index 87ac9e37853..35173dcce30 100644
--- a/src/test/ui/error-codes/E0107.rs
+++ b/src/test/ui/error-codes/E0107.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Foo<'a>(&'a str);
 struct Buzz<'a, 'b>(&'a str, &'b str);
 
diff --git a/src/test/ui/error-codes/E0107.stderr b/src/test/ui/error-codes/E0107.stderr
index a07c92cf26a..486810ab113 100644
--- a/src/test/ui/error-codes/E0107.stderr
+++ b/src/test/ui/error-codes/E0107.stderr
@@ -1,17 +1,17 @@
 error[E0107]: wrong number of lifetime arguments: expected 2, found 1
-  --> $DIR/E0107.rs:21:11
+  --> $DIR/E0107.rs:11:11
    |
 LL |     buzz: Buzz<'a>,
    |           ^^^^^^^^ expected 2 lifetime arguments
 
 error[E0107]: wrong number of lifetime arguments: expected 0, found 1
-  --> $DIR/E0107.rs:24:14
+  --> $DIR/E0107.rs:14:14
    |
 LL |     bar: Bar<'a>,
    |              ^^ unexpected lifetime argument
 
 error[E0107]: wrong number of lifetime arguments: expected 1, found 3
-  --> $DIR/E0107.rs:27:19
+  --> $DIR/E0107.rs:17:19
    |
 LL |     foo2: Foo<'a, 'b, 'c>,
    |                   ^^  ^^ unexpected lifetime argument
diff --git a/src/test/ui/error-codes/E0109.rs b/src/test/ui/error-codes/E0109.rs
index 9fc47842250..2e382564962 100644
--- a/src/test/ui/error-codes/E0109.rs
+++ b/src/test/ui/error-codes/E0109.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 type X = u32<i32>; //~ ERROR E0109
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0109.stderr b/src/test/ui/error-codes/E0109.stderr
index 6473517bfad..447b106c629 100644
--- a/src/test/ui/error-codes/E0109.stderr
+++ b/src/test/ui/error-codes/E0109.stderr
@@ -1,5 +1,5 @@
 error[E0109]: type parameters are not allowed on this type
-  --> $DIR/E0109.rs:11:14
+  --> $DIR/E0109.rs:1:14
    |
 LL | type X = u32<i32>; //~ ERROR E0109
    |              ^^^ type parameter not allowed
diff --git a/src/test/ui/error-codes/E0110.rs b/src/test/ui/error-codes/E0110.rs
index fd169f4acc5..2de5da16ad7 100644
--- a/src/test/ui/error-codes/E0110.rs
+++ b/src/test/ui/error-codes/E0110.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 type X = u32<'static>; //~ ERROR E0110
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0110.stderr b/src/test/ui/error-codes/E0110.stderr
index 7f5b78684fb..609b8b58276 100644
--- a/src/test/ui/error-codes/E0110.stderr
+++ b/src/test/ui/error-codes/E0110.stderr
@@ -1,5 +1,5 @@
 error[E0110]: lifetime parameters are not allowed on this type
-  --> $DIR/E0110.rs:11:14
+  --> $DIR/E0110.rs:1:14
    |
 LL | type X = u32<'static>; //~ ERROR E0110
    |              ^^^^^^^ lifetime parameter not allowed
diff --git a/src/test/ui/error-codes/E0116.rs b/src/test/ui/error-codes/E0116.rs
index cd7d8dc3efb..898beb10b6c 100644
--- a/src/test/ui/error-codes/E0116.rs
+++ b/src/test/ui/error-codes/E0116.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 impl Vec<u8> {}
 //~^ ERROR E0116
 
diff --git a/src/test/ui/error-codes/E0116.stderr b/src/test/ui/error-codes/E0116.stderr
index 7c2f35a3305..a5ceeb4a55d 100644
--- a/src/test/ui/error-codes/E0116.stderr
+++ b/src/test/ui/error-codes/E0116.stderr
@@ -1,5 +1,5 @@
 error[E0116]: cannot define inherent `impl` for a type outside of the crate where the type is defined
-  --> $DIR/E0116.rs:11:1
+  --> $DIR/E0116.rs:1:1
    |
 LL | impl Vec<u8> {}
    | ^^^^^^^^^^^^^^^ impl for type defined outside of crate.
diff --git a/src/test/ui/error-codes/E0117.rs b/src/test/ui/error-codes/E0117.rs
index 982f875c7b0..18dd809f3ff 100644
--- a/src/test/ui/error-codes/E0117.rs
+++ b/src/test/ui/error-codes/E0117.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 impl Drop for u32 {} //~ ERROR E0117
 //~| ERROR the Drop trait may only be implemented on structures
 //~| implementing Drop requires a struct
diff --git a/src/test/ui/error-codes/E0117.stderr b/src/test/ui/error-codes/E0117.stderr
index 045ae700955..8e32db49ced 100644
--- a/src/test/ui/error-codes/E0117.stderr
+++ b/src/test/ui/error-codes/E0117.stderr
@@ -1,11 +1,11 @@
 error[E0120]: the Drop trait may only be implemented on structures
-  --> $DIR/E0117.rs:11:15
+  --> $DIR/E0117.rs:1:15
    |
 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
+  --> $DIR/E0117.rs:1:1
    |
 LL | impl Drop for u32 {} //~ ERROR E0117
    | ^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate
diff --git a/src/test/ui/error-codes/E0118.rs b/src/test/ui/error-codes/E0118.rs
index d37ff34b861..7bf36210f3a 100644
--- a/src/test/ui/error-codes/E0118.rs
+++ b/src/test/ui/error-codes/E0118.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 impl (u8, u8) { //~ ERROR E0118
     fn get_state(&self) -> String {
         String::new()
diff --git a/src/test/ui/error-codes/E0118.stderr b/src/test/ui/error-codes/E0118.stderr
index 896213e3487..787f8caec7f 100644
--- a/src/test/ui/error-codes/E0118.stderr
+++ b/src/test/ui/error-codes/E0118.stderr
@@ -1,5 +1,5 @@
 error[E0118]: no base type found for inherent implementation
-  --> $DIR/E0118.rs:11:6
+  --> $DIR/E0118.rs:1:6
    |
 LL | impl (u8, u8) { //~ ERROR E0118
    |      ^^^^^^^^ impl requires a base type
diff --git a/src/test/ui/error-codes/E0119.rs b/src/test/ui/error-codes/E0119.rs
index 9528631b304..7f89e5a1a52 100644
--- a/src/test/ui/error-codes/E0119.rs
+++ b/src/test/ui/error-codes/E0119.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait MyTrait {
     fn get(&self) -> usize;
 }
diff --git a/src/test/ui/error-codes/E0119.stderr b/src/test/ui/error-codes/E0119.stderr
index f1e942d4cf5..af9acb294bc 100644
--- a/src/test/ui/error-codes/E0119.stderr
+++ b/src/test/ui/error-codes/E0119.stderr
@@ -1,5 +1,5 @@
 error[E0119]: conflicting implementations of trait `MyTrait` for type `Foo`:
-  --> $DIR/E0119.rs:23:1
+  --> $DIR/E0119.rs:13:1
    |
 LL | impl<T> MyTrait for T {
    | --------------------- first implementation here
diff --git a/src/test/ui/error-codes/E0120.rs b/src/test/ui/error-codes/E0120.rs
index 8d09b877f00..049707415e5 100644
--- a/src/test/ui/error-codes/E0120.rs
+++ b/src/test/ui/error-codes/E0120.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait MyTrait { fn foo() {} }
 
 impl Drop for MyTrait {
diff --git a/src/test/ui/error-codes/E0120.stderr b/src/test/ui/error-codes/E0120.stderr
index 6237500c7ae..9b6603dbaca 100644
--- a/src/test/ui/error-codes/E0120.stderr
+++ b/src/test/ui/error-codes/E0120.stderr
@@ -1,5 +1,5 @@
 error[E0120]: the Drop trait may only be implemented on structures
-  --> $DIR/E0120.rs:13:15
+  --> $DIR/E0120.rs:3:15
    |
 LL | impl Drop for MyTrait {
    |               ^^^^^^^ implementing Drop requires a struct
diff --git a/src/test/ui/error-codes/E0121.rs b/src/test/ui/error-codes/E0121.rs
index b26b5f41bfe..f8b4d61b323 100644
--- a/src/test/ui/error-codes/E0121.rs
+++ b/src/test/ui/error-codes/E0121.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn foo() -> _ { 5 } //~ ERROR E0121
 
 static BAR: _ = "test"; //~ ERROR E0121
diff --git a/src/test/ui/error-codes/E0121.stderr b/src/test/ui/error-codes/E0121.stderr
index 019e637aa8c..75e03c659b7 100644
--- a/src/test/ui/error-codes/E0121.stderr
+++ b/src/test/ui/error-codes/E0121.stderr
@@ -1,11 +1,11 @@
 error[E0121]: the type placeholder `_` is not allowed within types on item signatures
-  --> $DIR/E0121.rs:11:13
+  --> $DIR/E0121.rs:1:13
    |
 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
+  --> $DIR/E0121.rs:3:13
    |
 LL | static BAR: _ = "test"; //~ ERROR E0121
    |             ^ not allowed in type signatures
diff --git a/src/test/ui/error-codes/E0124.rs b/src/test/ui/error-codes/E0124.rs
index 3ef20c6dd40..9d6a716a6da 100644
--- a/src/test/ui/error-codes/E0124.rs
+++ b/src/test/ui/error-codes/E0124.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Foo {
     field1: i32,
     field1: i32,
diff --git a/src/test/ui/error-codes/E0124.stderr b/src/test/ui/error-codes/E0124.stderr
index c95162c9d21..73819a89d75 100644
--- a/src/test/ui/error-codes/E0124.stderr
+++ b/src/test/ui/error-codes/E0124.stderr
@@ -1,5 +1,5 @@
 error[E0124]: field `field1` is already declared
-  --> $DIR/E0124.rs:13:5
+  --> $DIR/E0124.rs:3:5
    |
 LL |     field1: i32,
    |     ----------- `field1` first declared here
diff --git a/src/test/ui/error-codes/E0128.rs b/src/test/ui/error-codes/E0128.rs
index 37071012825..f42c32b91cc 100644
--- a/src/test/ui/error-codes/E0128.rs
+++ b/src/test/ui/error-codes/E0128.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Foo<T=U, U=()> { //~ ERROR E0128
     field1: T,
     field2: U,
diff --git a/src/test/ui/error-codes/E0128.stderr b/src/test/ui/error-codes/E0128.stderr
index 81da580f0d5..9ea3c09e63f 100644
--- a/src/test/ui/error-codes/E0128.stderr
+++ b/src/test/ui/error-codes/E0128.stderr
@@ -1,5 +1,5 @@
 error[E0128]: type parameters with a default cannot use forward declared identifiers
-  --> $DIR/E0128.rs:11:14
+  --> $DIR/E0128.rs:1:14
    |
 LL | struct Foo<T=U, U=()> { //~ ERROR E0128
    |              ^ defaulted type parameters cannot be forward declared
diff --git a/src/test/ui/error-codes/E0130.rs b/src/test/ui/error-codes/E0130.rs
index d11b59cdf33..1ac546b9dbe 100644
--- a/src/test/ui/error-codes/E0130.rs
+++ b/src/test/ui/error-codes/E0130.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 extern {
     fn foo((a, b): (u32, u32));
     //~^ ERROR E0130
diff --git a/src/test/ui/error-codes/E0130.stderr b/src/test/ui/error-codes/E0130.stderr
index 3b54b1b8669..a45571f40a1 100644
--- a/src/test/ui/error-codes/E0130.stderr
+++ b/src/test/ui/error-codes/E0130.stderr
@@ -1,5 +1,5 @@
 error[E0130]: patterns aren't allowed in foreign function declarations
-  --> $DIR/E0130.rs:12:12
+  --> $DIR/E0130.rs:2:12
    |
 LL |     fn foo((a, b): (u32, u32));
    |            ^^^^^^ pattern not allowed in foreign function
diff --git a/src/test/ui/error-codes/E0131.rs b/src/test/ui/error-codes/E0131.rs
index c7e31edd301..3ed739949a0 100644
--- a/src/test/ui/error-codes/E0131.rs
+++ b/src/test/ui/error-codes/E0131.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main<T>() {
     //~^ ERROR E0131
 }
diff --git a/src/test/ui/error-codes/E0131.stderr b/src/test/ui/error-codes/E0131.stderr
index 46bc872746c..4467e19e95d 100644
--- a/src/test/ui/error-codes/E0131.stderr
+++ b/src/test/ui/error-codes/E0131.stderr
@@ -1,5 +1,5 @@
 error[E0131]: `main` function is not allowed to have generic parameters
-  --> $DIR/E0131.rs:11:8
+  --> $DIR/E0131.rs:1:8
    |
 LL | fn main<T>() {
    |        ^^^ `main` cannot have generic parameters
diff --git a/src/test/ui/error-codes/E0132.rs b/src/test/ui/error-codes/E0132.rs
index 25ccb344aba..fb5e5d7b95a 100644
--- a/src/test/ui/error-codes/E0132.rs
+++ b/src/test/ui/error-codes/E0132.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(start)]
 
 #[start]
diff --git a/src/test/ui/error-codes/E0132.stderr b/src/test/ui/error-codes/E0132.stderr
index 80d1c29d50f..e19b421bfdb 100644
--- a/src/test/ui/error-codes/E0132.stderr
+++ b/src/test/ui/error-codes/E0132.stderr
@@ -1,5 +1,5 @@
 error[E0132]: start function is not allowed to have type parameters
-  --> $DIR/E0132.rs:14:5
+  --> $DIR/E0132.rs:4:5
    |
 LL | fn f< T >() {} //~ ERROR E0132
    |     ^^^^^ start function cannot have type parameters
diff --git a/src/test/ui/error-codes/E0133.rs b/src/test/ui/error-codes/E0133.rs
index 2e54f65e7bf..52494ce6078 100644
--- a/src/test/ui/error-codes/E0133.rs
+++ b/src/test/ui/error-codes/E0133.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 unsafe fn f() { return; }
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0133.stderr b/src/test/ui/error-codes/E0133.stderr
index 9be80f8f21b..1eb696506f3 100644
--- a/src/test/ui/error-codes/E0133.stderr
+++ b/src/test/ui/error-codes/E0133.stderr
@@ -1,5 +1,5 @@
 error[E0133]: call to unsafe function is unsafe and requires unsafe function or block
-  --> $DIR/E0133.rs:14:5
+  --> $DIR/E0133.rs:4:5
    |
 LL |     f();
    |     ^^^ call to unsafe function
diff --git a/src/test/ui/error-codes/E0137.rs b/src/test/ui/error-codes/E0137.rs
index 067ebcc727c..b8299c71bdf 100644
--- a/src/test/ui/error-codes/E0137.rs
+++ b/src/test/ui/error-codes/E0137.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(main)]
 
 #[main]
diff --git a/src/test/ui/error-codes/E0137.stderr b/src/test/ui/error-codes/E0137.stderr
index ab2f9ba5bea..a5f05d33a08 100644
--- a/src/test/ui/error-codes/E0137.stderr
+++ b/src/test/ui/error-codes/E0137.stderr
@@ -1,5 +1,5 @@
 error[E0137]: multiple functions with a #[main] attribute
-  --> $DIR/E0137.rs:17:1
+  --> $DIR/E0137.rs:7:1
    |
 LL | fn foo() {}
    | ----------- first #[main] function
diff --git a/src/test/ui/error-codes/E0138.rs b/src/test/ui/error-codes/E0138.rs
index 856616c8570..6f3c36282e8 100644
--- a/src/test/ui/error-codes/E0138.rs
+++ b/src/test/ui/error-codes/E0138.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(start)]
 
 #[start]
diff --git a/src/test/ui/error-codes/E0138.stderr b/src/test/ui/error-codes/E0138.stderr
index e713b11b37f..745dccfb175 100644
--- a/src/test/ui/error-codes/E0138.stderr
+++ b/src/test/ui/error-codes/E0138.stderr
@@ -1,5 +1,5 @@
 error[E0138]: multiple 'start' functions
-  --> $DIR/E0138.rs:17:1
+  --> $DIR/E0138.rs:7:1
    |
 LL | fn foo(argc: isize, argv: *const *const u8) -> isize { 0 }
    | ---------------------------------------------------------- previous `start` function here
diff --git a/src/test/ui/error-codes/E0152.rs b/src/test/ui/error-codes/E0152.rs
index 96a4d51bd24..dcaf9208835 100644
--- a/src/test/ui/error-codes/E0152.rs
+++ b/src/test/ui/error-codes/E0152.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(lang_items)]
 
 #[lang = "arc"]
diff --git a/src/test/ui/error-codes/E0152.stderr b/src/test/ui/error-codes/E0152.stderr
index a0530f24de6..401c1755fa8 100644
--- a/src/test/ui/error-codes/E0152.stderr
+++ b/src/test/ui/error-codes/E0152.stderr
@@ -1,5 +1,5 @@
 error[E0152]: duplicate lang item found: `arc`.
-  --> $DIR/E0152.rs:14:1
+  --> $DIR/E0152.rs:4:1
    |
 LL | struct Foo; //~ ERROR E0152
    | ^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0161.ast.stderr b/src/test/ui/error-codes/E0161.ast.stderr
index 903019590ef..536a81a4bc6 100644
--- a/src/test/ui/error-codes/E0161.ast.stderr
+++ b/src/test/ui/error-codes/E0161.ast.stderr
@@ -1,5 +1,5 @@
 error[E0161]: cannot move a value of type [i32]: the size of [i32] cannot be statically determined
-  --> $DIR/E0161.rs:32:9
+  --> $DIR/E0161.rs:22:9
    |
 LL |     box *x;
    |         ^^
diff --git a/src/test/ui/error-codes/E0161.astul.stderr b/src/test/ui/error-codes/E0161.astul.stderr
index bfeab0c6e6b..2baba998f12 100644
--- a/src/test/ui/error-codes/E0161.astul.stderr
+++ b/src/test/ui/error-codes/E0161.astul.stderr
@@ -1,5 +1,5 @@
 error[E0161]: cannot move a value of type [i32]: the size of [i32] cannot be statically determined
-  --> $DIR/E0161.rs:32:5
+  --> $DIR/E0161.rs:22:5
    |
 LL |     box *x;
    |     ^^^^^^
diff --git a/src/test/ui/error-codes/E0161.edition.stderr b/src/test/ui/error-codes/E0161.edition.stderr
index 903019590ef..536a81a4bc6 100644
--- a/src/test/ui/error-codes/E0161.edition.stderr
+++ b/src/test/ui/error-codes/E0161.edition.stderr
@@ -1,5 +1,5 @@
 error[E0161]: cannot move a value of type [i32]: the size of [i32] cannot be statically determined
-  --> $DIR/E0161.rs:32:9
+  --> $DIR/E0161.rs:22:9
    |
 LL |     box *x;
    |         ^^
diff --git a/src/test/ui/error-codes/E0161.editionul.stderr b/src/test/ui/error-codes/E0161.editionul.stderr
index bfeab0c6e6b..2baba998f12 100644
--- a/src/test/ui/error-codes/E0161.editionul.stderr
+++ b/src/test/ui/error-codes/E0161.editionul.stderr
@@ -1,5 +1,5 @@
 error[E0161]: cannot move a value of type [i32]: the size of [i32] cannot be statically determined
-  --> $DIR/E0161.rs:32:5
+  --> $DIR/E0161.rs:22:5
    |
 LL |     box *x;
    |     ^^^^^^
diff --git a/src/test/ui/error-codes/E0161.nll.stderr b/src/test/ui/error-codes/E0161.nll.stderr
index 903019590ef..536a81a4bc6 100644
--- a/src/test/ui/error-codes/E0161.nll.stderr
+++ b/src/test/ui/error-codes/E0161.nll.stderr
@@ -1,5 +1,5 @@
 error[E0161]: cannot move a value of type [i32]: the size of [i32] cannot be statically determined
-  --> $DIR/E0161.rs:32:9
+  --> $DIR/E0161.rs:22:9
    |
 LL |     box *x;
    |         ^^
diff --git a/src/test/ui/error-codes/E0161.nllul.stderr b/src/test/ui/error-codes/E0161.nllul.stderr
index bfeab0c6e6b..2baba998f12 100644
--- a/src/test/ui/error-codes/E0161.nllul.stderr
+++ b/src/test/ui/error-codes/E0161.nllul.stderr
@@ -1,5 +1,5 @@
 error[E0161]: cannot move a value of type [i32]: the size of [i32] cannot be statically determined
-  --> $DIR/E0161.rs:32:5
+  --> $DIR/E0161.rs:22:5
    |
 LL |     box *x;
    |     ^^^^^^
diff --git a/src/test/ui/error-codes/E0161.rs b/src/test/ui/error-codes/E0161.rs
index 26742ff9400..a6d2b245eb1 100644
--- a/src/test/ui/error-codes/E0161.rs
+++ b/src/test/ui/error-codes/E0161.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // ignore-compare-mode-nll
 
 // Check that E0161 is a hard error in all possible configurations that might
diff --git a/src/test/ui/error-codes/E0161.zflags.stderr b/src/test/ui/error-codes/E0161.zflags.stderr
index 903019590ef..536a81a4bc6 100644
--- a/src/test/ui/error-codes/E0161.zflags.stderr
+++ b/src/test/ui/error-codes/E0161.zflags.stderr
@@ -1,5 +1,5 @@
 error[E0161]: cannot move a value of type [i32]: the size of [i32] cannot be statically determined
-  --> $DIR/E0161.rs:32:9
+  --> $DIR/E0161.rs:22:9
    |
 LL |     box *x;
    |         ^^
diff --git a/src/test/ui/error-codes/E0161.zflagsul.stderr b/src/test/ui/error-codes/E0161.zflagsul.stderr
index bfeab0c6e6b..2baba998f12 100644
--- a/src/test/ui/error-codes/E0161.zflagsul.stderr
+++ b/src/test/ui/error-codes/E0161.zflagsul.stderr
@@ -1,5 +1,5 @@
 error[E0161]: cannot move a value of type [i32]: the size of [i32] cannot be statically determined
-  --> $DIR/E0161.rs:32:5
+  --> $DIR/E0161.rs:22:5
    |
 LL |     box *x;
    |     ^^^^^^
diff --git a/src/test/ui/error-codes/E0162.rs b/src/test/ui/error-codes/E0162.rs
index e13b0af6f79..d3221f8e176 100644
--- a/src/test/ui/error-codes/E0162.rs
+++ b/src/test/ui/error-codes/E0162.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Irrefutable(i32);
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0162.stderr b/src/test/ui/error-codes/E0162.stderr
index 91f402dad59..ca5c56cd59d 100644
--- a/src/test/ui/error-codes/E0162.stderr
+++ b/src/test/ui/error-codes/E0162.stderr
@@ -1,5 +1,5 @@
 error[E0162]: irrefutable if-let pattern
-  --> $DIR/E0162.rs:15:12
+  --> $DIR/E0162.rs:5:12
    |
 LL |     if let Irrefutable(x) = irr { //~ ERROR E0162
    |            ^^^^^^^^^^^^^^ irrefutable pattern
diff --git a/src/test/ui/error-codes/E0164.rs b/src/test/ui/error-codes/E0164.rs
index a7f10ddb5a7..2d412f754ed 100644
--- a/src/test/ui/error-codes/E0164.rs
+++ b/src/test/ui/error-codes/E0164.rs
@@ -1,14 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-
 enum Foo {}
 
 impl Foo {
diff --git a/src/test/ui/error-codes/E0164.stderr b/src/test/ui/error-codes/E0164.stderr
index 6eabace9b14..0debc8092e8 100644
--- a/src/test/ui/error-codes/E0164.stderr
+++ b/src/test/ui/error-codes/E0164.stderr
@@ -1,5 +1,5 @@
 error[E0164]: expected tuple struct/variant, found associated constant `<Foo>::B`
-  --> $DIR/E0164.rs:20:9
+  --> $DIR/E0164.rs:9:9
    |
 LL |         Foo::B(i) => i, //~ ERROR E0164
    |         ^^^^^^^^^ not a tuple variant or struct
diff --git a/src/test/ui/error-codes/E0165.rs b/src/test/ui/error-codes/E0165.rs
index 142635fc6ee..952071c8b9e 100644
--- a/src/test/ui/error-codes/E0165.rs
+++ b/src/test/ui/error-codes/E0165.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Irrefutable(i32);
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0165.stderr b/src/test/ui/error-codes/E0165.stderr
index 66be95e38d2..e0d192ea152 100644
--- a/src/test/ui/error-codes/E0165.stderr
+++ b/src/test/ui/error-codes/E0165.stderr
@@ -1,5 +1,5 @@
 error[E0165]: irrefutable while-let pattern
-  --> $DIR/E0165.rs:15:15
+  --> $DIR/E0165.rs:5:15
    |
 LL |     while let Irrefutable(x) = irr { //~ ERROR E0165
    |               ^^^^^^^^^^^^^^ irrefutable pattern
diff --git a/src/test/ui/error-codes/E0184.rs b/src/test/ui/error-codes/E0184.rs
index 5d72d00ffe8..0c448e4ad8b 100644
--- a/src/test/ui/error-codes/E0184.rs
+++ b/src/test/ui/error-codes/E0184.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[derive(Copy)] //~ ERROR E0184
 struct Foo;
 
diff --git a/src/test/ui/error-codes/E0184.stderr b/src/test/ui/error-codes/E0184.stderr
index eb6160bc005..471ba3870e2 100644
--- a/src/test/ui/error-codes/E0184.stderr
+++ b/src/test/ui/error-codes/E0184.stderr
@@ -1,5 +1,5 @@
 error[E0184]: the trait `Copy` may not be implemented for this type; the type has a destructor
-  --> $DIR/E0184.rs:11:10
+  --> $DIR/E0184.rs:1:10
    |
 LL | #[derive(Copy)] //~ ERROR E0184
    |          ^^^^ Copy not allowed on types with destructors
diff --git a/src/test/ui/error-codes/E0185.rs b/src/test/ui/error-codes/E0185.rs
index 0cd3d00a735..45eb8b0f239 100644
--- a/src/test/ui/error-codes/E0185.rs
+++ b/src/test/ui/error-codes/E0185.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait Foo {
     fn foo();
     //~^ NOTE trait method declared without `&self`
diff --git a/src/test/ui/error-codes/E0185.stderr b/src/test/ui/error-codes/E0185.stderr
index e5c92abc521..8a99c0688e3 100644
--- a/src/test/ui/error-codes/E0185.stderr
+++ b/src/test/ui/error-codes/E0185.stderr
@@ -1,5 +1,5 @@
 error[E0185]: method `foo` has a `&self` declaration in the impl, but not in the trait
-  --> $DIR/E0185.rs:19:5
+  --> $DIR/E0185.rs:9:5
    |
 LL |     fn foo();
    |     --------- trait method declared without `&self`
diff --git a/src/test/ui/error-codes/E0186.rs b/src/test/ui/error-codes/E0186.rs
index 55a3490cac4..83ef78ef2c0 100644
--- a/src/test/ui/error-codes/E0186.rs
+++ b/src/test/ui/error-codes/E0186.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait Foo {
     fn foo(&self); //~ `&self` used in trait
 }
diff --git a/src/test/ui/error-codes/E0186.stderr b/src/test/ui/error-codes/E0186.stderr
index 0556ef700ac..7fed0426ee8 100644
--- a/src/test/ui/error-codes/E0186.stderr
+++ b/src/test/ui/error-codes/E0186.stderr
@@ -1,5 +1,5 @@
 error[E0186]: method `foo` has a `&self` declaration in the trait, but not in the impl
-  --> $DIR/E0186.rs:18:5
+  --> $DIR/E0186.rs:8:5
    |
 LL |     fn foo(&self); //~ `&self` used in trait
    |     -------------- `&self` used in trait
diff --git a/src/test/ui/error-codes/E0191.rs b/src/test/ui/error-codes/E0191.rs
index c35c7e10f5a..356110671e7 100644
--- a/src/test/ui/error-codes/E0191.rs
+++ b/src/test/ui/error-codes/E0191.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait Trait {
     type Bar;
 }
diff --git a/src/test/ui/error-codes/E0191.stderr b/src/test/ui/error-codes/E0191.stderr
index f07529e7e9e..570b0ddc313 100644
--- a/src/test/ui/error-codes/E0191.stderr
+++ b/src/test/ui/error-codes/E0191.stderr
@@ -1,5 +1,5 @@
 error[E0191]: the value of the associated type `Bar` (from the trait `Trait`) must be specified
-  --> $DIR/E0191.rs:15:12
+  --> $DIR/E0191.rs:5:12
    |
 LL |     type Bar;
    |     --------- `Bar` defined here
diff --git a/src/test/ui/error-codes/E0192.rs b/src/test/ui/error-codes/E0192.rs
index 92f5876ee04..c52977e49b4 100644
--- a/src/test/ui/error-codes/E0192.rs
+++ b/src/test/ui/error-codes/E0192.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(optin_builtin_traits)]
 
 trait Trait {
diff --git a/src/test/ui/error-codes/E0192.stderr b/src/test/ui/error-codes/E0192.stderr
index fd8976271a5..bdfe717afe2 100644
--- a/src/test/ui/error-codes/E0192.stderr
+++ b/src/test/ui/error-codes/E0192.stderr
@@ -1,5 +1,5 @@
 error[E0192]: negative impls are only allowed for auto traits (e.g., `Send` and `Sync`)
-  --> $DIR/E0192.rs:19:1
+  --> $DIR/E0192.rs:9:1
    |
 LL | impl !Trait for Foo { } //~ ERROR E0192
    | ^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0194.rs b/src/test/ui/error-codes/E0194.rs
index 17e0751859d..71eff0e7465 100644
--- a/src/test/ui/error-codes/E0194.rs
+++ b/src/test/ui/error-codes/E0194.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait Foo<T> {
     fn do_something(&self) -> T;
     fn do_something_else<T: Clone>(&self, bar: T);
diff --git a/src/test/ui/error-codes/E0194.stderr b/src/test/ui/error-codes/E0194.stderr
index 6869f3c96f7..ab4918a4e27 100644
--- a/src/test/ui/error-codes/E0194.stderr
+++ b/src/test/ui/error-codes/E0194.stderr
@@ -1,5 +1,5 @@
 error[E0194]: type parameter `T` shadows another type parameter of the same name
-  --> $DIR/E0194.rs:13:26
+  --> $DIR/E0194.rs:3:26
    |
 LL | trait Foo<T> {
    |           - first `T` declared here
diff --git a/src/test/ui/error-codes/E0195.rs b/src/test/ui/error-codes/E0195.rs
index 4f4d7ce0dba..f712ee42b8c 100644
--- a/src/test/ui/error-codes/E0195.rs
+++ b/src/test/ui/error-codes/E0195.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait Trait {
     fn bar<'a,'b:'a>(x: &'a str, y: &'b str);
     //~^ NOTE lifetimes in impl do not match this method in trait
diff --git a/src/test/ui/error-codes/E0195.stderr b/src/test/ui/error-codes/E0195.stderr
index 3860c93a45f..57032c6b0c8 100644
--- a/src/test/ui/error-codes/E0195.stderr
+++ b/src/test/ui/error-codes/E0195.stderr
@@ -1,5 +1,5 @@
 error[E0195]: lifetime parameters or bounds on method `bar` do not match the trait declaration
-  --> $DIR/E0195.rs:19:11
+  --> $DIR/E0195.rs:9:11
    |
 LL |     fn bar<'a,'b:'a>(x: &'a str, y: &'b str);
    |           ---------- lifetimes in impl do not match this method in trait
diff --git a/src/test/ui/error-codes/E0197.rs b/src/test/ui/error-codes/E0197.rs
index f25fa9b92b9..4025a1f6c33 100644
--- a/src/test/ui/error-codes/E0197.rs
+++ b/src/test/ui/error-codes/E0197.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Foo;
 
 unsafe impl Foo { } //~ ERROR E0197
diff --git a/src/test/ui/error-codes/E0197.stderr b/src/test/ui/error-codes/E0197.stderr
index a18599e4f47..f58dcd791da 100644
--- a/src/test/ui/error-codes/E0197.stderr
+++ b/src/test/ui/error-codes/E0197.stderr
@@ -1,5 +1,5 @@
 error[E0197]: inherent impls cannot be unsafe
-  --> $DIR/E0197.rs:13:1
+  --> $DIR/E0197.rs:3:1
    |
 LL | unsafe impl Foo { } //~ ERROR E0197
    | ^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0198.rs b/src/test/ui/error-codes/E0198.rs
index 1a779a41e66..00ab0c35623 100644
--- a/src/test/ui/error-codes/E0198.rs
+++ b/src/test/ui/error-codes/E0198.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(optin_builtin_traits)]
 
 struct Foo;
diff --git a/src/test/ui/error-codes/E0198.stderr b/src/test/ui/error-codes/E0198.stderr
index 41ea0565ccc..e182cbd2ec1 100644
--- a/src/test/ui/error-codes/E0198.stderr
+++ b/src/test/ui/error-codes/E0198.stderr
@@ -1,5 +1,5 @@
 error[E0198]: negative impls cannot be unsafe
-  --> $DIR/E0198.rs:15:1
+  --> $DIR/E0198.rs:5:1
    |
 LL | unsafe impl !Send for Foo { } //~ ERROR E0198
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0199.rs b/src/test/ui/error-codes/E0199.rs
index 1a5cd1941a9..c95afa3f97d 100644
--- a/src/test/ui/error-codes/E0199.rs
+++ b/src/test/ui/error-codes/E0199.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(optin_builtin_traits)]
 
 struct Foo;
diff --git a/src/test/ui/error-codes/E0199.stderr b/src/test/ui/error-codes/E0199.stderr
index b3cfd0d21dd..ba55c4a58e4 100644
--- a/src/test/ui/error-codes/E0199.stderr
+++ b/src/test/ui/error-codes/E0199.stderr
@@ -1,5 +1,5 @@
 error[E0199]: implementing the trait `Bar` is not unsafe
-  --> $DIR/E0199.rs:16:1
+  --> $DIR/E0199.rs:6:1
    |
 LL | unsafe impl Bar for Foo { } //~ ERROR implementing the trait `Bar` is not unsafe [E0199]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0200.rs b/src/test/ui/error-codes/E0200.rs
index 6bfea0e59d7..24806a6cbb0 100644
--- a/src/test/ui/error-codes/E0200.rs
+++ b/src/test/ui/error-codes/E0200.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Foo;
 
 unsafe trait Bar { }
diff --git a/src/test/ui/error-codes/E0200.stderr b/src/test/ui/error-codes/E0200.stderr
index 07f848b501e..f6a8f32d238 100644
--- a/src/test/ui/error-codes/E0200.stderr
+++ b/src/test/ui/error-codes/E0200.stderr
@@ -1,5 +1,5 @@
 error[E0200]: the trait `Bar` requires an `unsafe impl` declaration
-  --> $DIR/E0200.rs:15:1
+  --> $DIR/E0200.rs:5:1
    |
 LL | impl Bar for Foo { } //~ ERROR E0200
    | ^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0201.rs b/src/test/ui/error-codes/E0201.rs
index ff6cb55f388..adefd4bcd46 100644
--- a/src/test/ui/error-codes/E0201.rs
+++ b/src/test/ui/error-codes/E0201.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Foo(u8);
 
 impl Foo {
diff --git a/src/test/ui/error-codes/E0201.stderr b/src/test/ui/error-codes/E0201.stderr
index 2b9e51f76fd..5d2f9f3e362 100644
--- a/src/test/ui/error-codes/E0201.stderr
+++ b/src/test/ui/error-codes/E0201.stderr
@@ -1,5 +1,5 @@
 error[E0201]: duplicate definitions with name `bar`:
-  --> $DIR/E0201.rs:15:5
+  --> $DIR/E0201.rs:5:5
    |
 LL |     fn bar(&self) -> bool { self.0 > 5 }
    |     ------------------------------------ previous definition of `bar` here
@@ -7,7 +7,7 @@ LL |     fn bar() {} //~ ERROR E0201
    |     ^^^^^^^^^^^ duplicate definition
 
 error[E0201]: duplicate definitions with name `baz`:
-  --> $DIR/E0201.rs:27:5
+  --> $DIR/E0201.rs:17:5
    |
 LL |     fn baz(&self) -> bool { true }
    |     ------------------------------ previous definition of `baz` here
@@ -15,7 +15,7 @@ LL |     fn baz(&self) -> bool { self.0 > 5 } //~ ERROR E0201
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ duplicate definition
 
 error[E0201]: duplicate definitions with name `Quux`:
-  --> $DIR/E0201.rs:28:5
+  --> $DIR/E0201.rs:18:5
    |
 LL |     type Quux = u32;
    |     ---------------- previous definition of `Quux` here
diff --git a/src/test/ui/error-codes/E0206.rs b/src/test/ui/error-codes/E0206.rs
index 9b3d1b351dd..bace0467581 100644
--- a/src/test/ui/error-codes/E0206.rs
+++ b/src/test/ui/error-codes/E0206.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 type Foo = [u8; 256];
 
 impl Copy for Foo { }
diff --git a/src/test/ui/error-codes/E0206.stderr b/src/test/ui/error-codes/E0206.stderr
index f2c23b0767a..499c6ae3f88 100644
--- a/src/test/ui/error-codes/E0206.stderr
+++ b/src/test/ui/error-codes/E0206.stderr
@@ -1,17 +1,17 @@
 error[E0206]: the trait `Copy` may not be implemented for this type
-  --> $DIR/E0206.rs:13:15
+  --> $DIR/E0206.rs:3:15
    |
 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
+  --> $DIR/E0206.rs:10:15
    |
 LL | impl Copy for &'static mut 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
+  --> $DIR/E0206.rs:3:1
    |
 LL | impl Copy for Foo { }
    | ^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate
diff --git a/src/test/ui/error-codes/E0207.rs b/src/test/ui/error-codes/E0207.rs
index bd87dbaf786..7f5d4ab5133 100644
--- a/src/test/ui/error-codes/E0207.rs
+++ b/src/test/ui/error-codes/E0207.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Foo;
 
 impl<T: Default> Foo { //~ ERROR E0207
diff --git a/src/test/ui/error-codes/E0207.stderr b/src/test/ui/error-codes/E0207.stderr
index 6ecab44878d..c82859a9867 100644
--- a/src/test/ui/error-codes/E0207.stderr
+++ b/src/test/ui/error-codes/E0207.stderr
@@ -1,5 +1,5 @@
 error[E0207]: the type parameter `T` is not constrained by the impl trait, self type, or predicates
-  --> $DIR/E0207.rs:13:6
+  --> $DIR/E0207.rs:3:6
    |
 LL | impl<T: Default> Foo { //~ ERROR E0207
    |      ^ unconstrained type parameter
diff --git a/src/test/ui/error-codes/E0214.rs b/src/test/ui/error-codes/E0214.rs
index 2b090391c74..fd73189f970 100644
--- a/src/test/ui/error-codes/E0214.rs
+++ b/src/test/ui/error-codes/E0214.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     let v: Vec(&str) = vec!["foo"];
     //~^ ERROR E0214
diff --git a/src/test/ui/error-codes/E0214.stderr b/src/test/ui/error-codes/E0214.stderr
index c88e2d2077a..08a98b1c3bf 100644
--- a/src/test/ui/error-codes/E0214.stderr
+++ b/src/test/ui/error-codes/E0214.stderr
@@ -1,5 +1,5 @@
 error[E0214]: parenthesized parameters may only be used with a trait
-  --> $DIR/E0214.rs:12:15
+  --> $DIR/E0214.rs:2:15
    |
 LL |     let v: Vec(&str) = vec!["foo"];
    |               ^^^^^^ only traits may use parentheses
diff --git a/src/test/ui/error-codes/E0220.rs b/src/test/ui/error-codes/E0220.rs
index 2866ffcd637..f4798042538 100644
--- a/src/test/ui/error-codes/E0220.rs
+++ b/src/test/ui/error-codes/E0220.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait Trait {
     type Bar;
 }
diff --git a/src/test/ui/error-codes/E0220.stderr b/src/test/ui/error-codes/E0220.stderr
index d26e61fba8c..0eb812a5ef0 100644
--- a/src/test/ui/error-codes/E0220.stderr
+++ b/src/test/ui/error-codes/E0220.stderr
@@ -1,11 +1,11 @@
 error[E0220]: associated type `F` not found for `Trait`
-  --> $DIR/E0220.rs:15:18
+  --> $DIR/E0220.rs:5:18
    |
 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
+  --> $DIR/E0220.rs:5:12
    |
 LL |     type Bar;
    |     --------- `Bar` defined here
diff --git a/src/test/ui/error-codes/E0221.rs b/src/test/ui/error-codes/E0221.rs
index 99092465b0a..7c7e139a098 100644
--- a/src/test/ui/error-codes/E0221.rs
+++ b/src/test/ui/error-codes/E0221.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait T1 {}
 trait T2 {}
 
diff --git a/src/test/ui/error-codes/E0221.stderr b/src/test/ui/error-codes/E0221.stderr
index fc9232e85ab..043f0c68bbc 100644
--- a/src/test/ui/error-codes/E0221.stderr
+++ b/src/test/ui/error-codes/E0221.stderr
@@ -1,5 +1,5 @@
 error[E0221]: ambiguous associated type `A` in bounds of `Self`
-  --> $DIR/E0221.rs:21:16
+  --> $DIR/E0221.rs:11:16
    |
 LL |     type A: T1;
    |     ----------- ambiguous `A` from `Foo`
@@ -11,7 +11,7 @@ LL |         let _: Self::A;
    |                ^^^^^^^ ambiguous associated type `A`
 
 error[E0221]: ambiguous associated type `Err` in bounds of `Self`
-  --> $DIR/E0221.rs:31:16
+  --> $DIR/E0221.rs:21:16
    |
 LL |     type Err: T3;
    |     ------------- ambiguous `Err` from `My`
@@ -20,7 +20,7 @@ LL |         let _: Self::Err;
    |                ^^^^^^^^^ ambiguous associated type `Err`
    |
 note: associated type `Self` could derive from `std::str::FromStr`
-  --> $DIR/E0221.rs:31:16
+  --> $DIR/E0221.rs:21:16
    |
 LL |         let _: Self::Err;
    |                ^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0223.rs b/src/test/ui/error-codes/E0223.rs
index 0683197b2b6..6031b682d72 100644
--- a/src/test/ui/error-codes/E0223.rs
+++ b/src/test/ui/error-codes/E0223.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait MyTrait { type X; }
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0223.stderr b/src/test/ui/error-codes/E0223.stderr
index 87736c10774..726f39e11f1 100644
--- a/src/test/ui/error-codes/E0223.stderr
+++ b/src/test/ui/error-codes/E0223.stderr
@@ -1,5 +1,5 @@
 error[E0223]: ambiguous associated type
-  --> $DIR/E0223.rs:14:14
+  --> $DIR/E0223.rs:4:14
    |
 LL |     let foo: MyTrait::X;
    |              ^^^^^^^^^^ help: use fully-qualified syntax: `<Type as MyTrait>::X`
diff --git a/src/test/ui/error-codes/E0225.rs b/src/test/ui/error-codes/E0225.rs
index 6c77443c5ed..1789be1559d 100644
--- a/src/test/ui/error-codes/E0225.rs
+++ b/src/test/ui/error-codes/E0225.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     let _: Box<std::io::Read + std::io::Write>;
     //~^ ERROR only auto traits can be used as additional traits in a trait object [E0225]
diff --git a/src/test/ui/error-codes/E0225.stderr b/src/test/ui/error-codes/E0225.stderr
index 6b9489c74c8..85a04708cb2 100644
--- a/src/test/ui/error-codes/E0225.stderr
+++ b/src/test/ui/error-codes/E0225.stderr
@@ -1,5 +1,5 @@
 error[E0225]: only auto traits can be used as additional traits in a trait object
-  --> $DIR/E0225.rs:12:32
+  --> $DIR/E0225.rs:2:32
    |
 LL |     let _: Box<std::io::Read + std::io::Write>;
    |                                ^^^^^^^^^^^^^^ non-auto additional trait
diff --git a/src/test/ui/error-codes/E0229.rs b/src/test/ui/error-codes/E0229.rs
index b70fb092a54..4c1934107a6 100644
--- a/src/test/ui/error-codes/E0229.rs
+++ b/src/test/ui/error-codes/E0229.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 pub trait Foo {
     type A;
     fn boo(&self) -> <Self as Foo>::A;
diff --git a/src/test/ui/error-codes/E0229.stderr b/src/test/ui/error-codes/E0229.stderr
index 218faf2dfdd..46793314bf9 100644
--- a/src/test/ui/error-codes/E0229.stderr
+++ b/src/test/ui/error-codes/E0229.stderr
@@ -1,5 +1,5 @@
 error[E0229]: associated type bindings are not allowed here
-  --> $DIR/E0229.rs:23:25
+  --> $DIR/E0229.rs:13:25
    |
 LL | fn baz<I>(x: &<I as Foo<A=Bar>>::A) {}
    |                         ^^^^^ associated type not allowed here
diff --git a/src/test/ui/error-codes/E0232.rs b/src/test/ui/error-codes/E0232.rs
index 04657c65c8e..8e8062436d6 100644
--- a/src/test/ui/error-codes/E0232.rs
+++ b/src/test/ui/error-codes/E0232.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(on_unimplemented)]
 
 #[rustc_on_unimplemented]
diff --git a/src/test/ui/error-codes/E0232.stderr b/src/test/ui/error-codes/E0232.stderr
index 613b359c299..9e9155b1d32 100644
--- a/src/test/ui/error-codes/E0232.stderr
+++ b/src/test/ui/error-codes/E0232.stderr
@@ -1,5 +1,5 @@
 error[E0232]: `#[rustc_on_unimplemented]` requires a value
-  --> $DIR/E0232.rs:13:1
+  --> $DIR/E0232.rs:3:1
    |
 LL | #[rustc_on_unimplemented]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^ value required here
diff --git a/src/test/ui/error-codes/E0252.rs b/src/test/ui/error-codes/E0252.rs
index d771103f9b3..6b5163417bf 100644
--- a/src/test/ui/error-codes/E0252.rs
+++ b/src/test/ui/error-codes/E0252.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![allow(non_camel_case_types)]
 
 use foo::baz;
diff --git a/src/test/ui/error-codes/E0252.stderr b/src/test/ui/error-codes/E0252.stderr
index 4ef6490bf05..bd06241fc76 100644
--- a/src/test/ui/error-codes/E0252.stderr
+++ b/src/test/ui/error-codes/E0252.stderr
@@ -1,5 +1,5 @@
 error[E0252]: the name `baz` is defined multiple times
-  --> $DIR/E0252.rs:14:5
+  --> $DIR/E0252.rs:4:5
    |
 LL | use foo::baz;
    |     -------- previous import of the type `baz` here
diff --git a/src/test/ui/error-codes/E0253.rs b/src/test/ui/error-codes/E0253.rs
index 186d9019aae..284b16da8f2 100644
--- a/src/test/ui/error-codes/E0253.rs
+++ b/src/test/ui/error-codes/E0253.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 mod foo {
     pub trait MyTrait {
         fn do_something();
diff --git a/src/test/ui/error-codes/E0253.stderr b/src/test/ui/error-codes/E0253.stderr
index 9ab6c30eaa0..8f21a0aaba5 100644
--- a/src/test/ui/error-codes/E0253.stderr
+++ b/src/test/ui/error-codes/E0253.stderr
@@ -1,5 +1,5 @@
 error[E0253]: `do_something` is not directly importable
-  --> $DIR/E0253.rs:17:5
+  --> $DIR/E0253.rs:7:5
    |
 LL | use foo::MyTrait::do_something;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot be imported directly
diff --git a/src/test/ui/error-codes/E0254.rs b/src/test/ui/error-codes/E0254.rs
index 31edf176f2f..706cd347e13 100644
--- a/src/test/ui/error-codes/E0254.rs
+++ b/src/test/ui/error-codes/E0254.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(alloc)]
 #![allow(unused_extern_crates, non_camel_case_types)]
 
diff --git a/src/test/ui/error-codes/E0254.stderr b/src/test/ui/error-codes/E0254.stderr
index 5e833f1ee39..c2d013da417 100644
--- a/src/test/ui/error-codes/E0254.stderr
+++ b/src/test/ui/error-codes/E0254.stderr
@@ -1,5 +1,5 @@
 error[E0254]: the name `alloc` is defined multiple times
-  --> $DIR/E0254.rs:22:5
+  --> $DIR/E0254.rs:12:5
    |
 LL | extern crate alloc;
    | ------------------- previous import of the extern crate `alloc` here
diff --git a/src/test/ui/error-codes/E0255.rs b/src/test/ui/error-codes/E0255.rs
index e05c6bede7e..d1c21eb79de 100644
--- a/src/test/ui/error-codes/E0255.rs
+++ b/src/test/ui/error-codes/E0255.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use bar::foo;
 
 fn foo() {} //~ ERROR E0255
diff --git a/src/test/ui/error-codes/E0255.stderr b/src/test/ui/error-codes/E0255.stderr
index d01a4c002e7..a47aa7c6592 100644
--- a/src/test/ui/error-codes/E0255.stderr
+++ b/src/test/ui/error-codes/E0255.stderr
@@ -1,5 +1,5 @@
 error[E0255]: the name `foo` is defined multiple times
-  --> $DIR/E0255.rs:13:1
+  --> $DIR/E0255.rs:3:1
    |
 LL | use bar::foo;
    |     -------- previous import of the value `foo` here
diff --git a/src/test/ui/error-codes/E0259.rs b/src/test/ui/error-codes/E0259.rs
index b3e633a7017..cda3db34dfc 100644
--- a/src/test/ui/error-codes/E0259.rs
+++ b/src/test/ui/error-codes/E0259.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(alloc, rustc_private)]
 #![allow(unused_extern_crates)]
 
diff --git a/src/test/ui/error-codes/E0259.stderr b/src/test/ui/error-codes/E0259.stderr
index 8c3e3f851ae..fd6a4087aec 100644
--- a/src/test/ui/error-codes/E0259.stderr
+++ b/src/test/ui/error-codes/E0259.stderr
@@ -1,5 +1,5 @@
 error[E0259]: the name `alloc` is defined multiple times
-  --> $DIR/E0259.rs:16:1
+  --> $DIR/E0259.rs:6:1
    |
 LL | extern crate alloc;
    | ------------------- previous import of the extern crate `alloc` here
diff --git a/src/test/ui/error-codes/E0260.rs b/src/test/ui/error-codes/E0260.rs
index 1b01bb12203..80382c0d2fc 100644
--- a/src/test/ui/error-codes/E0260.rs
+++ b/src/test/ui/error-codes/E0260.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(alloc)]
 #![allow(unused_extern_crates)]
 
diff --git a/src/test/ui/error-codes/E0260.stderr b/src/test/ui/error-codes/E0260.stderr
index 08792a33921..bfe2ed0cfc7 100644
--- a/src/test/ui/error-codes/E0260.stderr
+++ b/src/test/ui/error-codes/E0260.stderr
@@ -1,5 +1,5 @@
 error[E0260]: the name `alloc` is defined multiple times
-  --> $DIR/E0260.rs:16:1
+  --> $DIR/E0260.rs:6:1
    |
 LL | extern crate alloc;
    | ------------------- previous import of the extern crate `alloc` here
diff --git a/src/test/ui/error-codes/E0261.rs b/src/test/ui/error-codes/E0261.rs
index 558c1c38144..f05e09aa0da 100644
--- a/src/test/ui/error-codes/E0261.rs
+++ b/src/test/ui/error-codes/E0261.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn foo(x: &'a str) { } //~ ERROR E0261
                        //~| undeclared lifetime
 
diff --git a/src/test/ui/error-codes/E0261.stderr b/src/test/ui/error-codes/E0261.stderr
index e9140ec2c74..9e64f6c3f14 100644
--- a/src/test/ui/error-codes/E0261.stderr
+++ b/src/test/ui/error-codes/E0261.stderr
@@ -1,11 +1,11 @@
 error[E0261]: use of undeclared lifetime name `'a`
-  --> $DIR/E0261.rs:11:12
+  --> $DIR/E0261.rs:1:12
    |
 LL | fn foo(x: &'a str) { } //~ ERROR E0261
    |            ^^ undeclared lifetime
 
 error[E0261]: use of undeclared lifetime name `'a`
-  --> $DIR/E0261.rs:15:9
+  --> $DIR/E0261.rs:5:9
    |
 LL |     x: &'a str, //~ ERROR E0261
    |         ^^ undeclared lifetime
diff --git a/src/test/ui/error-codes/E0262.rs b/src/test/ui/error-codes/E0262.rs
index 41b6acaee4a..55264f1387f 100644
--- a/src/test/ui/error-codes/E0262.rs
+++ b/src/test/ui/error-codes/E0262.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn foo<'static>(x: &'static str) { } //~ ERROR E0262
                                      //~| 'static is a reserved lifetime name
 
diff --git a/src/test/ui/error-codes/E0262.stderr b/src/test/ui/error-codes/E0262.stderr
index 1e5b5db692d..8f01889a470 100644
--- a/src/test/ui/error-codes/E0262.stderr
+++ b/src/test/ui/error-codes/E0262.stderr
@@ -1,5 +1,5 @@
 error[E0262]: invalid lifetime parameter name: `'static`
-  --> $DIR/E0262.rs:11:8
+  --> $DIR/E0262.rs:1:8
    |
 LL | fn foo<'static>(x: &'static str) { } //~ ERROR E0262
    |        ^^^^^^^ 'static is a reserved lifetime name
diff --git a/src/test/ui/error-codes/E0263.rs b/src/test/ui/error-codes/E0263.rs
index 722f1c25e07..4376437823c 100644
--- a/src/test/ui/error-codes/E0263.rs
+++ b/src/test/ui/error-codes/E0263.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn foo<'a, 'b, 'a>(x: &'a str, y: &'b str) {
     //~^ ERROR E0263
 }
diff --git a/src/test/ui/error-codes/E0263.stderr b/src/test/ui/error-codes/E0263.stderr
index 1b52deea88d..4dae02b85c3 100644
--- a/src/test/ui/error-codes/E0263.stderr
+++ b/src/test/ui/error-codes/E0263.stderr
@@ -1,5 +1,5 @@
 error[E0263]: lifetime name `'a` declared twice in the same scope
-  --> $DIR/E0263.rs:11:16
+  --> $DIR/E0263.rs:1:16
    |
 LL | fn foo<'a, 'b, 'a>(x: &'a str, y: &'b str) {
    |        --      ^^ declared twice
diff --git a/src/test/ui/error-codes/E0264.rs b/src/test/ui/error-codes/E0264.rs
index 92332977e76..6adaf01fb52 100644
--- a/src/test/ui/error-codes/E0264.rs
+++ b/src/test/ui/error-codes/E0264.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(lang_items)]
 
 extern "C" {
diff --git a/src/test/ui/error-codes/E0264.stderr b/src/test/ui/error-codes/E0264.stderr
index 69863d7bb83..bc6a0d9f96c 100644
--- a/src/test/ui/error-codes/E0264.stderr
+++ b/src/test/ui/error-codes/E0264.stderr
@@ -1,5 +1,5 @@
 error[E0264]: unknown external lang item: `cake`
-  --> $DIR/E0264.rs:15:5
+  --> $DIR/E0264.rs:5:5
    |
 LL |     fn cake(); //~ ERROR E0264
    |     ^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0267.rs b/src/test/ui/error-codes/E0267.rs
index 6287256e866..45e875a0a3c 100644
--- a/src/test/ui/error-codes/E0267.rs
+++ b/src/test/ui/error-codes/E0267.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     let w = || { break; }; //~ ERROR E0267
 }
diff --git a/src/test/ui/error-codes/E0267.stderr b/src/test/ui/error-codes/E0267.stderr
index b72109f0644..3506c1c0f16 100644
--- a/src/test/ui/error-codes/E0267.stderr
+++ b/src/test/ui/error-codes/E0267.stderr
@@ -1,5 +1,5 @@
 error[E0267]: `break` inside of a closure
-  --> $DIR/E0267.rs:12:18
+  --> $DIR/E0267.rs:2:18
    |
 LL |     let w = || { break; }; //~ ERROR E0267
    |                  ^^^^^ cannot break inside of a closure
diff --git a/src/test/ui/error-codes/E0268.rs b/src/test/ui/error-codes/E0268.rs
index 41e88e2f492..742ba5441d6 100644
--- a/src/test/ui/error-codes/E0268.rs
+++ b/src/test/ui/error-codes/E0268.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     break; //~ ERROR E0268
 }
diff --git a/src/test/ui/error-codes/E0268.stderr b/src/test/ui/error-codes/E0268.stderr
index e1b5b52085b..3e276bd1acb 100644
--- a/src/test/ui/error-codes/E0268.stderr
+++ b/src/test/ui/error-codes/E0268.stderr
@@ -1,5 +1,5 @@
 error[E0268]: `break` outside of loop
-  --> $DIR/E0268.rs:12:5
+  --> $DIR/E0268.rs:2:5
    |
 LL |     break; //~ ERROR E0268
    |     ^^^^^ cannot break outside of a loop
diff --git a/src/test/ui/error-codes/E0271.rs b/src/test/ui/error-codes/E0271.rs
index d322c8b1caf..f2719075434 100644
--- a/src/test/ui/error-codes/E0271.rs
+++ b/src/test/ui/error-codes/E0271.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait Trait { type AssociatedType; }
 
 fn foo<T>(t: T) where T: Trait<AssociatedType=u32> {
diff --git a/src/test/ui/error-codes/E0271.stderr b/src/test/ui/error-codes/E0271.stderr
index 04c7d244376..8fcb68e434f 100644
--- a/src/test/ui/error-codes/E0271.stderr
+++ b/src/test/ui/error-codes/E0271.stderr
@@ -1,5 +1,5 @@
 error[E0271]: type mismatch resolving `<i8 as Trait>::AssociatedType == u32`
-  --> $DIR/E0271.rs:20:5
+  --> $DIR/E0271.rs:10:5
    |
 LL |     foo(3_i8); //~ ERROR E0271
    |     ^^^ expected reference, found u32
@@ -7,7 +7,7 @@ LL |     foo(3_i8); //~ ERROR E0271
    = note: expected type `&'static str`
               found type `u32`
 note: required by `foo`
-  --> $DIR/E0271.rs:13:1
+  --> $DIR/E0271.rs:3:1
    |
 LL | fn foo<T>(t: T) where T: Trait<AssociatedType=u32> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0275.rs b/src/test/ui/error-codes/E0275.rs
index 8dfd1d9b4af..28a9676f03e 100644
--- a/src/test/ui/error-codes/E0275.rs
+++ b/src/test/ui/error-codes/E0275.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait Foo {}
 
 struct Bar<T>(T);
diff --git a/src/test/ui/error-codes/E0275.stderr b/src/test/ui/error-codes/E0275.stderr
index d5bcc94fb65..817b4828cc4 100644
--- a/src/test/ui/error-codes/E0275.stderr
+++ b/src/test/ui/error-codes/E0275.stderr
@@ -1,5 +1,5 @@
 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
+  --> $DIR/E0275.rs:5:1
    |
 LL | impl<T> Foo for T where Bar<T>: Foo {} //~ ERROR E0275
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -70,7 +70,7 @@ LL | impl<T> Foo for T where Bar<T>: Foo {} //~ ERROR E0275
    = note: required because of the requirements on the impl of `Foo` for `Bar<Bar<T>>`
    = note: required because of the requirements on the impl of `Foo` for `Bar<T>`
 note: required by `Foo`
-  --> $DIR/E0275.rs:11:1
+  --> $DIR/E0275.rs:1:1
    |
 LL | trait Foo {}
    | ^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0276.rs b/src/test/ui/error-codes/E0276.rs
index 62e43b02ca8..5e3d9f602ad 100644
--- a/src/test/ui/error-codes/E0276.rs
+++ b/src/test/ui/error-codes/E0276.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait Foo {
     fn foo<T>(x: T);
 }
diff --git a/src/test/ui/error-codes/E0276.stderr b/src/test/ui/error-codes/E0276.stderr
index 4823adc250a..393ad8c81a0 100644
--- a/src/test/ui/error-codes/E0276.stderr
+++ b/src/test/ui/error-codes/E0276.stderr
@@ -1,5 +1,5 @@
 error[E0276]: impl has stricter requirements than trait
-  --> $DIR/E0276.rs:16:5
+  --> $DIR/E0276.rs:6:5
    |
 LL |     fn foo<T>(x: T);
    |     ---------------- definition of `foo` from trait
diff --git a/src/test/ui/error-codes/E0277-2.rs b/src/test/ui/error-codes/E0277-2.rs
index 313aa1f706e..428518705b8 100644
--- a/src/test/ui/error-codes/E0277-2.rs
+++ b/src/test/ui/error-codes/E0277-2.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Foo {
     bar: Bar
 }
diff --git a/src/test/ui/error-codes/E0277-2.stderr b/src/test/ui/error-codes/E0277-2.stderr
index 32776f028b4..a4db1c8b095 100644
--- a/src/test/ui/error-codes/E0277-2.stderr
+++ b/src/test/ui/error-codes/E0277-2.stderr
@@ -1,5 +1,5 @@
 error[E0277]: `*const u8` cannot be sent between threads safely
-  --> $DIR/E0277-2.rs:26:5
+  --> $DIR/E0277-2.rs:16:5
    |
 LL |     is_send::<Foo>();
    |     ^^^^^^^^^^^^^^ `*const u8` cannot be sent between threads safely
@@ -9,7 +9,7 @@ LL |     is_send::<Foo>();
    = note: required because it appears within the type `Bar`
    = note: required because it appears within the type `Foo`
 note: required by `is_send`
-  --> $DIR/E0277-2.rs:23:1
+  --> $DIR/E0277-2.rs:13:1
    |
 LL | fn is_send<T: Send>() { }
    | ^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0277.rs b/src/test/ui/error-codes/E0277.rs
index 80cb5eb7a4b..e60d83098b9 100644
--- a/src/test/ui/error-codes/E0277.rs
+++ b/src/test/ui/error-codes/E0277.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // ignore-cloudabi no std::path
 
 use std::path::Path;
diff --git a/src/test/ui/error-codes/E0277.stderr b/src/test/ui/error-codes/E0277.stderr
index d0c089fa0f3..0cfe04afa26 100644
--- a/src/test/ui/error-codes/E0277.stderr
+++ b/src/test/ui/error-codes/E0277.stderr
@@ -1,5 +1,5 @@
 error[E0277]: the size for values of type `[u8]` cannot be known at compilation time
-  --> $DIR/E0277.rs:23:6
+  --> $DIR/E0277.rs:13:6
    |
 LL | fn f(p: Path) { }
    |      ^ borrow the `Path` instead
@@ -11,13 +11,13 @@ LL | fn f(p: Path) { }
    = help: unsized locals are gated as an unstable feature
 
 error[E0277]: the trait bound `i32: Foo` is not satisfied
-  --> $DIR/E0277.rs:27:5
+  --> $DIR/E0277.rs:17:5
    |
 LL |     some_func(5i32);
    |     ^^^^^^^^^ the trait `Foo` is not implemented for `i32`
    |
 note: required by `some_func`
-  --> $DIR/E0277.rs:19:1
+  --> $DIR/E0277.rs:9:1
    |
 LL | fn some_func<T: Foo>(foo: T) {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0282.rs b/src/test/ui/error-codes/E0282.rs
index dfc702670ce..9bd16abb7bb 100644
--- a/src/test/ui/error-codes/E0282.rs
+++ b/src/test/ui/error-codes/E0282.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     let x = "hello".chars().rev().collect(); //~ ERROR E0282
 }
diff --git a/src/test/ui/error-codes/E0282.stderr b/src/test/ui/error-codes/E0282.stderr
index 6862e2d8688..49165d1e42b 100644
--- a/src/test/ui/error-codes/E0282.stderr
+++ b/src/test/ui/error-codes/E0282.stderr
@@ -1,5 +1,5 @@
 error[E0282]: type annotations needed
-  --> $DIR/E0282.rs:12:9
+  --> $DIR/E0282.rs:2:9
    |
 LL |     let x = "hello".chars().rev().collect(); //~ ERROR E0282
    |         ^
diff --git a/src/test/ui/error-codes/E0283.rs b/src/test/ui/error-codes/E0283.rs
index 844c47f41b8..9bdcc9ac42a 100644
--- a/src/test/ui/error-codes/E0283.rs
+++ b/src/test/ui/error-codes/E0283.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait Generator {
     fn create() -> u32;
 }
diff --git a/src/test/ui/error-codes/E0283.stderr b/src/test/ui/error-codes/E0283.stderr
index 3f63881b61e..598ec672ce6 100644
--- a/src/test/ui/error-codes/E0283.stderr
+++ b/src/test/ui/error-codes/E0283.stderr
@@ -1,11 +1,11 @@
 error[E0283]: type annotations required: cannot resolve `_: Generator`
-  --> $DIR/E0283.rs:28:21
+  --> $DIR/E0283.rs:18:21
    |
 LL |     let cont: u32 = Generator::create(); //~ ERROR E0283
    |                     ^^^^^^^^^^^^^^^^^
    |
 note: required by `Generator::create`
-  --> $DIR/E0283.rs:12:5
+  --> $DIR/E0283.rs:2:5
    |
 LL |     fn create() -> u32;
    |     ^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0296.rs b/src/test/ui/error-codes/E0296.rs
index 562fd00a18a..a1a86574465 100644
--- a/src/test/ui/error-codes/E0296.rs
+++ b/src/test/ui/error-codes/E0296.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![recursion_limit] //~ ERROR E0296
 
 fn main() {}
diff --git a/src/test/ui/error-codes/E0296.stderr b/src/test/ui/error-codes/E0296.stderr
index 71db4b614a7..41e9f7ea7f9 100644
--- a/src/test/ui/error-codes/E0296.stderr
+++ b/src/test/ui/error-codes/E0296.stderr
@@ -1,5 +1,5 @@
 error[E0296]: malformed recursion limit attribute, expected #![recursion_limit="N"]
-  --> $DIR/E0296.rs:11:1
+  --> $DIR/E0296.rs:1:1
    |
 LL | #![recursion_limit] //~ ERROR E0296
    | ^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0297.rs b/src/test/ui/error-codes/E0297.rs
index afe4444c7af..27c7960d977 100644
--- a/src/test/ui/error-codes/E0297.rs
+++ b/src/test/ui/error-codes/E0297.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     let xs : Vec<Option<i32>> = vec![Some(1), None];
 
diff --git a/src/test/ui/error-codes/E0297.stderr b/src/test/ui/error-codes/E0297.stderr
index d510fa99cae..f356a5b954d 100644
--- a/src/test/ui/error-codes/E0297.stderr
+++ b/src/test/ui/error-codes/E0297.stderr
@@ -1,5 +1,5 @@
 error[E0005]: refutable pattern in `for` loop binding: `None` not covered
-  --> $DIR/E0297.rs:14:9
+  --> $DIR/E0297.rs:4:9
    |
 LL |     for Some(x) in xs {}
    |         ^^^^^^^ pattern `None` not covered
diff --git a/src/test/ui/error-codes/E0301.nll.stderr b/src/test/ui/error-codes/E0301.nll.stderr
index f060eb90435..898c30a75b2 100644
--- a/src/test/ui/error-codes/E0301.nll.stderr
+++ b/src/test/ui/error-codes/E0301.nll.stderr
@@ -1,5 +1,5 @@
 error[E0301]: cannot mutably borrow in a pattern guard
-  --> $DIR/E0301.rs:14:19
+  --> $DIR/E0301.rs:4:19
    |
 LL |         option if option.take().is_none() => {}, //~ ERROR E0301
    |                   ^^^^^^ borrowed mutably in pattern guard
diff --git a/src/test/ui/error-codes/E0301.rs b/src/test/ui/error-codes/E0301.rs
index 06e98289b0d..54372f8b6b4 100644
--- a/src/test/ui/error-codes/E0301.rs
+++ b/src/test/ui/error-codes/E0301.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     match Some(()) {
         None => { },
diff --git a/src/test/ui/error-codes/E0301.stderr b/src/test/ui/error-codes/E0301.stderr
index 7d5100c516e..3cfacd5983f 100644
--- a/src/test/ui/error-codes/E0301.stderr
+++ b/src/test/ui/error-codes/E0301.stderr
@@ -1,5 +1,5 @@
 error[E0301]: cannot mutably borrow in a pattern guard
-  --> $DIR/E0301.rs:14:19
+  --> $DIR/E0301.rs:4:19
    |
 LL |         option if option.take().is_none() => {}, //~ ERROR E0301
    |                   ^^^^^^ borrowed mutably in pattern guard
diff --git a/src/test/ui/error-codes/E0302.rs b/src/test/ui/error-codes/E0302.rs
index 6a5ad40b109..7c76eb30c1d 100644
--- a/src/test/ui/error-codes/E0302.rs
+++ b/src/test/ui/error-codes/E0302.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     match Some(()) {
         None => { },
diff --git a/src/test/ui/error-codes/E0302.stderr b/src/test/ui/error-codes/E0302.stderr
index f55dd523f13..66b31361762 100644
--- a/src/test/ui/error-codes/E0302.stderr
+++ b/src/test/ui/error-codes/E0302.stderr
@@ -1,5 +1,5 @@
 error[E0302]: cannot assign in a pattern guard
-  --> $DIR/E0302.rs:14:21
+  --> $DIR/E0302.rs:4:21
    |
 LL |         option if { option = None; false } => { }, //~ ERROR E0302
    |                     ^^^^^^^^^^^^^ assignment in pattern guard
diff --git a/src/test/ui/error-codes/E0303.rs b/src/test/ui/error-codes/E0303.rs
index 6027414fdbd..0530d43b653 100644
--- a/src/test/ui/error-codes/E0303.rs
+++ b/src/test/ui/error-codes/E0303.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     match Some("hi".to_string()) {
         ref op_string_ref @ Some(s) => {},
diff --git a/src/test/ui/error-codes/E0303.stderr b/src/test/ui/error-codes/E0303.stderr
index b9da037df0e..d701b07de6b 100644
--- a/src/test/ui/error-codes/E0303.stderr
+++ b/src/test/ui/error-codes/E0303.stderr
@@ -1,5 +1,5 @@
 error[E0009]: cannot bind by-move and by-ref in the same pattern
-  --> $DIR/E0303.rs:13:34
+  --> $DIR/E0303.rs:3:34
    |
 LL |         ref op_string_ref @ Some(s) => {},
    |         -------------------------^-
@@ -8,7 +8,7 @@ LL |         ref op_string_ref @ Some(s) => {},
    |         both by-ref and by-move used
 
 error[E0303]: pattern bindings are not allowed after an `@`
-  --> $DIR/E0303.rs:13:34
+  --> $DIR/E0303.rs:3:34
    |
 LL |         ref op_string_ref @ Some(s) => {},
    |                                  ^ not allowed after `@`
diff --git a/src/test/ui/error-codes/E0308-4.rs b/src/test/ui/error-codes/E0308-4.rs
index 106c55817c1..aaf7ef5bd79 100644
--- a/src/test/ui/error-codes/E0308-4.rs
+++ b/src/test/ui/error-codes/E0308-4.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     let x = 1u8;
     match x {
diff --git a/src/test/ui/error-codes/E0308-4.stderr b/src/test/ui/error-codes/E0308-4.stderr
index 8943c7332e9..8117bc754b6 100644
--- a/src/test/ui/error-codes/E0308-4.stderr
+++ b/src/test/ui/error-codes/E0308-4.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/E0308-4.rs:14:9
+  --> $DIR/E0308-4.rs:4:9
    |
 LL |         0u8..=3i8 => (), //~ ERROR E0308
    |         ^^^^^^^^^ expected u8, found i8
diff --git a/src/test/ui/error-codes/E0308.rs b/src/test/ui/error-codes/E0308.rs
index 078f1d3a9a1..fa79bee570e 100644
--- a/src/test/ui/error-codes/E0308.rs
+++ b/src/test/ui/error-codes/E0308.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(intrinsics)]
 
 extern "rust-intrinsic" {
diff --git a/src/test/ui/error-codes/E0308.stderr b/src/test/ui/error-codes/E0308.stderr
index 438dd50f2bf..8c71747fbcd 100644
--- a/src/test/ui/error-codes/E0308.stderr
+++ b/src/test/ui/error-codes/E0308.stderr
@@ -1,5 +1,5 @@
 error[E0308]: intrinsic has wrong type
-  --> $DIR/E0308.rs:14:5
+  --> $DIR/E0308.rs:4:5
    |
 LL |     fn size_of<T>(); //~ ERROR E0308
    |     ^^^^^^^^^^^^^^^^ expected (), found usize
diff --git a/src/test/ui/error-codes/E0328.rs b/src/test/ui/error-codes/E0328.rs
index e08532b0249..ef55f44dd6b 100644
--- a/src/test/ui/error-codes/E0328.rs
+++ b/src/test/ui/error-codes/E0328.rs
@@ -1,13 +1,3 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(unsize)]
 
 use std::marker::Unsize;
diff --git a/src/test/ui/error-codes/E0328.stderr b/src/test/ui/error-codes/E0328.stderr
index ad3a224279c..70e6baf69d3 100644
--- a/src/test/ui/error-codes/E0328.stderr
+++ b/src/test/ui/error-codes/E0328.stderr
@@ -1,5 +1,5 @@
 error[E0328]: explicit impls for the `Unsize` trait are not permitted
-  --> $DIR/E0328.rs:17:1
+  --> $DIR/E0328.rs:7:1
    |
 LL | impl<T> Unsize<T> for MyType {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl of `Unsize` not allowed
diff --git a/src/test/ui/error-codes/E0365.rs b/src/test/ui/error-codes/E0365.rs
index 18a72b0ff9a..f12ff96bb8a 100644
--- a/src/test/ui/error-codes/E0365.rs
+++ b/src/test/ui/error-codes/E0365.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 mod foo {
     pub const X: u32 = 1;
 }
diff --git a/src/test/ui/error-codes/E0365.stderr b/src/test/ui/error-codes/E0365.stderr
index efa21aa2e22..c8fc59f8ba9 100644
--- a/src/test/ui/error-codes/E0365.stderr
+++ b/src/test/ui/error-codes/E0365.stderr
@@ -1,5 +1,5 @@
 error[E0365]: `foo` is private, and cannot be re-exported
-  --> $DIR/E0365.rs:15:9
+  --> $DIR/E0365.rs:5:9
    |
 LL | pub use foo as foo2;
    |         ^^^^^^^^^^^ re-export of private `foo`
diff --git a/src/test/ui/error-codes/E0370.rs b/src/test/ui/error-codes/E0370.rs
index cafe26c65ad..32a66b63bed 100644
--- a/src/test/ui/error-codes/E0370.rs
+++ b/src/test/ui/error-codes/E0370.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![allow(dead_code)]
 
 #[deny(overflowing_literals)]
diff --git a/src/test/ui/error-codes/E0370.stderr b/src/test/ui/error-codes/E0370.stderr
index f85d2cf5d0b..cd1903bd7e2 100644
--- a/src/test/ui/error-codes/E0370.stderr
+++ b/src/test/ui/error-codes/E0370.stderr
@@ -1,5 +1,5 @@
 error[E0370]: enum discriminant overflowed
-  --> $DIR/E0370.rs:17:5
+  --> $DIR/E0370.rs:7:5
    |
 LL |     Y, //~ ERROR E0370
    |     ^ overflowed on value after 9223372036854775807
diff --git a/src/test/ui/error-codes/E0374.rs b/src/test/ui/error-codes/E0374.rs
index 6c4782d230d..41fcedc328d 100644
--- a/src/test/ui/error-codes/E0374.rs
+++ b/src/test/ui/error-codes/E0374.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(coerce_unsized)]
 use std::ops::CoerceUnsized;
 
diff --git a/src/test/ui/error-codes/E0374.stderr b/src/test/ui/error-codes/E0374.stderr
index 002e2b003af..9226ca0e478 100644
--- a/src/test/ui/error-codes/E0374.stderr
+++ b/src/test/ui/error-codes/E0374.stderr
@@ -1,5 +1,5 @@
 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
+  --> $DIR/E0374.rs:8:1
    |
 LL | / impl<T, U> CoerceUnsized<Foo<U>> for Foo<T> //~ ERROR E0374
 LL | |     where T: CoerceUnsized<U> {}
diff --git a/src/test/ui/error-codes/E0375.rs b/src/test/ui/error-codes/E0375.rs
index 094ed35cc2d..362854a53aa 100644
--- a/src/test/ui/error-codes/E0375.rs
+++ b/src/test/ui/error-codes/E0375.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // ignore-tidy-linelength
 
 #![feature(coerce_unsized)]
diff --git a/src/test/ui/error-codes/E0375.stderr b/src/test/ui/error-codes/E0375.stderr
index f3db697790c..18416e9b7d8 100644
--- a/src/test/ui/error-codes/E0375.stderr
+++ b/src/test/ui/error-codes/E0375.stderr
@@ -1,5 +1,5 @@
 error[E0375]: implementing the trait `CoerceUnsized` requires multiple coercions
-  --> $DIR/E0375.rs:22:12
+  --> $DIR/E0375.rs:12:12
    |
 LL | impl<T, U> CoerceUnsized<Foo<U, T>> for Foo<T, U> {}
    |            ^^^^^^^^^^^^^^^^^^^^^^^^ requires multiple coercions
diff --git a/src/test/ui/error-codes/E0376.rs b/src/test/ui/error-codes/E0376.rs
index 65be358cc5f..f092eb02c2b 100644
--- a/src/test/ui/error-codes/E0376.rs
+++ b/src/test/ui/error-codes/E0376.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(coerce_unsized)]
 use std::ops::CoerceUnsized;
 
diff --git a/src/test/ui/error-codes/E0376.stderr b/src/test/ui/error-codes/E0376.stderr
index c850d13e633..2894a919632 100644
--- a/src/test/ui/error-codes/E0376.stderr
+++ b/src/test/ui/error-codes/E0376.stderr
@@ -1,5 +1,5 @@
 error[E0376]: the trait `CoerceUnsized` may only be implemented for a coercion between structures
-  --> $DIR/E0376.rs:18:1
+  --> $DIR/E0376.rs:8:1
    |
 LL | impl<T, U> CoerceUnsized<U> for Foo<T> {} //~ ERROR E0376
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0388.nll.stderr b/src/test/ui/error-codes/E0388.nll.stderr
index 7d25d41f18b..2bcda2ba8fb 100644
--- a/src/test/ui/error-codes/E0388.nll.stderr
+++ b/src/test/ui/error-codes/E0388.nll.stderr
@@ -1,29 +1,29 @@
 error[E0017]: references in constants may only refer to immutable values
-  --> $DIR/E0388.rs:14:30
+  --> $DIR/E0388.rs:4:30
    |
 LL | const CR: &'static mut i32 = &mut C; //~ ERROR E0017
    |                              ^^^^^^ constants require immutable values
 
 error: cannot mutate statics in the initializer of another static
-  --> $DIR/E0388.rs:15:39
+  --> $DIR/E0388.rs:5:39
    |
 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:15:39
+  --> $DIR/E0388.rs:5:39
    |
 LL | static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017
    |                                       ^^^^^^ statics require immutable values
 
 error[E0596]: cannot borrow immutable static item `X` as mutable
-  --> $DIR/E0388.rs:15:39
+  --> $DIR/E0388.rs:5:39
    |
 LL | static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017
    |                                       ^^^^^^ cannot borrow as mutable
 
 error[E0017]: references in statics may only refer to immutable values
-  --> $DIR/E0388.rs:18:38
+  --> $DIR/E0388.rs:8:38
    |
 LL | static CONST_REF: &'static mut i32 = &mut C; //~ ERROR E0017
    |                                      ^^^^^^ statics require immutable values
diff --git a/src/test/ui/error-codes/E0388.rs b/src/test/ui/error-codes/E0388.rs
index 3203798c709..817f2554ade 100644
--- a/src/test/ui/error-codes/E0388.rs
+++ b/src/test/ui/error-codes/E0388.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 static X: i32 = 1;
 const C: i32 = 2;
 
diff --git a/src/test/ui/error-codes/E0388.stderr b/src/test/ui/error-codes/E0388.stderr
index 46efda9147b..f35d39c7bb2 100644
--- a/src/test/ui/error-codes/E0388.stderr
+++ b/src/test/ui/error-codes/E0388.stderr
@@ -1,29 +1,29 @@
 error[E0017]: references in constants may only refer to immutable values
-  --> $DIR/E0388.rs:14:30
+  --> $DIR/E0388.rs:4:30
    |
 LL | const CR: &'static mut i32 = &mut C; //~ ERROR E0017
    |                              ^^^^^^ constants require immutable values
 
 error: cannot mutate statics in the initializer of another static
-  --> $DIR/E0388.rs:15:39
+  --> $DIR/E0388.rs:5:39
    |
 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:15:39
+  --> $DIR/E0388.rs:5:39
    |
 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
+  --> $DIR/E0388.rs:5:44
    |
 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:18:38
+  --> $DIR/E0388.rs:8:38
    |
 LL | static CONST_REF: &'static mut i32 = &mut C; //~ ERROR E0017
    |                                      ^^^^^^ statics require immutable values
diff --git a/src/test/ui/error-codes/E0389.nll.stderr b/src/test/ui/error-codes/E0389.nll.stderr
index 66e46dfe29d..13d2f8cfaa5 100644
--- a/src/test/ui/error-codes/E0389.nll.stderr
+++ b/src/test/ui/error-codes/E0389.nll.stderr
@@ -1,5 +1,5 @@
 error[E0594]: cannot assign to `fancy_ref.num` which is behind a `&` reference
-  --> $DIR/E0389.rs:18:5
+  --> $DIR/E0389.rs:8:5
    |
 LL |     let fancy_ref = &(&mut fancy);
    |                     ------------- help: consider changing this to be a mutable reference: `&mut (&mut fancy)`
diff --git a/src/test/ui/error-codes/E0389.rs b/src/test/ui/error-codes/E0389.rs
index 445831bf8d7..8b821330ebe 100644
--- a/src/test/ui/error-codes/E0389.rs
+++ b/src/test/ui/error-codes/E0389.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct FancyNum {
     num: u8,
 }
diff --git a/src/test/ui/error-codes/E0389.stderr b/src/test/ui/error-codes/E0389.stderr
index 29e1ea9dd16..cc8914ef3a6 100644
--- a/src/test/ui/error-codes/E0389.stderr
+++ b/src/test/ui/error-codes/E0389.stderr
@@ -1,5 +1,5 @@
 error[E0389]: cannot assign to data in a `&` reference
-  --> $DIR/E0389.rs:18:5
+  --> $DIR/E0389.rs:8:5
    |
 LL |     fancy_ref.num = 6; //~ ERROR E0389
    |     ^^^^^^^^^^^^^^^^^ assignment into an immutable reference
diff --git a/src/test/ui/error-codes/E0390.rs b/src/test/ui/error-codes/E0390.rs
index cd530dbd6b4..4eb59a053b4 100644
--- a/src/test/ui/error-codes/E0390.rs
+++ b/src/test/ui/error-codes/E0390.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Foo {
     x: i32
 }
diff --git a/src/test/ui/error-codes/E0390.stderr b/src/test/ui/error-codes/E0390.stderr
index fda2c2e2fe0..7632229360e 100644
--- a/src/test/ui/error-codes/E0390.stderr
+++ b/src/test/ui/error-codes/E0390.stderr
@@ -1,11 +1,11 @@
 error[E0390]: only a single inherent implementation marked with `#[lang = "mut_ptr"]` is allowed for the `*mut T` primitive
-  --> $DIR/E0390.rs:15:1
+  --> $DIR/E0390.rs:5:1
    |
 LL | impl *mut Foo {} //~ ERROR E0390
    | ^^^^^^^^^^^^^^^^
    |
 help: consider using a trait to implement these methods
-  --> $DIR/E0390.rs:15:1
+  --> $DIR/E0390.rs:5:1
    |
 LL | impl *mut Foo {} //~ ERROR E0390
    | ^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0392.rs b/src/test/ui/error-codes/E0392.rs
index 4c3efcf4e8d..c98d900b62a 100644
--- a/src/test/ui/error-codes/E0392.rs
+++ b/src/test/ui/error-codes/E0392.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 enum Foo<T> { Bar } //~ ERROR E0392
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0392.stderr b/src/test/ui/error-codes/E0392.stderr
index cfa9c49b2ee..4bb3b87bb4a 100644
--- a/src/test/ui/error-codes/E0392.stderr
+++ b/src/test/ui/error-codes/E0392.stderr
@@ -1,5 +1,5 @@
 error[E0392]: parameter `T` is never used
-  --> $DIR/E0392.rs:11:10
+  --> $DIR/E0392.rs:1:10
    |
 LL | enum Foo<T> { Bar } //~ ERROR E0392
    |          ^ unused type parameter
diff --git a/src/test/ui/error-codes/E0393.rs b/src/test/ui/error-codes/E0393.rs
index 9165bc2837b..bdd4deafc83 100644
--- a/src/test/ui/error-codes/E0393.rs
+++ b/src/test/ui/error-codes/E0393.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait A<T=Self> {}
 
 fn together_we_will_rule_the_galaxy(son: &A) {}
diff --git a/src/test/ui/error-codes/E0393.stderr b/src/test/ui/error-codes/E0393.stderr
index c0e282308c1..bf564ef1021 100644
--- a/src/test/ui/error-codes/E0393.stderr
+++ b/src/test/ui/error-codes/E0393.stderr
@@ -1,5 +1,5 @@
 error[E0393]: the type parameter `T` must be explicitly specified
-  --> $DIR/E0393.rs:13:43
+  --> $DIR/E0393.rs:3:43
    |
 LL | fn together_we_will_rule_the_galaxy(son: &A) {}
    |                                           ^ missing reference to `T`
diff --git a/src/test/ui/error-codes/E0395.rs b/src/test/ui/error-codes/E0395.rs
index 617050732b7..c2de56c413f 100644
--- a/src/test/ui/error-codes/E0395.rs
+++ b/src/test/ui/error-codes/E0395.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // gate-test-const_compare_raw_pointers
 
 static FOO: i32 = 42;
diff --git a/src/test/ui/error-codes/E0395.stderr b/src/test/ui/error-codes/E0395.stderr
index 0fb9a9e854d..45e1ba05ff9 100644
--- a/src/test/ui/error-codes/E0395.stderr
+++ b/src/test/ui/error-codes/E0395.stderr
@@ -1,5 +1,5 @@
 error[E0658]: comparing raw pointers inside static (see issue #53020)
-  --> $DIR/E0395.rs:16:22
+  --> $DIR/E0395.rs:6:22
    |
 LL | static BAZ: bool = { (&FOO as *const i32) == (&BAR as *const i32) }; //~ ERROR issue #53020
    |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0396-fixed.rs b/src/test/ui/error-codes/E0396-fixed.rs
index 005f2c36688..1029c75f17d 100644
--- a/src/test/ui/error-codes/E0396-fixed.rs
+++ b/src/test/ui/error-codes/E0396-fixed.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(const_raw_ptr_deref)]
 
 const REG_ADDR: *const u8 = 0x5f3759df as *const u8;
diff --git a/src/test/ui/error-codes/E0396-fixed.stderr b/src/test/ui/error-codes/E0396-fixed.stderr
index e868d5a33fa..2923d976628 100644
--- a/src/test/ui/error-codes/E0396-fixed.stderr
+++ b/src/test/ui/error-codes/E0396-fixed.stderr
@@ -1,5 +1,5 @@
 error: any use of this value will cause an error
-  --> $DIR/E0396-fixed.rs:15:1
+  --> $DIR/E0396-fixed.rs:5:1
    |
 LL | const VALUE: u8 = unsafe { *REG_ADDR };
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^---------^^^
diff --git a/src/test/ui/error-codes/E0396.rs b/src/test/ui/error-codes/E0396.rs
index 1ee8a74a465..b32853e483d 100644
--- a/src/test/ui/error-codes/E0396.rs
+++ b/src/test/ui/error-codes/E0396.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // gate-test-const_raw_ptr_deref
 
 const REG_ADDR: *const u8 = 0x5f3759df as *const u8;
diff --git a/src/test/ui/error-codes/E0396.stderr b/src/test/ui/error-codes/E0396.stderr
index a2a2e724358..1006ff6dc54 100644
--- a/src/test/ui/error-codes/E0396.stderr
+++ b/src/test/ui/error-codes/E0396.stderr
@@ -1,5 +1,5 @@
 error[E0658]: dereferencing raw pointers in constants is unstable (see issue #51911)
-  --> $DIR/E0396.rs:15:28
+  --> $DIR/E0396.rs:5:28
    |
 LL | const VALUE: u8 = unsafe { *REG_ADDR };
    |                            ^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0401.rs b/src/test/ui/error-codes/E0401.rs
index 4fc74f5ef22..a120198b728 100644
--- a/src/test/ui/error-codes/E0401.rs
+++ b/src/test/ui/error-codes/E0401.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait Baz<T> {}
 
 fn foo<T>(x: T) {
diff --git a/src/test/ui/error-codes/E0401.stderr b/src/test/ui/error-codes/E0401.stderr
index 53eeb3e9c13..c94fa497678 100644
--- a/src/test/ui/error-codes/E0401.stderr
+++ b/src/test/ui/error-codes/E0401.stderr
@@ -1,5 +1,5 @@
 error[E0401]: can't use type parameters from outer function
-  --> $DIR/E0401.rs:14:39
+  --> $DIR/E0401.rs:4:39
    |
 LL | fn foo<T>(x: T) {
    |        - type variable from outer function
@@ -9,7 +9,7 @@ LL |     fn bfnr<U, V: Baz<U>, W: Fn()>(y: T) { //~ ERROR E0401
    |        help: try using a local type parameter instead: `bfnr<U, V: Baz<U>, W: Fn(), T>`
 
 error[E0401]: can't use type parameters from outer function
-  --> $DIR/E0401.rs:19:16
+  --> $DIR/E0401.rs:9:16
    |
 LL | fn foo<T>(x: T) {
    |        - type variable from outer function
@@ -21,7 +21,7 @@ LL |            (y: T) { //~ ERROR E0401
    |                ^ use of type variable from outer function
 
 error[E0401]: can't use type parameters from outer function
-  --> $DIR/E0401.rs:32:25
+  --> $DIR/E0401.rs:22:25
    |
 LL | impl<T> Iterator for A<T> {
    | ---- `Self` type implicitly declared here, by this `impl`
diff --git a/src/test/ui/error-codes/E0403.rs b/src/test/ui/error-codes/E0403.rs
index 6a68013dc6f..8bccb631af4 100644
--- a/src/test/ui/error-codes/E0403.rs
+++ b/src/test/ui/error-codes/E0403.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn foo<T, T>(s: T, u: T) {} //~ ERROR E0403
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0403.stderr b/src/test/ui/error-codes/E0403.stderr
index f9ccc31654a..919a82dbe1a 100644
--- a/src/test/ui/error-codes/E0403.stderr
+++ b/src/test/ui/error-codes/E0403.stderr
@@ -1,5 +1,5 @@
 error[E0403]: the name `T` is already used for a type parameter in this type parameter list
-  --> $DIR/E0403.rs:11:11
+  --> $DIR/E0403.rs:1:11
    |
 LL | fn foo<T, T>(s: T, u: T) {} //~ ERROR E0403
    |        -  ^ already used
diff --git a/src/test/ui/error-codes/E0404.rs b/src/test/ui/error-codes/E0404.rs
index 1c6ff5ae841..b1733372436 100644
--- a/src/test/ui/error-codes/E0404.rs
+++ b/src/test/ui/error-codes/E0404.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Foo;
 struct Bar;
 
diff --git a/src/test/ui/error-codes/E0404.stderr b/src/test/ui/error-codes/E0404.stderr
index afb748bedbe..f84fd52c851 100644
--- a/src/test/ui/error-codes/E0404.stderr
+++ b/src/test/ui/error-codes/E0404.stderr
@@ -1,11 +1,11 @@
 error[E0404]: expected trait, found struct `Foo`
-  --> $DIR/E0404.rs:14:6
+  --> $DIR/E0404.rs:4:6
    |
 LL | impl Foo for Bar {} //~ ERROR E0404
    |      ^^^ not a trait
 
 error[E0404]: expected trait, found struct `Foo`
-  --> $DIR/E0404.rs:18:11
+  --> $DIR/E0404.rs:8:11
    |
 LL | fn baz<T: Foo>(_: T) {} //~ ERROR E0404
    |           ^^^ not a trait
diff --git a/src/test/ui/error-codes/E0405.rs b/src/test/ui/error-codes/E0405.rs
index 45d4b219ba8..f03c4e19b09 100644
--- a/src/test/ui/error-codes/E0405.rs
+++ b/src/test/ui/error-codes/E0405.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Foo;
 
 impl SomeTrait for Foo {} //~ ERROR E0405
diff --git a/src/test/ui/error-codes/E0405.stderr b/src/test/ui/error-codes/E0405.stderr
index 27190af1c6c..2f09a525e45 100644
--- a/src/test/ui/error-codes/E0405.stderr
+++ b/src/test/ui/error-codes/E0405.stderr
@@ -1,5 +1,5 @@
 error[E0405]: cannot find trait `SomeTrait` in this scope
-  --> $DIR/E0405.rs:13:6
+  --> $DIR/E0405.rs:3:6
    |
 LL | impl SomeTrait for Foo {} //~ ERROR E0405
    |      ^^^^^^^^^ not found in this scope
diff --git a/src/test/ui/error-codes/E0407.rs b/src/test/ui/error-codes/E0407.rs
index 41d8b4513ce..962bd5741e7 100644
--- a/src/test/ui/error-codes/E0407.rs
+++ b/src/test/ui/error-codes/E0407.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait Foo {
     fn a();
 }
diff --git a/src/test/ui/error-codes/E0407.stderr b/src/test/ui/error-codes/E0407.stderr
index 1be04a992c2..567fc879040 100644
--- a/src/test/ui/error-codes/E0407.stderr
+++ b/src/test/ui/error-codes/E0407.stderr
@@ -1,5 +1,5 @@
 error[E0407]: method `b` is not a member of trait `Foo`
-  --> $DIR/E0407.rs:19:5
+  --> $DIR/E0407.rs:9:5
    |
 LL |     fn b() {}
    |     ^^^^^^^^^ not a member of trait `Foo`
diff --git a/src/test/ui/error-codes/E0408.rs b/src/test/ui/error-codes/E0408.rs
index 8ddeb20afdc..e91a98f3857 100644
--- a/src/test/ui/error-codes/E0408.rs
+++ b/src/test/ui/error-codes/E0408.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     let x = Some(0);
 
diff --git a/src/test/ui/error-codes/E0408.stderr b/src/test/ui/error-codes/E0408.stderr
index 46845de1aad..dc0a41e6eb0 100644
--- a/src/test/ui/error-codes/E0408.stderr
+++ b/src/test/ui/error-codes/E0408.stderr
@@ -1,5 +1,5 @@
 error[E0408]: variable `y` is not bound in all patterns
-  --> $DIR/E0408.rs:15:19
+  --> $DIR/E0408.rs:5:19
    |
 LL |         Some(y) | None => {} //~  ERROR variable `y` is not bound in all patterns
    |              -    ^^^^ pattern doesn't bind `y`
diff --git a/src/test/ui/error-codes/E0411.rs b/src/test/ui/error-codes/E0411.rs
index 187986fbadb..872370f2a53 100644
--- a/src/test/ui/error-codes/E0411.rs
+++ b/src/test/ui/error-codes/E0411.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     <Self>::foo; //~ ERROR E0411
 }
diff --git a/src/test/ui/error-codes/E0411.stderr b/src/test/ui/error-codes/E0411.stderr
index 4e85f651b55..fe78d8d957e 100644
--- a/src/test/ui/error-codes/E0411.stderr
+++ b/src/test/ui/error-codes/E0411.stderr
@@ -1,5 +1,5 @@
 error[E0411]: cannot find type `Self` in this scope
-  --> $DIR/E0411.rs:12:6
+  --> $DIR/E0411.rs:2:6
    |
 LL |     <Self>::foo; //~ ERROR E0411
    |      ^^^^ `Self` is only available in impls, traits, and type definitions
diff --git a/src/test/ui/error-codes/E0412.rs b/src/test/ui/error-codes/E0412.rs
index f62901cac31..5f922a50a68 100644
--- a/src/test/ui/error-codes/E0412.rs
+++ b/src/test/ui/error-codes/E0412.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 impl Something {} //~ ERROR E0412
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0412.stderr b/src/test/ui/error-codes/E0412.stderr
index 61115c8b292..68d636ffae0 100644
--- a/src/test/ui/error-codes/E0412.stderr
+++ b/src/test/ui/error-codes/E0412.stderr
@@ -1,5 +1,5 @@
 error[E0412]: cannot find type `Something` in this scope
-  --> $DIR/E0412.rs:11:6
+  --> $DIR/E0412.rs:1:6
    |
 LL | impl Something {} //~ ERROR E0412
    |      ^^^^^^^^^ not found in this scope
diff --git a/src/test/ui/error-codes/E0415.rs b/src/test/ui/error-codes/E0415.rs
index 2a5f0d3c229..6177ac35be8 100644
--- a/src/test/ui/error-codes/E0415.rs
+++ b/src/test/ui/error-codes/E0415.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn foo(f: i32, f: i32) {} //~ ERROR E0415
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0415.stderr b/src/test/ui/error-codes/E0415.stderr
index 3f036f3a534..6e848f9bfd3 100644
--- a/src/test/ui/error-codes/E0415.stderr
+++ b/src/test/ui/error-codes/E0415.stderr
@@ -1,5 +1,5 @@
 error[E0415]: identifier `f` is bound more than once in this parameter list
-  --> $DIR/E0415.rs:11:16
+  --> $DIR/E0415.rs:1:16
    |
 LL | fn foo(f: i32, f: i32) {} //~ ERROR E0415
    |                ^ used as parameter more than once
diff --git a/src/test/ui/error-codes/E0416.rs b/src/test/ui/error-codes/E0416.rs
index 91077ab37f3..88eece07acd 100644
--- a/src/test/ui/error-codes/E0416.rs
+++ b/src/test/ui/error-codes/E0416.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     match (1, 2) {
         (x, x) => {} //~ ERROR E0416
diff --git a/src/test/ui/error-codes/E0416.stderr b/src/test/ui/error-codes/E0416.stderr
index 8815bb2ad84..4baf5006cf4 100644
--- a/src/test/ui/error-codes/E0416.stderr
+++ b/src/test/ui/error-codes/E0416.stderr
@@ -1,5 +1,5 @@
 error[E0416]: identifier `x` is bound more than once in the same pattern
-  --> $DIR/E0416.rs:13:13
+  --> $DIR/E0416.rs:3:13
    |
 LL |         (x, x) => {} //~ ERROR E0416
    |             ^ used in a pattern more than once
diff --git a/src/test/ui/error-codes/E0423.rs b/src/test/ui/error-codes/E0423.rs
index 7d71499d318..2b26808d4bd 100644
--- a/src/test/ui/error-codes/E0423.rs
+++ b/src/test/ui/error-codes/E0423.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main () {
     struct Foo { a: bool };
 
diff --git a/src/test/ui/error-codes/E0423.stderr b/src/test/ui/error-codes/E0423.stderr
index 477c698ac9a..df9ed631a1c 100644
--- a/src/test/ui/error-codes/E0423.stderr
+++ b/src/test/ui/error-codes/E0423.stderr
@@ -1,23 +1,23 @@
 error: expected type, found `1`
-  --> $DIR/E0423.rs:22:39
+  --> $DIR/E0423.rs:12:39
    |
 LL |     if let S { x: _x, y: 2 } = S { x: 1, y: 2 } { println!("Ok"); }
    |                                       ^ expecting a type here because of type ascription
 
 error: expected expression, found `==`
-  --> $DIR/E0423.rs:25:13
+  --> $DIR/E0423.rs:15:13
    |
 LL |     if T {} == T {} { println!("Ok"); }
    |             ^^ expected expression
 
 error: expected type, found `0`
-  --> $DIR/E0423.rs:31:39
+  --> $DIR/E0423.rs:21:39
    |
 LL |     for _ in std::ops::Range { start: 0, end: 10 } {}
    |                                       ^ expecting a type here because of type ascription
 
 error[E0423]: expected function, found struct `Foo`
-  --> $DIR/E0423.rs:14:13
+  --> $DIR/E0423.rs:4:13
    |
 LL |     let f = Foo(); //~ ERROR E0423
    |             ^^^
@@ -26,19 +26,19 @@ LL |     let f = Foo(); //~ ERROR E0423
    |             did you mean `Foo { /* fields */ }`?
 
 error[E0423]: expected value, found struct `S`
-  --> $DIR/E0423.rs:22:32
+  --> $DIR/E0423.rs:12:32
    |
 LL |     if let S { x: _x, y: 2 } = S { x: 1, y: 2 } { println!("Ok"); }
    |                                ^ did you mean `(S { /* fields */ })`?
 
 error[E0423]: expected value, found struct `T`
-  --> $DIR/E0423.rs:25:8
+  --> $DIR/E0423.rs:15:8
    |
 LL |     if T {} == T {} { println!("Ok"); }
    |        ^ did you mean `(T { /* fields */ })`?
 
 error[E0423]: expected value, found struct `std::ops::Range`
-  --> $DIR/E0423.rs:31:14
+  --> $DIR/E0423.rs:21:14
    |
 LL |     for _ in std::ops::Range { start: 0, end: 10 } {}
    |              ^^^^^^^^^^^^^^^ did you mean `(std::ops::Range { /* fields */ })`?
diff --git a/src/test/ui/error-codes/E0424.rs b/src/test/ui/error-codes/E0424.rs
index 20d42da1c0c..3c6a1d4f88f 100644
--- a/src/test/ui/error-codes/E0424.rs
+++ b/src/test/ui/error-codes/E0424.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Foo;
 
 impl Foo {
diff --git a/src/test/ui/error-codes/E0424.stderr b/src/test/ui/error-codes/E0424.stderr
index 5eccd7d2283..b91f061db34 100644
--- a/src/test/ui/error-codes/E0424.stderr
+++ b/src/test/ui/error-codes/E0424.stderr
@@ -1,11 +1,11 @@
 error[E0424]: expected value, found module `self`
-  --> $DIR/E0424.rs:17:9
+  --> $DIR/E0424.rs:7:9
    |
 LL |         self.bar(); //~ ERROR E0424
    |         ^^^^ `self` value is a keyword only available in methods with `self` parameter
 
 error[E0424]: expected unit struct/variant or constant, found module `self`
-  --> $DIR/E0424.rs:22:9
+  --> $DIR/E0424.rs:12:9
    |
 LL |     let self = "self"; //~ ERROR E0424
    |         ^^^^ `self` value is a keyword and may not be bound to variables or shadowed
diff --git a/src/test/ui/error-codes/E0425.rs b/src/test/ui/error-codes/E0425.rs
index 3786282031f..ec234ae9906 100644
--- a/src/test/ui/error-codes/E0425.rs
+++ b/src/test/ui/error-codes/E0425.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait Foo {
     fn bar() {
         elf; //~ ERROR E0425
diff --git a/src/test/ui/error-codes/E0425.stderr b/src/test/ui/error-codes/E0425.stderr
index 72756baf8ef..391027a5184 100644
--- a/src/test/ui/error-codes/E0425.stderr
+++ b/src/test/ui/error-codes/E0425.stderr
@@ -1,5 +1,5 @@
 error[E0425]: cannot find value `elf` in this scope
-  --> $DIR/E0425.rs:13:9
+  --> $DIR/E0425.rs:3:9
    |
 LL |         elf; //~ ERROR E0425
    |         ^^^ not found in this scope
diff --git a/src/test/ui/error-codes/E0426.rs b/src/test/ui/error-codes/E0426.rs
index d6261d3a74e..7a1dcde49b6 100644
--- a/src/test/ui/error-codes/E0426.rs
+++ b/src/test/ui/error-codes/E0426.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main () {
     loop {
         break 'a;
diff --git a/src/test/ui/error-codes/E0426.stderr b/src/test/ui/error-codes/E0426.stderr
index 29249ab3919..035f2eb86b9 100644
--- a/src/test/ui/error-codes/E0426.stderr
+++ b/src/test/ui/error-codes/E0426.stderr
@@ -1,5 +1,5 @@
 error[E0426]: use of undeclared label `'a`
-  --> $DIR/E0426.rs:13:15
+  --> $DIR/E0426.rs:3:15
    |
 LL |         break 'a;
    |               ^^ undeclared label `'a`
diff --git a/src/test/ui/error-codes/E0428.rs b/src/test/ui/error-codes/E0428.rs
index 3c709f3a399..eb9594fb8b6 100644
--- a/src/test/ui/error-codes/E0428.rs
+++ b/src/test/ui/error-codes/E0428.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Bar; //~ previous definition of the type `Bar` here
 struct Bar; //~ ERROR E0428
 
diff --git a/src/test/ui/error-codes/E0428.stderr b/src/test/ui/error-codes/E0428.stderr
index ebfe866625d..2154cb0ead2 100644
--- a/src/test/ui/error-codes/E0428.stderr
+++ b/src/test/ui/error-codes/E0428.stderr
@@ -1,5 +1,5 @@
 error[E0428]: the name `Bar` is defined multiple times
-  --> $DIR/E0428.rs:12:1
+  --> $DIR/E0428.rs:2:1
    |
 LL | struct Bar; //~ previous definition of the type `Bar` here
    | ----------- previous definition of the type `Bar` here
diff --git a/src/test/ui/error-codes/E0429.rs b/src/test/ui/error-codes/E0429.rs
index f1cad200be6..e74b27a78b6 100644
--- a/src/test/ui/error-codes/E0429.rs
+++ b/src/test/ui/error-codes/E0429.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use std::fmt::self; //~ ERROR E0429
 
 fn main () {
diff --git a/src/test/ui/error-codes/E0429.stderr b/src/test/ui/error-codes/E0429.stderr
index d36155fb466..13cdb0d8861 100644
--- a/src/test/ui/error-codes/E0429.stderr
+++ b/src/test/ui/error-codes/E0429.stderr
@@ -1,5 +1,5 @@
 error[E0429]: `self` imports are only allowed within a { } list
-  --> $DIR/E0429.rs:11:5
+  --> $DIR/E0429.rs:1:5
    |
 LL | use std::fmt::self; //~ ERROR E0429
    |     ^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0430.rs b/src/test/ui/error-codes/E0430.rs
index 992876dd294..ba2f671d66c 100644
--- a/src/test/ui/error-codes/E0430.rs
+++ b/src/test/ui/error-codes/E0430.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use std::fmt::{self, self}; //~ ERROR E0430
                             //~^ ERROR E0252
 
diff --git a/src/test/ui/error-codes/E0430.stderr b/src/test/ui/error-codes/E0430.stderr
index 32198acec77..0151cde887f 100644
--- a/src/test/ui/error-codes/E0430.stderr
+++ b/src/test/ui/error-codes/E0430.stderr
@@ -1,5 +1,5 @@
 error[E0430]: `self` import can only appear once in an import list
-  --> $DIR/E0430.rs:11:16
+  --> $DIR/E0430.rs:1:16
    |
 LL | use std::fmt::{self, self}; //~ ERROR E0430
    |                ^^^^  ---- another `self` import appears here
@@ -7,7 +7,7 @@ LL | use std::fmt::{self, self}; //~ ERROR E0430
    |                can only appear once in an import list
 
 error[E0252]: the name `fmt` is defined multiple times
-  --> $DIR/E0430.rs:11:22
+  --> $DIR/E0430.rs:1:22
    |
 LL | use std::fmt::{self, self}; //~ ERROR E0430
    |                ----  ^^^^ `fmt` reimported here
diff --git a/src/test/ui/error-codes/E0431.rs b/src/test/ui/error-codes/E0431.rs
index 09ddc1efaf4..2e2ccba1715 100644
--- a/src/test/ui/error-codes/E0431.rs
+++ b/src/test/ui/error-codes/E0431.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use {self}; //~ ERROR E0431
 
 fn main () {
diff --git a/src/test/ui/error-codes/E0431.stderr b/src/test/ui/error-codes/E0431.stderr
index 75b8486aa5c..240e6bd4a82 100644
--- a/src/test/ui/error-codes/E0431.stderr
+++ b/src/test/ui/error-codes/E0431.stderr
@@ -1,5 +1,5 @@
 error[E0431]: `self` import can only appear in an import list with a non-empty prefix
-  --> $DIR/E0431.rs:11:6
+  --> $DIR/E0431.rs:1:6
    |
 LL | use {self}; //~ ERROR E0431
    |      ^^^^ can only appear in an import list with a non-empty prefix
diff --git a/src/test/ui/error-codes/E0432.rs b/src/test/ui/error-codes/E0432.rs
index 08d699ee4ca..1fc95f94566 100644
--- a/src/test/ui/error-codes/E0432.rs
+++ b/src/test/ui/error-codes/E0432.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use something::Foo; //~ ERROR E0432
 
 fn main () {
diff --git a/src/test/ui/error-codes/E0432.stderr b/src/test/ui/error-codes/E0432.stderr
index d288cd086e7..bb6b31242cb 100644
--- a/src/test/ui/error-codes/E0432.stderr
+++ b/src/test/ui/error-codes/E0432.stderr
@@ -1,5 +1,5 @@
 error[E0432]: unresolved import `something`
-  --> $DIR/E0432.rs:11:5
+  --> $DIR/E0432.rs:1:5
    |
 LL | use something::Foo; //~ ERROR E0432
    |     ^^^^^^^^^ maybe a missing `extern crate something;`?
diff --git a/src/test/ui/error-codes/E0433.rs b/src/test/ui/error-codes/E0433.rs
index 916d6220eb9..9b54ec8c5cf 100644
--- a/src/test/ui/error-codes/E0433.rs
+++ b/src/test/ui/error-codes/E0433.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main () {
     let map = HashMap::new(); //~ ERROR E0433
 }
diff --git a/src/test/ui/error-codes/E0433.stderr b/src/test/ui/error-codes/E0433.stderr
index 8a66e749ba8..7fbb7fa0413 100644
--- a/src/test/ui/error-codes/E0433.stderr
+++ b/src/test/ui/error-codes/E0433.stderr
@@ -1,5 +1,5 @@
 error[E0433]: failed to resolve: use of undeclared type or module `HashMap`
-  --> $DIR/E0433.rs:12:15
+  --> $DIR/E0433.rs:2:15
    |
 LL |     let map = HashMap::new(); //~ ERROR E0433
    |               ^^^^^^^ use of undeclared type or module `HashMap`
diff --git a/src/test/ui/error-codes/E0434.rs b/src/test/ui/error-codes/E0434.rs
index 747d9f72c42..db7037ee115 100644
--- a/src/test/ui/error-codes/E0434.rs
+++ b/src/test/ui/error-codes/E0434.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn foo() {
     let y = 5;
     fn bar() -> u32 {
diff --git a/src/test/ui/error-codes/E0434.stderr b/src/test/ui/error-codes/E0434.stderr
index bbbc7d16e3b..0e2bc701b7f 100644
--- a/src/test/ui/error-codes/E0434.stderr
+++ b/src/test/ui/error-codes/E0434.stderr
@@ -1,5 +1,5 @@
 error[E0434]: can't capture dynamic environment in a fn item
-  --> $DIR/E0434.rs:14:9
+  --> $DIR/E0434.rs:4:9
    |
 LL |         y //~ ERROR E0434
    |         ^
diff --git a/src/test/ui/error-codes/E0435.rs b/src/test/ui/error-codes/E0435.rs
index 5246fda6aaf..620dd30a23b 100644
--- a/src/test/ui/error-codes/E0435.rs
+++ b/src/test/ui/error-codes/E0435.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main () {
     let foo = 42u32;
     let _: [u8; foo]; //~ ERROR E0435
diff --git a/src/test/ui/error-codes/E0435.stderr b/src/test/ui/error-codes/E0435.stderr
index 517fddfa1ac..09c9d19e114 100644
--- a/src/test/ui/error-codes/E0435.stderr
+++ b/src/test/ui/error-codes/E0435.stderr
@@ -1,5 +1,5 @@
 error[E0435]: attempt to use a non-constant value in a constant
-  --> $DIR/E0435.rs:13:17
+  --> $DIR/E0435.rs:3:17
    |
 LL |     let _: [u8; foo]; //~ ERROR E0435
    |                 ^^^ non-constant value
diff --git a/src/test/ui/error-codes/E0437.rs b/src/test/ui/error-codes/E0437.rs
index 7440a82773e..f8c15007d4e 100644
--- a/src/test/ui/error-codes/E0437.rs
+++ b/src/test/ui/error-codes/E0437.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait Foo {}
 
 impl Foo for i32 {
diff --git a/src/test/ui/error-codes/E0437.stderr b/src/test/ui/error-codes/E0437.stderr
index 790e306f121..9470cbf176a 100644
--- a/src/test/ui/error-codes/E0437.stderr
+++ b/src/test/ui/error-codes/E0437.stderr
@@ -1,5 +1,5 @@
 error[E0437]: type `Bar` is not a member of trait `Foo`
-  --> $DIR/E0437.rs:14:5
+  --> $DIR/E0437.rs:4:5
    |
 LL |     type Bar = bool; //~ ERROR E0437
    |     ^^^^^^^^^^^^^^^^ not a member of trait `Foo`
diff --git a/src/test/ui/error-codes/E0438.rs b/src/test/ui/error-codes/E0438.rs
index 61d25134993..02898b886c8 100644
--- a/src/test/ui/error-codes/E0438.rs
+++ b/src/test/ui/error-codes/E0438.rs
@@ -1,14 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-
 trait Bar {}
 
 impl Bar for i32 {
diff --git a/src/test/ui/error-codes/E0438.stderr b/src/test/ui/error-codes/E0438.stderr
index 5f311e9bca9..6a11577bb0f 100644
--- a/src/test/ui/error-codes/E0438.stderr
+++ b/src/test/ui/error-codes/E0438.stderr
@@ -1,5 +1,5 @@
 error[E0438]: const `BAR` is not a member of trait `Bar`
-  --> $DIR/E0438.rs:15:5
+  --> $DIR/E0438.rs:4:5
    |
 LL |     const BAR: bool = true; //~ ERROR E0438
    |     ^^^^^^^^^^^^^^^^^^^^^^^ not a member of trait `Bar`
diff --git a/src/test/ui/error-codes/E0439.rs b/src/test/ui/error-codes/E0439.rs
index 52443432021..86e9cb55a9c 100644
--- a/src/test/ui/error-codes/E0439.rs
+++ b/src/test/ui/error-codes/E0439.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(platform_intrinsics)]
 
 extern "platform-intrinsic" {
diff --git a/src/test/ui/error-codes/E0439.stderr b/src/test/ui/error-codes/E0439.stderr
index 1400633001a..e3b8fbfb253 100644
--- a/src/test/ui/error-codes/E0439.stderr
+++ b/src/test/ui/error-codes/E0439.stderr
@@ -1,5 +1,5 @@
 error[E0439]: invalid `simd_shuffle`, needs length: `simd_shuffle`
-  --> $DIR/E0439.rs:14:5
+  --> $DIR/E0439.rs:4:5
    |
 LL |     fn simd_shuffle<A,B>(a: A, b: A, c: [u32; 8]) -> B; //~ ERROR E0439
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0440.rs b/src/test/ui/error-codes/E0440.rs
index e69181d05d7..8ac47f5ab53 100644
--- a/src/test/ui/error-codes/E0440.rs
+++ b/src/test/ui/error-codes/E0440.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(repr_simd)]
 #![feature(platform_intrinsics)]
 #![allow(non_camel_case_types)]
diff --git a/src/test/ui/error-codes/E0440.stderr b/src/test/ui/error-codes/E0440.stderr
index c13a4bb9135..e153fb0f73f 100644
--- a/src/test/ui/error-codes/E0440.stderr
+++ b/src/test/ui/error-codes/E0440.stderr
@@ -1,5 +1,5 @@
 error[E0440]: platform-specific intrinsic has wrong number of type parameters: found 1, expected 0
-  --> $DIR/E0440.rs:19:5
+  --> $DIR/E0440.rs:9:5
    |
 LL |     fn x86_mm_movemask_pd<T>(x: f64x2) -> i32; //~ ERROR E0440
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0441.rs b/src/test/ui/error-codes/E0441.rs
index 52f969be26d..90bdbe96c2d 100644
--- a/src/test/ui/error-codes/E0441.rs
+++ b/src/test/ui/error-codes/E0441.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(repr_simd)]
 #![feature(platform_intrinsics)]
 #![allow(non_camel_case_types)]
diff --git a/src/test/ui/error-codes/E0441.stderr b/src/test/ui/error-codes/E0441.stderr
index 3874edcc028..73eddb2604e 100644
--- a/src/test/ui/error-codes/E0441.stderr
+++ b/src/test/ui/error-codes/E0441.stderr
@@ -1,5 +1,5 @@
 error[E0441]: unrecognized platform-specific intrinsic function: `x86_mm_adds_ep16`
-  --> $DIR/E0441.rs:19:5
+  --> $DIR/E0441.rs:9:5
    |
 LL |     fn x86_mm_adds_ep16(x: i16x8, y: i16x8) -> i16x8; //~ ERROR E0441
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0442.rs b/src/test/ui/error-codes/E0442.rs
index 30019eb53b9..a6eb59610f7 100644
--- a/src/test/ui/error-codes/E0442.rs
+++ b/src/test/ui/error-codes/E0442.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(repr_simd)]
 #![feature(platform_intrinsics)]
 #![allow(non_camel_case_types)]
diff --git a/src/test/ui/error-codes/E0442.stderr b/src/test/ui/error-codes/E0442.stderr
index d96c6ab2449..017d4617a97 100644
--- a/src/test/ui/error-codes/E0442.stderr
+++ b/src/test/ui/error-codes/E0442.stderr
@@ -1,17 +1,17 @@
 error[E0442]: intrinsic argument 1 has wrong type: found vector with length 16, expected length 8
-  --> $DIR/E0442.rs:24:5
+  --> $DIR/E0442.rs:14:5
    |
 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:24:5
+  --> $DIR/E0442.rs:14:5
    |
 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:24:5
+  --> $DIR/E0442.rs:14:5
    |
 LL |     fn x86_mm_adds_epi16(x: i8x16, y: i32x4) -> i64x2;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0443.rs b/src/test/ui/error-codes/E0443.rs
index aa2e1896edb..4940f1d7539 100644
--- a/src/test/ui/error-codes/E0443.rs
+++ b/src/test/ui/error-codes/E0443.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(repr_simd)]
 #![feature(platform_intrinsics)]
 #![allow(non_camel_case_types)]
diff --git a/src/test/ui/error-codes/E0443.stderr b/src/test/ui/error-codes/E0443.stderr
index 90910bc5d16..4c2e6418fed 100644
--- a/src/test/ui/error-codes/E0443.stderr
+++ b/src/test/ui/error-codes/E0443.stderr
@@ -1,5 +1,5 @@
 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:21:5
+  --> $DIR/E0443.rs:11:5
    |
 LL |     fn x86_mm_adds_epi16(x: i16x8, y: i16x8) -> i64x8; //~ ERROR E0443
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0444.rs b/src/test/ui/error-codes/E0444.rs
index 88c8cb344ac..3d73339bf9a 100644
--- a/src/test/ui/error-codes/E0444.rs
+++ b/src/test/ui/error-codes/E0444.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(repr_simd)]
 #![feature(platform_intrinsics)]
 #![allow(non_camel_case_types)]
diff --git a/src/test/ui/error-codes/E0444.stderr b/src/test/ui/error-codes/E0444.stderr
index 8f18a5e2de8..0a894f7edc6 100644
--- a/src/test/ui/error-codes/E0444.stderr
+++ b/src/test/ui/error-codes/E0444.stderr
@@ -1,5 +1,5 @@
 error[E0444]: platform-specific intrinsic has invalid number of arguments: found 3, expected 1
-  --> $DIR/E0444.rs:19:5
+  --> $DIR/E0444.rs:9:5
    |
 LL |     fn x86_mm_movemask_pd(x: f64x2, y: f64x2, z: f64x2) -> i32; //~ ERROR E0444
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0445.rs b/src/test/ui/error-codes/E0445.rs
index bca1b52d17a..570c37ef2cc 100644
--- a/src/test/ui/error-codes/E0445.rs
+++ b/src/test/ui/error-codes/E0445.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait Foo {
     fn dummy(&self) { }
 }
diff --git a/src/test/ui/error-codes/E0445.stderr b/src/test/ui/error-codes/E0445.stderr
index 552de83a65e..747e4daf74e 100644
--- a/src/test/ui/error-codes/E0445.stderr
+++ b/src/test/ui/error-codes/E0445.stderr
@@ -1,17 +1,17 @@
 error[E0445]: private trait `Foo` in public interface
-  --> $DIR/E0445.rs:15:1
+  --> $DIR/E0445.rs:5:1
    |
 LL | pub trait Bar : Foo {}
    | ^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait
 
 error[E0445]: private trait `Foo` in public interface
-  --> $DIR/E0445.rs:18:1
+  --> $DIR/E0445.rs:8:1
    |
 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
+  --> $DIR/E0445.rs:11:1
    |
 LL | pub fn foo<T: Foo> (t: T) {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait
diff --git a/src/test/ui/error-codes/E0446.rs b/src/test/ui/error-codes/E0446.rs
index c5766618284..33bd6144716 100644
--- a/src/test/ui/error-codes/E0446.rs
+++ b/src/test/ui/error-codes/E0446.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 mod Foo {
     struct Bar(u32);
 
diff --git a/src/test/ui/error-codes/E0446.stderr b/src/test/ui/error-codes/E0446.stderr
index 6c7f3785464..8f381320cf9 100644
--- a/src/test/ui/error-codes/E0446.stderr
+++ b/src/test/ui/error-codes/E0446.stderr
@@ -1,5 +1,5 @@
 error[E0446]: private type `Foo::Bar` in public interface
-  --> $DIR/E0446.rs:14:5
+  --> $DIR/E0446.rs:4:5
    |
 LL |       struct Bar(u32);
    |       - `Foo::Bar` declared as private
diff --git a/src/test/ui/error-codes/E0449.rs b/src/test/ui/error-codes/E0449.rs
index ac365db33e5..eba0d479e97 100644
--- a/src/test/ui/error-codes/E0449.rs
+++ b/src/test/ui/error-codes/E0449.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Bar;
 
 trait Foo {
diff --git a/src/test/ui/error-codes/E0449.stderr b/src/test/ui/error-codes/E0449.stderr
index df3b09ba7c9..d623c8abbd9 100644
--- a/src/test/ui/error-codes/E0449.stderr
+++ b/src/test/ui/error-codes/E0449.stderr
@@ -1,5 +1,5 @@
 error[E0449]: unnecessary visibility qualifier
-  --> $DIR/E0449.rs:17:1
+  --> $DIR/E0449.rs:7:1
    |
 LL | pub impl Bar {} //~ ERROR E0449
    | ^^^ `pub` not permitted here because it's implied
@@ -7,13 +7,13 @@ LL | pub impl Bar {} //~ ERROR E0449
    = note: place qualifiers on individual impl items instead
 
 error[E0449]: unnecessary visibility qualifier
-  --> $DIR/E0449.rs:19:1
+  --> $DIR/E0449.rs:9:1
    |
 LL | pub impl Foo for Bar { //~ ERROR E0449
    | ^^^ `pub` not permitted here because it's implied
 
 error[E0449]: unnecessary visibility qualifier
-  --> $DIR/E0449.rs:20:5
+  --> $DIR/E0449.rs:10:5
    |
 LL |     pub fn foo() {} //~ ERROR E0449
    |     ^^^ `pub` not permitted here because it's implied
diff --git a/src/test/ui/error-codes/E0451.rs b/src/test/ui/error-codes/E0451.rs
index af4e7d628bb..7c1c326fb5b 100644
--- a/src/test/ui/error-codes/E0451.rs
+++ b/src/test/ui/error-codes/E0451.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 mod Bar {
     pub struct Foo {
         pub a: isize,
diff --git a/src/test/ui/error-codes/E0451.stderr b/src/test/ui/error-codes/E0451.stderr
index 4d54e17d507..11bc7e31803 100644
--- a/src/test/ui/error-codes/E0451.stderr
+++ b/src/test/ui/error-codes/E0451.stderr
@@ -1,11 +1,11 @@
 error[E0451]: field `b` of struct `Bar::Foo` is private
-  --> $DIR/E0451.rs:24:23
+  --> $DIR/E0451.rs:14:23
    |
 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
+  --> $DIR/E0451.rs:18:29
    |
 LL |     let f = Bar::Foo{ a: 0, b: 0 }; //~ ERROR E0451
    |                             ^^^^ field `b` is private
diff --git a/src/test/ui/error-codes/E0452.rs b/src/test/ui/error-codes/E0452.rs
index 1665bbdd4c2..940b9f693ca 100644
--- a/src/test/ui/error-codes/E0452.rs
+++ b/src/test/ui/error-codes/E0452.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![allow(foo = "")] //~ ERROR E0452
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0452.stderr b/src/test/ui/error-codes/E0452.stderr
index a915ca1d674..62f268cd432 100644
--- a/src/test/ui/error-codes/E0452.stderr
+++ b/src/test/ui/error-codes/E0452.stderr
@@ -1,5 +1,5 @@
 error[E0452]: malformed lint attribute
-  --> $DIR/E0452.rs:11:10
+  --> $DIR/E0452.rs:1:10
    |
 LL | #![allow(foo = "")] //~ ERROR E0452
    |          ^^^^^^^^
diff --git a/src/test/ui/error-codes/E0453.rs b/src/test/ui/error-codes/E0453.rs
index 8e51b84bab8..46fa04843ea 100644
--- a/src/test/ui/error-codes/E0453.rs
+++ b/src/test/ui/error-codes/E0453.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![forbid(non_snake_case)]
 
 #[allow(non_snake_case)]
diff --git a/src/test/ui/error-codes/E0453.stderr b/src/test/ui/error-codes/E0453.stderr
index 59e1a1cfdfc..03cc756d6ac 100644
--- a/src/test/ui/error-codes/E0453.stderr
+++ b/src/test/ui/error-codes/E0453.stderr
@@ -1,5 +1,5 @@
 error[E0453]: allow(non_snake_case) overruled by outer forbid(non_snake_case)
-  --> $DIR/E0453.rs:13:9
+  --> $DIR/E0453.rs:3:9
    |
 LL | #![forbid(non_snake_case)]
    |           -------------- `forbid` level set here
diff --git a/src/test/ui/error-codes/E0454.rs b/src/test/ui/error-codes/E0454.rs
index afd0f5f5e46..d62210c3f94 100644
--- a/src/test/ui/error-codes/E0454.rs
+++ b/src/test/ui/error-codes/E0454.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[link(name = "")] extern {}
 //~^ ERROR E0454
 
diff --git a/src/test/ui/error-codes/E0454.stderr b/src/test/ui/error-codes/E0454.stderr
index 44dde538666..352c3baa83a 100644
--- a/src/test/ui/error-codes/E0454.stderr
+++ b/src/test/ui/error-codes/E0454.stderr
@@ -1,5 +1,5 @@
 error[E0454]: #[link(name = "")] given with empty name
-  --> $DIR/E0454.rs:11:1
+  --> $DIR/E0454.rs:1:1
    |
 LL | #[link(name = "")] extern {}
    | ^^^^^^^^^^^^^^^^^^ empty name given
diff --git a/src/test/ui/error-codes/E0458.rs b/src/test/ui/error-codes/E0458.rs
index fea27ef8115..3d230358721 100644
--- a/src/test/ui/error-codes/E0458.rs
+++ b/src/test/ui/error-codes/E0458.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[link(kind = "wonderful_unicorn")] extern {} //~ ERROR E0458
                                               //~| ERROR E0459
 
diff --git a/src/test/ui/error-codes/E0458.stderr b/src/test/ui/error-codes/E0458.stderr
index fa99ba6a417..8b071e0b315 100644
--- a/src/test/ui/error-codes/E0458.stderr
+++ b/src/test/ui/error-codes/E0458.stderr
@@ -1,5 +1,5 @@
 error[E0458]: unknown kind: `wonderful_unicorn`
-  --> $DIR/E0458.rs:11:1
+  --> $DIR/E0458.rs:1:1
    |
 LL | #[link(kind = "wonderful_unicorn")] extern {} //~ ERROR E0458
    | ^^^^^^^--------------------------^^
@@ -7,7 +7,7 @@ LL | #[link(kind = "wonderful_unicorn")] extern {} //~ ERROR E0458
    |        unknown kind
 
 error[E0459]: #[link(...)] specified without `name = "foo"`
-  --> $DIR/E0458.rs:11:1
+  --> $DIR/E0458.rs:1:1
    |
 LL | #[link(kind = "wonderful_unicorn")] extern {} //~ ERROR E0458
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `name` argument
diff --git a/src/test/ui/error-codes/E0459.rs b/src/test/ui/error-codes/E0459.rs
index dc7ac714f22..80a2fd35151 100644
--- a/src/test/ui/error-codes/E0459.rs
+++ b/src/test/ui/error-codes/E0459.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[link(kind = "dylib")] extern {} //~ ERROR E0459
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0459.stderr b/src/test/ui/error-codes/E0459.stderr
index 8f31e7b4b13..d3591cd5f60 100644
--- a/src/test/ui/error-codes/E0459.stderr
+++ b/src/test/ui/error-codes/E0459.stderr
@@ -1,5 +1,5 @@
 error[E0459]: #[link(...)] specified without `name = "foo"`
-  --> $DIR/E0459.rs:11:1
+  --> $DIR/E0459.rs:1:1
    |
 LL | #[link(kind = "dylib")] extern {} //~ ERROR E0459
    | ^^^^^^^^^^^^^^^^^^^^^^^ missing `name` argument
diff --git a/src/test/ui/error-codes/E0463.rs b/src/test/ui/error-codes/E0463.rs
index aae83975b22..683565281cf 100644
--- a/src/test/ui/error-codes/E0463.rs
+++ b/src/test/ui/error-codes/E0463.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(plugin)]
 #![plugin(cookie_monster)]
 //~^ ERROR E0463
diff --git a/src/test/ui/error-codes/E0463.stderr b/src/test/ui/error-codes/E0463.stderr
index 26403827e4a..1aa66e1ec88 100644
--- a/src/test/ui/error-codes/E0463.stderr
+++ b/src/test/ui/error-codes/E0463.stderr
@@ -1,5 +1,5 @@
 error[E0463]: can't find crate for `cookie_monster`
-  --> $DIR/E0463.rs:12:11
+  --> $DIR/E0463.rs:2:11
    |
 LL | #![plugin(cookie_monster)]
    |           ^^^^^^^^^^^^^^ can't find crate
diff --git a/src/test/ui/error-codes/E0478.rs b/src/test/ui/error-codes/E0478.rs
index 8eb4003fc97..1b5ca09d5a6 100644
--- a/src/test/ui/error-codes/E0478.rs
+++ b/src/test/ui/error-codes/E0478.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait Wedding<'t>: 't { }
 
 struct Prince<'kiss, 'SnowWhite> {
diff --git a/src/test/ui/error-codes/E0478.stderr b/src/test/ui/error-codes/E0478.stderr
index 0e778908058..5147bf24559 100644
--- a/src/test/ui/error-codes/E0478.stderr
+++ b/src/test/ui/error-codes/E0478.stderr
@@ -1,16 +1,16 @@
 error[E0478]: lifetime bound not satisfied
-  --> $DIR/E0478.rs:14:5
+  --> $DIR/E0478.rs:4:5
    |
 LL |     child: Box<Wedding<'kiss> + 'SnowWhite>, //~ ERROR E0478
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-note: lifetime parameter instantiated with the lifetime 'SnowWhite as defined on the struct at 13:22
-  --> $DIR/E0478.rs:13:22
+note: lifetime parameter instantiated with the lifetime 'SnowWhite as defined on the struct at 3:22
+  --> $DIR/E0478.rs:3:22
    |
 LL | struct Prince<'kiss, 'SnowWhite> {
    |                      ^^^^^^^^^^
-note: but lifetime parameter must outlive the lifetime 'kiss as defined on the struct at 13:15
-  --> $DIR/E0478.rs:13:15
+note: but lifetime parameter must outlive the lifetime 'kiss as defined on the struct at 3:15
+  --> $DIR/E0478.rs:3:15
    |
 LL | struct Prince<'kiss, 'SnowWhite> {
    |               ^^^^^
diff --git a/src/test/ui/error-codes/E0492.rs b/src/test/ui/error-codes/E0492.rs
index 8e4964c97c5..b1824941adf 100644
--- a/src/test/ui/error-codes/E0492.rs
+++ b/src/test/ui/error-codes/E0492.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use std::sync::atomic::{AtomicUsize, ATOMIC_USIZE_INIT};
 
 const A: AtomicUsize = ATOMIC_USIZE_INIT;
diff --git a/src/test/ui/error-codes/E0492.stderr b/src/test/ui/error-codes/E0492.stderr
index 157a1929690..b73db6c975e 100644
--- a/src/test/ui/error-codes/E0492.stderr
+++ b/src/test/ui/error-codes/E0492.stderr
@@ -1,5 +1,5 @@
 error[E0492]: cannot borrow a constant which may contain interior mutability, create a static instead
-  --> $DIR/E0492.rs:14:34
+  --> $DIR/E0492.rs:4:34
    |
 LL | static B: &'static AtomicUsize = &A; //~ ERROR E0492
    |                                  ^^
diff --git a/src/test/ui/error-codes/E0496.rs b/src/test/ui/error-codes/E0496.rs
index 4ca3cd9c13d..b57c9c79eaa 100644
--- a/src/test/ui/error-codes/E0496.rs
+++ b/src/test/ui/error-codes/E0496.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Foo<'a> {
     a: &'a i32,
 }
diff --git a/src/test/ui/error-codes/E0496.stderr b/src/test/ui/error-codes/E0496.stderr
index 198daa512bd..515d71ba05e 100644
--- a/src/test/ui/error-codes/E0496.stderr
+++ b/src/test/ui/error-codes/E0496.stderr
@@ -1,5 +1,5 @@
 error[E0496]: lifetime name `'a` shadows a lifetime name that is already in scope
-  --> $DIR/E0496.rs:16:10
+  --> $DIR/E0496.rs:6:10
    |
 LL | impl<'a> Foo<'a> {
    |      -- first declared here
diff --git a/src/test/ui/error-codes/E0499.nll.stderr b/src/test/ui/error-codes/E0499.nll.stderr
index 39815ac6f17..c1acef10e6e 100644
--- a/src/test/ui/error-codes/E0499.nll.stderr
+++ b/src/test/ui/error-codes/E0499.nll.stderr
@@ -1,5 +1,5 @@
 error[E0499]: cannot borrow `i` as mutable more than once at a time
-  --> $DIR/E0499.rs:14:17
+  --> $DIR/E0499.rs:4:17
    |
 LL |     let mut x = &mut i;
    |                 ------ first mutable borrow occurs here
diff --git a/src/test/ui/error-codes/E0499.rs b/src/test/ui/error-codes/E0499.rs
index 9fb235eccdd..919f97c8a5c 100644
--- a/src/test/ui/error-codes/E0499.rs
+++ b/src/test/ui/error-codes/E0499.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     let mut i = 0;
     let mut x = &mut i;
diff --git a/src/test/ui/error-codes/E0499.stderr b/src/test/ui/error-codes/E0499.stderr
index 8f4fd445fc2..92157e4eba6 100644
--- a/src/test/ui/error-codes/E0499.stderr
+++ b/src/test/ui/error-codes/E0499.stderr
@@ -1,5 +1,5 @@
 error[E0499]: cannot borrow `i` as mutable more than once at a time
-  --> $DIR/E0499.rs:14:22
+  --> $DIR/E0499.rs:4:22
    |
 LL |     let mut x = &mut i;
    |                      - first mutable borrow occurs here
diff --git a/src/test/ui/error-codes/E0502.nll.stderr b/src/test/ui/error-codes/E0502.nll.stderr
index ce082710246..64ca8f0e6b9 100644
--- a/src/test/ui/error-codes/E0502.nll.stderr
+++ b/src/test/ui/error-codes/E0502.nll.stderr
@@ -1,5 +1,5 @@
 error[E0502]: cannot borrow `*a` as mutable because it is also borrowed as immutable
-  --> $DIR/E0502.rs:14:5
+  --> $DIR/E0502.rs:4:5
    |
 LL |     let ref y = a;
    |         ----- immutable borrow occurs here
diff --git a/src/test/ui/error-codes/E0502.rs b/src/test/ui/error-codes/E0502.rs
index 86d9c130d87..958380ece45 100644
--- a/src/test/ui/error-codes/E0502.rs
+++ b/src/test/ui/error-codes/E0502.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn bar(x: &mut i32) {}
 fn foo(a: &mut i32) {
     let ref y = a;
diff --git a/src/test/ui/error-codes/E0502.stderr b/src/test/ui/error-codes/E0502.stderr
index 8f0335c0662..9193886b009 100644
--- a/src/test/ui/error-codes/E0502.stderr
+++ b/src/test/ui/error-codes/E0502.stderr
@@ -1,5 +1,5 @@
 error[E0502]: cannot borrow `*a` as mutable because `a` is also borrowed as immutable
-  --> $DIR/E0502.rs:14:9
+  --> $DIR/E0502.rs:4:9
    |
 LL |     let ref y = a;
    |         ----- immutable borrow occurs here
diff --git a/src/test/ui/error-codes/E0503.nll.stderr b/src/test/ui/error-codes/E0503.nll.stderr
index 54e2bdacfa9..7b483a5eaa5 100644
--- a/src/test/ui/error-codes/E0503.nll.stderr
+++ b/src/test/ui/error-codes/E0503.nll.stderr
@@ -1,5 +1,5 @@
 error[E0503]: cannot use `value` because it was mutably borrowed
-  --> $DIR/E0503.rs:14:16
+  --> $DIR/E0503.rs:4:16
    |
 LL |     let _borrow = &mut value;
    |                   ---------- borrow of `value` occurs here
diff --git a/src/test/ui/error-codes/E0503.rs b/src/test/ui/error-codes/E0503.rs
index eacf5104145..88f5fc1bbcb 100644
--- a/src/test/ui/error-codes/E0503.rs
+++ b/src/test/ui/error-codes/E0503.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     let mut value = 3;
     let _borrow = &mut value;
diff --git a/src/test/ui/error-codes/E0503.stderr b/src/test/ui/error-codes/E0503.stderr
index 0342ebc4193..83391146b60 100644
--- a/src/test/ui/error-codes/E0503.stderr
+++ b/src/test/ui/error-codes/E0503.stderr
@@ -1,5 +1,5 @@
 error[E0503]: cannot use `value` because it was mutably borrowed
-  --> $DIR/E0503.rs:14:16
+  --> $DIR/E0503.rs:4:16
    |
 LL |     let _borrow = &mut value;
    |                        ----- borrow of `value` occurs here
diff --git a/src/test/ui/error-codes/E0504.nll.stderr b/src/test/ui/error-codes/E0504.nll.stderr
index 6f4823326ff..8d7387e86e5 100644
--- a/src/test/ui/error-codes/E0504.nll.stderr
+++ b/src/test/ui/error-codes/E0504.nll.stderr
@@ -1,5 +1,5 @@
 error[E0505]: cannot move out of `fancy_num` because it is borrowed
-  --> $DIR/E0504.rs:19:13
+  --> $DIR/E0504.rs:9:13
    |
 LL |     let fancy_ref = &fancy_num;
    |                     ---------- borrow of `fancy_num` occurs here
diff --git a/src/test/ui/error-codes/E0504.rs b/src/test/ui/error-codes/E0504.rs
index c594f241520..06ae0848b7c 100644
--- a/src/test/ui/error-codes/E0504.rs
+++ b/src/test/ui/error-codes/E0504.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct FancyNum {
     num: u8,
 }
diff --git a/src/test/ui/error-codes/E0504.stderr b/src/test/ui/error-codes/E0504.stderr
index cd1d3ec5ba4..7f4a611c5d5 100644
--- a/src/test/ui/error-codes/E0504.stderr
+++ b/src/test/ui/error-codes/E0504.stderr
@@ -1,5 +1,5 @@
 error[E0504]: cannot move `fancy_num` into closure because it is borrowed
-  --> $DIR/E0504.rs:20:40
+  --> $DIR/E0504.rs:10:40
    |
 LL |     let fancy_ref = &fancy_num;
    |                      --------- borrow of `fancy_num` occurs here
diff --git a/src/test/ui/error-codes/E0505.nll.stderr b/src/test/ui/error-codes/E0505.nll.stderr
index 94624cb9699..181e5e33d29 100644
--- a/src/test/ui/error-codes/E0505.nll.stderr
+++ b/src/test/ui/error-codes/E0505.nll.stderr
@@ -1,5 +1,5 @@
 error[E0505]: cannot move out of `x` because it is borrowed
-  --> $DIR/E0505.rs:19:13
+  --> $DIR/E0505.rs:9:13
    |
 LL |         let _ref_to_val: &Value = &x;
    |                                   -- borrow of `x` occurs here
diff --git a/src/test/ui/error-codes/E0505.rs b/src/test/ui/error-codes/E0505.rs
index 2ec4ac44b6e..941f5f2199d 100644
--- a/src/test/ui/error-codes/E0505.rs
+++ b/src/test/ui/error-codes/E0505.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Value {}
 
 fn eat(val: Value) {}
diff --git a/src/test/ui/error-codes/E0505.stderr b/src/test/ui/error-codes/E0505.stderr
index 64558ba8c7c..268eb880192 100644
--- a/src/test/ui/error-codes/E0505.stderr
+++ b/src/test/ui/error-codes/E0505.stderr
@@ -1,5 +1,5 @@
 error[E0505]: cannot move out of `x` because it is borrowed
-  --> $DIR/E0505.rs:19:13
+  --> $DIR/E0505.rs:9:13
    |
 LL |         let _ref_to_val: &Value = &x;
    |                                    - borrow of `x` occurs here
diff --git a/src/test/ui/error-codes/E0507.rs b/src/test/ui/error-codes/E0507.rs
index 87b1bf51bdb..bae90a44ce0 100644
--- a/src/test/ui/error-codes/E0507.rs
+++ b/src/test/ui/error-codes/E0507.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use std::cell::RefCell;
 
 struct TheDarkKnight;
diff --git a/src/test/ui/error-codes/E0507.stderr b/src/test/ui/error-codes/E0507.stderr
index 3d9d8a5145d..c24b8ecf61a 100644
--- a/src/test/ui/error-codes/E0507.stderr
+++ b/src/test/ui/error-codes/E0507.stderr
@@ -1,5 +1,5 @@
 error[E0507]: cannot move out of borrowed content
-  --> $DIR/E0507.rs:22:5
+  --> $DIR/E0507.rs:12:5
    |
 LL |     x.borrow().nothing_is_true(); //~ ERROR E0507
    |     ^^^^^^^^^^ cannot move out of borrowed content
diff --git a/src/test/ui/error-codes/E0509.nll.stderr b/src/test/ui/error-codes/E0509.nll.stderr
index 723b083b904..0233c7d6d16 100644
--- a/src/test/ui/error-codes/E0509.nll.stderr
+++ b/src/test/ui/error-codes/E0509.nll.stderr
@@ -1,5 +1,5 @@
 error[E0509]: cannot move out of type `DropStruct`, which implements the `Drop` trait
-  --> $DIR/E0509.rs:26:23
+  --> $DIR/E0509.rs:16:23
    |
 LL |     let fancy_field = drop_struct.fancy; //~ ERROR E0509
    |                       ^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0509.rs b/src/test/ui/error-codes/E0509.rs
index b92024cd6e2..b2665c4cc92 100644
--- a/src/test/ui/error-codes/E0509.rs
+++ b/src/test/ui/error-codes/E0509.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct FancyNum {
     num: usize
 }
diff --git a/src/test/ui/error-codes/E0509.stderr b/src/test/ui/error-codes/E0509.stderr
index 3952081a265..b1f256d2d9e 100644
--- a/src/test/ui/error-codes/E0509.stderr
+++ b/src/test/ui/error-codes/E0509.stderr
@@ -1,5 +1,5 @@
 error[E0509]: cannot move out of type `DropStruct`, which implements the `Drop` trait
-  --> $DIR/E0509.rs:26:23
+  --> $DIR/E0509.rs:16:23
    |
 LL |     let fancy_field = drop_struct.fancy; //~ ERROR E0509
    |                       ^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0511.rs b/src/test/ui/error-codes/E0511.rs
index c5c03f81825..3590f12e5f9 100644
--- a/src/test/ui/error-codes/E0511.rs
+++ b/src/test/ui/error-codes/E0511.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(platform_intrinsics)]
 
 extern "platform-intrinsic" {
diff --git a/src/test/ui/error-codes/E0511.stderr b/src/test/ui/error-codes/E0511.stderr
index 1b8d125cf1a..f1e3c0135bf 100644
--- a/src/test/ui/error-codes/E0511.stderr
+++ b/src/test/ui/error-codes/E0511.stderr
@@ -1,5 +1,5 @@
 error[E0511]: invalid monomorphization of `simd_add` intrinsic: expected SIMD input type, found non-SIMD `i32`
-  --> $DIR/E0511.rs:18:14
+  --> $DIR/E0511.rs:8:14
    |
 LL |     unsafe { simd_add(0, 1); } //~ ERROR E0511
    |              ^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0512.rs b/src/test/ui/error-codes/E0512.rs
index 25f96271641..e70992aee23 100644
--- a/src/test/ui/error-codes/E0512.rs
+++ b/src/test/ui/error-codes/E0512.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn takes_u8(_: u8) {}
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0512.stderr b/src/test/ui/error-codes/E0512.stderr
index c91f6ad8f0a..5b07afc2919 100644
--- a/src/test/ui/error-codes/E0512.stderr
+++ b/src/test/ui/error-codes/E0512.stderr
@@ -1,5 +1,5 @@
 error[E0512]: transmute called with types of different sizes
-  --> $DIR/E0512.rs:14:23
+  --> $DIR/E0512.rs:4:23
    |
 LL |     unsafe { takes_u8(::std::mem::transmute(0u16)); } //~ ERROR E0512
    |                       ^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0516.rs b/src/test/ui/error-codes/E0516.rs
index be2b89c5f39..834bb630989 100644
--- a/src/test/ui/error-codes/E0516.rs
+++ b/src/test/ui/error-codes/E0516.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     let x: typeof(92) = 92; //~ ERROR E0516
                             //~| reserved keyword
diff --git a/src/test/ui/error-codes/E0516.stderr b/src/test/ui/error-codes/E0516.stderr
index d298e288859..034c1793364 100644
--- a/src/test/ui/error-codes/E0516.stderr
+++ b/src/test/ui/error-codes/E0516.stderr
@@ -1,5 +1,5 @@
 error[E0516]: `typeof` is a reserved keyword but unimplemented
-  --> $DIR/E0516.rs:12:12
+  --> $DIR/E0516.rs:2:12
    |
 LL |     let x: typeof(92) = 92; //~ ERROR E0516
    |            ^^^^^^^^^^ reserved keyword
diff --git a/src/test/ui/error-codes/E0517.rs b/src/test/ui/error-codes/E0517.rs
index 561223ccdf1..1dcaa2d741f 100644
--- a/src/test/ui/error-codes/E0517.rs
+++ b/src/test/ui/error-codes/E0517.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[repr(C)] //~ ERROR: E0517
 type Foo = u8;
 
diff --git a/src/test/ui/error-codes/E0517.stderr b/src/test/ui/error-codes/E0517.stderr
index 4779fd08c68..366ab1bca63 100644
--- a/src/test/ui/error-codes/E0517.stderr
+++ b/src/test/ui/error-codes/E0517.stderr
@@ -1,5 +1,5 @@
 error[E0517]: attribute should be applied to struct, enum or union
-  --> $DIR/E0517.rs:11:8
+  --> $DIR/E0517.rs:1:8
    |
 LL | #[repr(C)] //~ ERROR: E0517
    |        ^
@@ -7,7 +7,7 @@ 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
+  --> $DIR/E0517.rs:4:8
    |
 LL | #[repr(packed)] //~ ERROR: E0517
    |        ^^^^^^
@@ -15,7 +15,7 @@ LL | enum Foo2 {Bar, Baz}
    | -------------------- not a struct or union
 
 error[E0517]: attribute should be applied to enum
-  --> $DIR/E0517.rs:17:8
+  --> $DIR/E0517.rs:7:8
    |
 LL | #[repr(u8)] //~ ERROR: E0517
    |        ^^
@@ -23,7 +23,7 @@ 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
+  --> $DIR/E0517.rs:10:8
    |
 LL |   #[repr(C)] //~ ERROR: E0517
    |          ^
diff --git a/src/test/ui/error-codes/E0518.rs b/src/test/ui/error-codes/E0518.rs
index 6d5b6e48e0d..9c99702ada8 100644
--- a/src/test/ui/error-codes/E0518.rs
+++ b/src/test/ui/error-codes/E0518.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[inline(always)] //~ ERROR: E0518
 struct Foo;
 
diff --git a/src/test/ui/error-codes/E0518.stderr b/src/test/ui/error-codes/E0518.stderr
index 27d5d3645fd..6391a69c24e 100644
--- a/src/test/ui/error-codes/E0518.stderr
+++ b/src/test/ui/error-codes/E0518.stderr
@@ -1,5 +1,5 @@
 error[E0518]: attribute should be applied to function or closure
-  --> $DIR/E0518.rs:11:1
+  --> $DIR/E0518.rs:1:1
    |
 LL | #[inline(always)] //~ ERROR: E0518
    | ^^^^^^^^^^^^^^^^^
@@ -7,7 +7,7 @@ LL | struct Foo;
    | ----------- not a function or closure
 
 error[E0518]: attribute should be applied to function or closure
-  --> $DIR/E0518.rs:14:1
+  --> $DIR/E0518.rs:4:1
    |
 LL |   #[inline(never)] //~ ERROR: E0518
    |   ^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0520.rs b/src/test/ui/error-codes/E0520.rs
index eae5b11a819..b746ca63590 100644
--- a/src/test/ui/error-codes/E0520.rs
+++ b/src/test/ui/error-codes/E0520.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(specialization)]
 
 trait SpaceLlama {
diff --git a/src/test/ui/error-codes/E0520.stderr b/src/test/ui/error-codes/E0520.stderr
index 67ec1d42715..72fc85ab1e7 100644
--- a/src/test/ui/error-codes/E0520.stderr
+++ b/src/test/ui/error-codes/E0520.stderr
@@ -1,5 +1,5 @@
 error[E0520]: `fly` specializes an item from a parent `impl`, but that item is not marked `default`
-  --> $DIR/E0520.rs:26:5
+  --> $DIR/E0520.rs:16:5
    |
 LL | / impl<T: Clone> SpaceLlama for T {
 LL | |     fn fly(&self) {}
diff --git a/src/test/ui/error-codes/E0522.rs b/src/test/ui/error-codes/E0522.rs
index c50cb759e05..1414e82408c 100644
--- a/src/test/ui/error-codes/E0522.rs
+++ b/src/test/ui/error-codes/E0522.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(lang_items)]
 
 #[lang = "cookie"]
diff --git a/src/test/ui/error-codes/E0522.stderr b/src/test/ui/error-codes/E0522.stderr
index 9f3f8968d73..0a8a41598da 100644
--- a/src/test/ui/error-codes/E0522.stderr
+++ b/src/test/ui/error-codes/E0522.stderr
@@ -1,5 +1,5 @@
 error[E0522]: definition of an unknown language item: `cookie`
-  --> $DIR/E0522.rs:13:1
+  --> $DIR/E0522.rs:3:1
    |
 LL | #[lang = "cookie"]
    | ^^^^^^^^^^^^^^^^^^ definition of unknown language item `cookie`
diff --git a/src/test/ui/error-codes/E0527.rs b/src/test/ui/error-codes/E0527.rs
index a90ccec9cf5..af055ff269e 100644
--- a/src/test/ui/error-codes/E0527.rs
+++ b/src/test/ui/error-codes/E0527.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     let r = &[1, 2, 3, 4];
     match r {
diff --git a/src/test/ui/error-codes/E0527.stderr b/src/test/ui/error-codes/E0527.stderr
index 1e764c18587..a2e6288b21b 100644
--- a/src/test/ui/error-codes/E0527.stderr
+++ b/src/test/ui/error-codes/E0527.stderr
@@ -1,5 +1,5 @@
 error[E0527]: pattern requires 2 elements but array has 4
-  --> $DIR/E0527.rs:14:10
+  --> $DIR/E0527.rs:4:10
    |
 LL |         &[a, b] => {
    |          ^^^^^^ expected 4 elements
diff --git a/src/test/ui/error-codes/E0528.rs b/src/test/ui/error-codes/E0528.rs
index e2aa2c067cb..f2681fa043d 100644
--- a/src/test/ui/error-codes/E0528.rs
+++ b/src/test/ui/error-codes/E0528.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(slice_patterns)]
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0528.stderr b/src/test/ui/error-codes/E0528.stderr
index ca9f8f45457..a7205af5054 100644
--- a/src/test/ui/error-codes/E0528.stderr
+++ b/src/test/ui/error-codes/E0528.stderr
@@ -1,5 +1,5 @@
 error[E0528]: pattern requires at least 3 elements but array has 2
-  --> $DIR/E0528.rs:16:10
+  --> $DIR/E0528.rs:6:10
    |
 LL |         &[a, b, c, rest..] => {
    |          ^^^^^^^^^^^^^^^^^ pattern cannot match array of 2 elements
diff --git a/src/test/ui/error-codes/E0529.rs b/src/test/ui/error-codes/E0529.rs
index 2459054da89..a82bc9ebcf4 100644
--- a/src/test/ui/error-codes/E0529.rs
+++ b/src/test/ui/error-codes/E0529.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     let r: f32 = 1.0;
     match r {
diff --git a/src/test/ui/error-codes/E0529.stderr b/src/test/ui/error-codes/E0529.stderr
index b2e7ae23fb0..96b22bb2263 100644
--- a/src/test/ui/error-codes/E0529.stderr
+++ b/src/test/ui/error-codes/E0529.stderr
@@ -1,5 +1,5 @@
 error[E0529]: expected an array or slice, found `f32`
-  --> $DIR/E0529.rs:14:9
+  --> $DIR/E0529.rs:4:9
    |
 LL |         [a, b] => {
    |         ^^^^^^ pattern cannot match with input type `f32`
diff --git a/src/test/ui/error-codes/E0530.rs b/src/test/ui/error-codes/E0530.rs
index 4f674d0e671..5bc40964f64 100644
--- a/src/test/ui/error-codes/E0530.rs
+++ b/src/test/ui/error-codes/E0530.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     static TEST: i32 = 0;
 
diff --git a/src/test/ui/error-codes/E0530.stderr b/src/test/ui/error-codes/E0530.stderr
index 96bc47a1afe..2ef80253eaf 100644
--- a/src/test/ui/error-codes/E0530.stderr
+++ b/src/test/ui/error-codes/E0530.stderr
@@ -1,5 +1,5 @@
 error[E0530]: match bindings cannot shadow statics
-  --> $DIR/E0530.rs:16:9
+  --> $DIR/E0530.rs:6:9
    |
 LL |     static TEST: i32 = 0;
    |     --------------------- the static `TEST` is defined here
diff --git a/src/test/ui/error-codes/E0532.rs b/src/test/ui/error-codes/E0532.rs
index 5dc3b5f94f3..931ca4628fe 100644
--- a/src/test/ui/error-codes/E0532.rs
+++ b/src/test/ui/error-codes/E0532.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     let value = 1;
 
diff --git a/src/test/ui/error-codes/E0532.stderr b/src/test/ui/error-codes/E0532.stderr
index faccd10ec6d..887ede0a412 100644
--- a/src/test/ui/error-codes/E0532.stderr
+++ b/src/test/ui/error-codes/E0532.stderr
@@ -1,5 +1,5 @@
 error[E0532]: expected tuple struct/variant, found constant `StructConst1`
-  --> $DIR/E0532.rs:15:9
+  --> $DIR/E0532.rs:5:9
    |
 LL |         StructConst1(_) => { },
    |         ^^^^^^^^^^^^ not a tuple struct/variant
diff --git a/src/test/ui/error-codes/E0534.rs b/src/test/ui/error-codes/E0534.rs
index fc465b26869..a4242499419 100644
--- a/src/test/ui/error-codes/E0534.rs
+++ b/src/test/ui/error-codes/E0534.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[inline()] //~ ERROR E0534
 pub fn something() {}
 
diff --git a/src/test/ui/error-codes/E0534.stderr b/src/test/ui/error-codes/E0534.stderr
index 30890882cc3..d2829e1643b 100644
--- a/src/test/ui/error-codes/E0534.stderr
+++ b/src/test/ui/error-codes/E0534.stderr
@@ -1,5 +1,5 @@
 error[E0534]: expected one argument
-  --> $DIR/E0534.rs:11:1
+  --> $DIR/E0534.rs:1:1
    |
 LL | #[inline()] //~ ERROR E0534
    | ^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0558.rs b/src/test/ui/error-codes/E0558.rs
index 64a6ee4cf58..26d16f685a0 100644
--- a/src/test/ui/error-codes/E0558.rs
+++ b/src/test/ui/error-codes/E0558.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[export_name]
 //~^ ERROR E0558
 
diff --git a/src/test/ui/error-codes/E0558.stderr b/src/test/ui/error-codes/E0558.stderr
index 0777c44058f..95bd9a1a828 100644
--- a/src/test/ui/error-codes/E0558.stderr
+++ b/src/test/ui/error-codes/E0558.stderr
@@ -1,5 +1,5 @@
 error[E0558]: `export_name` attribute has invalid format
-  --> $DIR/E0558.rs:11:1
+  --> $DIR/E0558.rs:1:1
    |
 LL | #[export_name]
    | ^^^^^^^^^^^^^^ did you mean #[export_name="*"]?
diff --git a/src/test/ui/error-codes/E0559.rs b/src/test/ui/error-codes/E0559.rs
index da0f692cc28..c6d04ff148a 100644
--- a/src/test/ui/error-codes/E0559.rs
+++ b/src/test/ui/error-codes/E0559.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 enum Field {
     Fool { x: u32 },
 }
diff --git a/src/test/ui/error-codes/E0559.stderr b/src/test/ui/error-codes/E0559.stderr
index cb9059ee538..63ee1cd7820 100644
--- a/src/test/ui/error-codes/E0559.stderr
+++ b/src/test/ui/error-codes/E0559.stderr
@@ -1,5 +1,5 @@
 error[E0559]: variant `Field::Fool` has no field named `joke`
-  --> $DIR/E0559.rs:16:27
+  --> $DIR/E0559.rs:6:27
    |
 LL |     let s = Field::Fool { joke: 0 };
    |                           ^^^^ `Field::Fool` does not have this field
diff --git a/src/test/ui/error-codes/E0560.rs b/src/test/ui/error-codes/E0560.rs
index bbb7f08d62e..1d60f8948ab 100644
--- a/src/test/ui/error-codes/E0560.rs
+++ b/src/test/ui/error-codes/E0560.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Simba {
     mother: u32,
 }
diff --git a/src/test/ui/error-codes/E0560.stderr b/src/test/ui/error-codes/E0560.stderr
index 66fb04111db..6b634f1855d 100644
--- a/src/test/ui/error-codes/E0560.stderr
+++ b/src/test/ui/error-codes/E0560.stderr
@@ -1,5 +1,5 @@
 error[E0560]: struct `Simba` has no field named `father`
-  --> $DIR/E0560.rs:16:32
+  --> $DIR/E0560.rs:6:32
    |
 LL |     let s = Simba { mother: 1, father: 0 };
    |                                ^^^^^^ `Simba` does not have this field
diff --git a/src/test/ui/error-codes/E0565-1.rs b/src/test/ui/error-codes/E0565-1.rs
index d7cbb823013..30fba019199 100644
--- a/src/test/ui/error-codes/E0565-1.rs
+++ b/src/test/ui/error-codes/E0565-1.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // deprecated doesn't currently support literals
 #[deprecated("since")] //~ ERROR E0565
 fn f() {  }
diff --git a/src/test/ui/error-codes/E0565-1.stderr b/src/test/ui/error-codes/E0565-1.stderr
index a2e099acd3c..c320918a3bf 100644
--- a/src/test/ui/error-codes/E0565-1.stderr
+++ b/src/test/ui/error-codes/E0565-1.stderr
@@ -1,5 +1,5 @@
 error[E0565]: item in `deprecated` must be a key/value pair
-  --> $DIR/E0565-1.rs:12:14
+  --> $DIR/E0565-1.rs:2:14
    |
 LL | #[deprecated("since")] //~ ERROR E0565
    |              ^^^^^^^
diff --git a/src/test/ui/error-codes/E0565-2.rs b/src/test/ui/error-codes/E0565-2.rs
index eb13e432751..0319ecb11f9 100644
--- a/src/test/ui/error-codes/E0565-2.rs
+++ b/src/test/ui/error-codes/E0565-2.rs
@@ -1,13 +1,3 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // repr currently doesn't support literals
 #[deprecated(since = b"1.29", note = "hi")] //~ ERROR E0565
 struct A {  }
diff --git a/src/test/ui/error-codes/E0565-2.stderr b/src/test/ui/error-codes/E0565-2.stderr
index 68093e4e2f0..8e2ce09059a 100644
--- a/src/test/ui/error-codes/E0565-2.stderr
+++ b/src/test/ui/error-codes/E0565-2.stderr
@@ -1,5 +1,5 @@
 error[E0565]: literal in `deprecated` value must be a string
-  --> $DIR/E0565-2.rs:12:22
+  --> $DIR/E0565-2.rs:2:22
    |
 LL | #[deprecated(since = b"1.29", note = "hi")] //~ ERROR E0565
    |                      ^^^^^^^ help: consider removing the prefix: `"1.29"`
diff --git a/src/test/ui/error-codes/E0565.rs b/src/test/ui/error-codes/E0565.rs
index af8b10edab8..b09f5df5201 100644
--- a/src/test/ui/error-codes/E0565.rs
+++ b/src/test/ui/error-codes/E0565.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // repr currently doesn't support literals
 #[repr("C")] //~ ERROR E0565
 struct A {  }
diff --git a/src/test/ui/error-codes/E0565.stderr b/src/test/ui/error-codes/E0565.stderr
index 04edff8ec69..2c172f81149 100644
--- a/src/test/ui/error-codes/E0565.stderr
+++ b/src/test/ui/error-codes/E0565.stderr
@@ -1,5 +1,5 @@
 error[E0565]: meta item in `repr` must be an identifier
-  --> $DIR/E0565.rs:12:8
+  --> $DIR/E0565.rs:2:8
    |
 LL | #[repr("C")] //~ ERROR E0565
    |        ^^^
diff --git a/src/test/ui/error-codes/E0572.rs b/src/test/ui/error-codes/E0572.rs
index bbaab102de7..cb842c9334d 100644
--- a/src/test/ui/error-codes/E0572.rs
+++ b/src/test/ui/error-codes/E0572.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 const FOO: u32 = return 0; //~ ERROR E0572
 
 fn main() {}
diff --git a/src/test/ui/error-codes/E0572.stderr b/src/test/ui/error-codes/E0572.stderr
index b2896c3892d..295a518c336 100644
--- a/src/test/ui/error-codes/E0572.stderr
+++ b/src/test/ui/error-codes/E0572.stderr
@@ -1,5 +1,5 @@
 error[E0572]: return statement outside of function body
-  --> $DIR/E0572.rs:11:18
+  --> $DIR/E0572.rs:1:18
    |
 LL | const FOO: u32 = return 0; //~ ERROR E0572
    |                  ^^^^^^^^
diff --git a/src/test/ui/error-codes/E0582.rs b/src/test/ui/error-codes/E0582.rs
index 5e6f65a18f4..ff25012d0f9 100644
--- a/src/test/ui/error-codes/E0582.rs
+++ b/src/test/ui/error-codes/E0582.rs
@@ -1,13 +1,3 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // This test was derived from the wasm and parsell crates.  They
 // stopped compiling when #32330 is fixed.
 
diff --git a/src/test/ui/error-codes/E0582.stderr b/src/test/ui/error-codes/E0582.stderr
index c92e0b9f137..81a2f004653 100644
--- a/src/test/ui/error-codes/E0582.stderr
+++ b/src/test/ui/error-codes/E0582.stderr
@@ -1,11 +1,11 @@
 error[E0582]: binding for associated type `Output` references lifetime `'a`, which does not appear in the trait input types
-  --> $DIR/E0582.rs:38:30
+  --> $DIR/E0582.rs:28:30
    |
 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
+  --> $DIR/E0582.rs:36:31
    |
 LL |     where F: for<'a> Iterator<Item=&'a i32>
    |                               ^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0585.rs b/src/test/ui/error-codes/E0585.rs
index 1acaf8c0b78..890b77b533a 100644
--- a/src/test/ui/error-codes/E0585.rs
+++ b/src/test/ui/error-codes/E0585.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     /// Hello! I'm useless...
     //~^ ERROR E0585
diff --git a/src/test/ui/error-codes/E0585.stderr b/src/test/ui/error-codes/E0585.stderr
index ef0825939c3..7a31c4896ee 100644
--- a/src/test/ui/error-codes/E0585.stderr
+++ b/src/test/ui/error-codes/E0585.stderr
@@ -1,5 +1,5 @@
 error[E0585]: found a documentation comment that doesn't document anything
-  --> $DIR/E0585.rs:12:5
+  --> $DIR/E0585.rs:2:5
    |
 LL |     /// Hello! I'm useless...
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0586.rs b/src/test/ui/error-codes/E0586.rs
index c1bfc5c73a1..2ab8a2959e3 100644
--- a/src/test/ui/error-codes/E0586.rs
+++ b/src/test/ui/error-codes/E0586.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     let tmp = vec![0, 1, 2, 3, 4, 4, 3, 3, 2, 1];
     let x = &tmp[1..=]; //~ ERROR E0586
diff --git a/src/test/ui/error-codes/E0586.stderr b/src/test/ui/error-codes/E0586.stderr
index bd72fbee160..394b4be3340 100644
--- a/src/test/ui/error-codes/E0586.stderr
+++ b/src/test/ui/error-codes/E0586.stderr
@@ -1,5 +1,5 @@
 error[E0586]: inclusive range with no end
-  --> $DIR/E0586.rs:13:22
+  --> $DIR/E0586.rs:3:22
    |
 LL |     let x = &tmp[1..=]; //~ ERROR E0586
    |                      ^
diff --git a/src/test/ui/error-codes/E0597.nll.stderr b/src/test/ui/error-codes/E0597.nll.stderr
index 54a46f612b9..88a8a46930d 100644
--- a/src/test/ui/error-codes/E0597.nll.stderr
+++ b/src/test/ui/error-codes/E0597.nll.stderr
@@ -1,5 +1,5 @@
 error[E0597]: `y` does not live long enough
-  --> $DIR/E0597.rs:18:16
+  --> $DIR/E0597.rs:8:16
    |
 LL |     x.x = Some(&y);
    |                ^^ borrowed value does not live long enough
diff --git a/src/test/ui/error-codes/E0597.rs b/src/test/ui/error-codes/E0597.rs
index e70213e19c3..7217e351281 100644
--- a/src/test/ui/error-codes/E0597.rs
+++ b/src/test/ui/error-codes/E0597.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Foo<'a> {
     x: Option<&'a u32>,
 }
diff --git a/src/test/ui/error-codes/E0597.stderr b/src/test/ui/error-codes/E0597.stderr
index 5897cc13c94..a5b0cc49d0c 100644
--- a/src/test/ui/error-codes/E0597.stderr
+++ b/src/test/ui/error-codes/E0597.stderr
@@ -1,5 +1,5 @@
 error[E0597]: `y` does not live long enough
-  --> $DIR/E0597.rs:18:17
+  --> $DIR/E0597.rs:8:17
    |
 LL |     x.x = Some(&y);
    |                 ^ borrowed value does not live long enough
diff --git a/src/test/ui/error-codes/E0599.rs b/src/test/ui/error-codes/E0599.rs
index 30fca2bac03..a2d7bb2dcbe 100644
--- a/src/test/ui/error-codes/E0599.rs
+++ b/src/test/ui/error-codes/E0599.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Foo;
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0599.stderr b/src/test/ui/error-codes/E0599.stderr
index d118939d17a..5a7cddbf382 100644
--- a/src/test/ui/error-codes/E0599.stderr
+++ b/src/test/ui/error-codes/E0599.stderr
@@ -1,5 +1,5 @@
 error[E0599]: no associated item named `NotEvenReal` found for type `Foo` in the current scope
-  --> $DIR/E0599.rs:14:15
+  --> $DIR/E0599.rs:4:15
    |
 LL | struct Foo;
    | ----------- associated item `NotEvenReal` not found for this
diff --git a/src/test/ui/error-codes/E0600.rs b/src/test/ui/error-codes/E0600.rs
index 5457ff26608..7731d861935 100644
--- a/src/test/ui/error-codes/E0600.rs
+++ b/src/test/ui/error-codes/E0600.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     !"a"; //~ ERROR E0600
 }
diff --git a/src/test/ui/error-codes/E0600.stderr b/src/test/ui/error-codes/E0600.stderr
index c29ec4fe6ae..6c6d922290f 100644
--- a/src/test/ui/error-codes/E0600.stderr
+++ b/src/test/ui/error-codes/E0600.stderr
@@ -1,5 +1,5 @@
 error[E0600]: cannot apply unary operator `!` to type `&'static str`
-  --> $DIR/E0600.rs:12:5
+  --> $DIR/E0600.rs:2:5
    |
 LL |     !"a"; //~ ERROR E0600
    |     ^^^^ cannot apply unary operator `!`
diff --git a/src/test/ui/error-codes/E0601.rs b/src/test/ui/error-codes/E0601.rs
index 37b3f523475..47feb7f8367 100644
--- a/src/test/ui/error-codes/E0601.rs
+++ b/src/test/ui/error-codes/E0601.rs
@@ -1,11 +1 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // Test for main function not found.
diff --git a/src/test/ui/error-codes/E0602.rs b/src/test/ui/error-codes/E0602.rs
index cc3e436d433..8fadce526d9 100644
--- a/src/test/ui/error-codes/E0602.rs
+++ b/src/test/ui/error-codes/E0602.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // compile-flags:-D bogus
 
 // error-pattern:E0602
diff --git a/src/test/ui/error-codes/E0603.rs b/src/test/ui/error-codes/E0603.rs
index 1cc9f6bfa7d..24a9ba88763 100644
--- a/src/test/ui/error-codes/E0603.rs
+++ b/src/test/ui/error-codes/E0603.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 mod SomeModule {
     const PRIVATE: u32 = 0x_a_bad_1dea_u32;
 }
diff --git a/src/test/ui/error-codes/E0603.stderr b/src/test/ui/error-codes/E0603.stderr
index 1159348d3db..ee8fd2809bc 100644
--- a/src/test/ui/error-codes/E0603.stderr
+++ b/src/test/ui/error-codes/E0603.stderr
@@ -1,5 +1,5 @@
 error[E0603]: constant `PRIVATE` is private
-  --> $DIR/E0603.rs:16:17
+  --> $DIR/E0603.rs:6:17
    |
 LL |     SomeModule::PRIVATE; //~ ERROR E0603
    |                 ^^^^^^^
diff --git a/src/test/ui/error-codes/E0604.rs b/src/test/ui/error-codes/E0604.rs
index c5bf3a77b6c..b9c0d1f924d 100644
--- a/src/test/ui/error-codes/E0604.rs
+++ b/src/test/ui/error-codes/E0604.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     1u32 as char; //~ ERROR E0604
 }
diff --git a/src/test/ui/error-codes/E0604.stderr b/src/test/ui/error-codes/E0604.stderr
index 6aa176d1313..2bd92db86e3 100644
--- a/src/test/ui/error-codes/E0604.stderr
+++ b/src/test/ui/error-codes/E0604.stderr
@@ -1,5 +1,5 @@
 error[E0604]: only `u8` can be cast as `char`, not `u32`
-  --> $DIR/E0604.rs:12:5
+  --> $DIR/E0604.rs:2:5
    |
 LL |     1u32 as char; //~ ERROR E0604
    |     ^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0605.rs b/src/test/ui/error-codes/E0605.rs
index 4b5b8beb368..0e86e367e83 100644
--- a/src/test/ui/error-codes/E0605.rs
+++ b/src/test/ui/error-codes/E0605.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     let x = 0u8;
     x as Vec<u8>; //~ ERROR E0605
diff --git a/src/test/ui/error-codes/E0605.stderr b/src/test/ui/error-codes/E0605.stderr
index e66e1c12d8f..4dc074b222a 100644
--- a/src/test/ui/error-codes/E0605.stderr
+++ b/src/test/ui/error-codes/E0605.stderr
@@ -1,5 +1,5 @@
 error[E0605]: non-primitive cast: `u8` as `std::vec::Vec<u8>`
-  --> $DIR/E0605.rs:13:5
+  --> $DIR/E0605.rs:3:5
    |
 LL |     x as Vec<u8>; //~ ERROR E0605
    |     ^^^^^^^^^^^^
@@ -7,7 +7,7 @@ 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
 
 error[E0605]: non-primitive cast: `*const u8` as `&u8`
-  --> $DIR/E0605.rs:16:5
+  --> $DIR/E0605.rs:6:5
    |
 LL |     v as &u8; //~ ERROR E0605
    |     ^^^^^^^^
diff --git a/src/test/ui/error-codes/E0606.rs b/src/test/ui/error-codes/E0606.rs
index 55071736bfe..cb0d8cfc31e 100644
--- a/src/test/ui/error-codes/E0606.rs
+++ b/src/test/ui/error-codes/E0606.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     &0u8 as u8; //~ ERROR E0606
 }
diff --git a/src/test/ui/error-codes/E0606.stderr b/src/test/ui/error-codes/E0606.stderr
index bd5bc908f72..bc872b3b79c 100644
--- a/src/test/ui/error-codes/E0606.stderr
+++ b/src/test/ui/error-codes/E0606.stderr
@@ -1,11 +1,11 @@
 error[E0606]: casting `&u8` as `u8` is invalid
-  --> $DIR/E0606.rs:12:5
+  --> $DIR/E0606.rs:2:5
    |
 LL |     &0u8 as u8; //~ ERROR E0606
    |     ^^^^^^^^^^ cannot cast `&u8` as `u8`
    |
 help: did you mean `*&0u8`?
-  --> $DIR/E0606.rs:12:5
+  --> $DIR/E0606.rs:2:5
    |
 LL |     &0u8 as u8; //~ ERROR E0606
    |     ^^^^
diff --git a/src/test/ui/error-codes/E0607.rs b/src/test/ui/error-codes/E0607.rs
index fa761f2c178..ad9f8709b07 100644
--- a/src/test/ui/error-codes/E0607.rs
+++ b/src/test/ui/error-codes/E0607.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     let v = 0 as *const u8;
     v as *const [u8]; //~ ERROR E0607
diff --git a/src/test/ui/error-codes/E0607.stderr b/src/test/ui/error-codes/E0607.stderr
index d109908bc74..1fbe4b9c5bc 100644
--- a/src/test/ui/error-codes/E0607.stderr
+++ b/src/test/ui/error-codes/E0607.stderr
@@ -1,5 +1,5 @@
 error[E0607]: cannot cast thin pointer `*const u8` to fat pointer `*const [u8]`
-  --> $DIR/E0607.rs:13:5
+  --> $DIR/E0607.rs:3:5
    |
 LL |     v as *const [u8]; //~ ERROR E0607
    |     ^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0608.rs b/src/test/ui/error-codes/E0608.rs
index d47356a97ee..1e342d6685f 100644
--- a/src/test/ui/error-codes/E0608.rs
+++ b/src/test/ui/error-codes/E0608.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     0u8[2]; //~ ERROR E0608
 }
diff --git a/src/test/ui/error-codes/E0608.stderr b/src/test/ui/error-codes/E0608.stderr
index d5955d1b070..b228b2eddfd 100644
--- a/src/test/ui/error-codes/E0608.stderr
+++ b/src/test/ui/error-codes/E0608.stderr
@@ -1,5 +1,5 @@
 error[E0608]: cannot index into a value of type `u8`
-  --> $DIR/E0608.rs:12:5
+  --> $DIR/E0608.rs:2:5
    |
 LL |     0u8[2]; //~ ERROR E0608
    |     ^^^^^^
diff --git a/src/test/ui/error-codes/E0609.rs b/src/test/ui/error-codes/E0609.rs
index ddfd9d5f21a..e3a97f2fb26 100644
--- a/src/test/ui/error-codes/E0609.rs
+++ b/src/test/ui/error-codes/E0609.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Foo {
     x: u32,
 }
diff --git a/src/test/ui/error-codes/E0609.stderr b/src/test/ui/error-codes/E0609.stderr
index dd793b29feb..b5cf09b2201 100644
--- a/src/test/ui/error-codes/E0609.stderr
+++ b/src/test/ui/error-codes/E0609.stderr
@@ -1,5 +1,5 @@
 error[E0609]: no field `foo` on type `Foo`
-  --> $DIR/E0609.rs:18:15
+  --> $DIR/E0609.rs:8:15
    |
 LL |     let _ = x.foo; //~ ERROR E0609
    |               ^^^ unknown field
@@ -7,7 +7,7 @@ LL |     let _ = x.foo; //~ ERROR E0609
    = note: available fields are: `x`
 
 error[E0609]: no field `1` on type `Bar`
-  --> $DIR/E0609.rs:21:7
+  --> $DIR/E0609.rs:11:7
    |
 LL |     y.1; //~ ERROR E0609
    |       ^ unknown field
diff --git a/src/test/ui/error-codes/E0610.rs b/src/test/ui/error-codes/E0610.rs
index 522d8b0b943..de246f3712e 100644
--- a/src/test/ui/error-codes/E0610.rs
+++ b/src/test/ui/error-codes/E0610.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     let x = 0;
     let _ = x.foo; //~ ERROR E0610
diff --git a/src/test/ui/error-codes/E0610.stderr b/src/test/ui/error-codes/E0610.stderr
index 3f1cda3b447..c46b1f2b2d5 100644
--- a/src/test/ui/error-codes/E0610.stderr
+++ b/src/test/ui/error-codes/E0610.stderr
@@ -1,5 +1,5 @@
 error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
-  --> $DIR/E0610.rs:13:15
+  --> $DIR/E0610.rs:3:15
    |
 LL |     let _ = x.foo; //~ ERROR E0610
    |               ^^^
diff --git a/src/test/ui/error-codes/E0614.rs b/src/test/ui/error-codes/E0614.rs
index 909f0eb8285..6b4817b692e 100644
--- a/src/test/ui/error-codes/E0614.rs
+++ b/src/test/ui/error-codes/E0614.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     let y = 0u32;
     *y; //~ ERROR E0614
diff --git a/src/test/ui/error-codes/E0614.stderr b/src/test/ui/error-codes/E0614.stderr
index 571d6e76776..5b1a4a93c4c 100644
--- a/src/test/ui/error-codes/E0614.stderr
+++ b/src/test/ui/error-codes/E0614.stderr
@@ -1,5 +1,5 @@
 error[E0614]: type `u32` cannot be dereferenced
-  --> $DIR/E0614.rs:13:5
+  --> $DIR/E0614.rs:3:5
    |
 LL |     *y; //~ ERROR E0614
    |     ^^
diff --git a/src/test/ui/error-codes/E0615.rs b/src/test/ui/error-codes/E0615.rs
index abfa93d2fd0..d04e4d5f7e1 100644
--- a/src/test/ui/error-codes/E0615.rs
+++ b/src/test/ui/error-codes/E0615.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Foo {
     x: u32,
 }
diff --git a/src/test/ui/error-codes/E0615.stderr b/src/test/ui/error-codes/E0615.stderr
index 88317a34ee3..423948666db 100644
--- a/src/test/ui/error-codes/E0615.stderr
+++ b/src/test/ui/error-codes/E0615.stderr
@@ -1,5 +1,5 @@
 error[E0615]: attempted to take value of method `method` on type `Foo`
-  --> $DIR/E0615.rs:21:7
+  --> $DIR/E0615.rs:11:7
    |
 LL |     f.method; //~ ERROR E0615
    |       ^^^^^^
diff --git a/src/test/ui/error-codes/E0616.rs b/src/test/ui/error-codes/E0616.rs
index 2fd9f94763d..98f87a83bc5 100644
--- a/src/test/ui/error-codes/E0616.rs
+++ b/src/test/ui/error-codes/E0616.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 mod a {
     pub struct Foo {
         x: u32,
diff --git a/src/test/ui/error-codes/E0616.stderr b/src/test/ui/error-codes/E0616.stderr
index 26525863c0d..f600bfa8cd3 100644
--- a/src/test/ui/error-codes/E0616.stderr
+++ b/src/test/ui/error-codes/E0616.stderr
@@ -1,5 +1,5 @@
 error[E0616]: field `x` of struct `a::Foo` is private
-  --> $DIR/E0616.rs:23:5
+  --> $DIR/E0616.rs:13:5
    |
 LL |     f.x; //~ ERROR E0616
    |     ^^^
diff --git a/src/test/ui/error-codes/E0617.rs b/src/test/ui/error-codes/E0617.rs
index 9375fd9cade..9eed1225ab8 100644
--- a/src/test/ui/error-codes/E0617.rs
+++ b/src/test/ui/error-codes/E0617.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // ignore-tidy-linelength
 
 extern {
diff --git a/src/test/ui/error-codes/E0617.stderr b/src/test/ui/error-codes/E0617.stderr
index 114220532c3..486ca1fa92f 100644
--- a/src/test/ui/error-codes/E0617.stderr
+++ b/src/test/ui/error-codes/E0617.stderr
@@ -1,35 +1,35 @@
 error[E0617]: can't pass `f32` to variadic function
-  --> $DIR/E0617.rs:19:36
+  --> $DIR/E0617.rs:9:36
    |
 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
+  --> $DIR/E0617.rs:12:36
    |
 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
+  --> $DIR/E0617.rs:15:36
    |
 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
+  --> $DIR/E0617.rs:18:36
    |
 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
+  --> $DIR/E0617.rs:21:36
    |
 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
+  --> $DIR/E0617.rs:24:36
    |
 LL |         printf(::std::ptr::null(), printf);
    |                                    ^^^^^^
diff --git a/src/test/ui/error-codes/E0618.rs b/src/test/ui/error-codes/E0618.rs
index f46bdb99801..2616e7134c5 100644
--- a/src/test/ui/error-codes/E0618.rs
+++ b/src/test/ui/error-codes/E0618.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 enum X {
     Entry,
 }
diff --git a/src/test/ui/error-codes/E0618.stderr b/src/test/ui/error-codes/E0618.stderr
index 3bcc83e01c1..b691f09ad7a 100644
--- a/src/test/ui/error-codes/E0618.stderr
+++ b/src/test/ui/error-codes/E0618.stderr
@@ -1,5 +1,5 @@
 error[E0618]: expected function, found enum variant `X::Entry`
-  --> $DIR/E0618.rs:16:5
+  --> $DIR/E0618.rs:6:5
    |
 LL |     Entry,
    |     ----- `X::Entry` defined here
@@ -14,7 +14,7 @@ LL |     X::Entry;
    |     ^^^^^^^^
 
 error[E0618]: expected function, found `i32`
-  --> $DIR/E0618.rs:19:5
+  --> $DIR/E0618.rs:9:5
    |
 LL |     let x = 0i32;
    |         - `i32` defined here
diff --git a/src/test/ui/error-codes/E0620.rs b/src/test/ui/error-codes/E0620.rs
index 5e945dfa5c8..2831413eab0 100644
--- a/src/test/ui/error-codes/E0620.rs
+++ b/src/test/ui/error-codes/E0620.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() {
     let _foo = &[1_usize, 2] as [usize]; //~ ERROR E0620
 }
diff --git a/src/test/ui/error-codes/E0620.stderr b/src/test/ui/error-codes/E0620.stderr
index f7450a33138..f7319a878c2 100644
--- a/src/test/ui/error-codes/E0620.stderr
+++ b/src/test/ui/error-codes/E0620.stderr
@@ -1,11 +1,11 @@
 error[E0620]: cast to unsized type: `&[usize; 2]` as `[usize]`
-  --> $DIR/E0620.rs:12:16
+  --> $DIR/E0620.rs:2:16
    |
 LL |     let _foo = &[1_usize, 2] as [usize]; //~ ERROR E0620
    |                ^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: consider using an implicit coercion to `&[usize]` instead
-  --> $DIR/E0620.rs:12:16
+  --> $DIR/E0620.rs:2:16
    |
 LL |     let _foo = &[1_usize, 2] as [usize]; //~ ERROR E0620
    |                ^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.rs b/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.rs
index 980461bedae..c58744d386c 100644
--- a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.rs
+++ b/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.rs
@@ -1,13 +1,3 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // Test that we give the generic E0495 when one of the free regions is
 // bound in a closure (rather than suggesting a change to the signature
 // of the closure, which is not specified in `foo` but rather in `invoke`).
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 58f0ede6308..f763c82eff8 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,26 +1,26 @@
 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
+  --> $DIR/E0621-does-not-trigger-for-closures.rs:15:5
    |
 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
+note: first, the lifetime cannot outlive the anonymous lifetime #2 defined on the body at 15:16...
+  --> $DIR/E0621-does-not-trigger-for-closures.rs:15:16
    |
 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
+  --> $DIR/E0621-does-not-trigger-for-closures.rs:15:45
    |
 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
+note: but, the lifetime must be valid for the call at 15:5...
+  --> $DIR/E0621-does-not-trigger-for-closures.rs:15:5
    |
 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
+  --> $DIR/E0621-does-not-trigger-for-closures.rs:15:5
    |
 LL |     invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0622.rs b/src/test/ui/error-codes/E0622.rs
index f2bde5b0364..ae7378a707e 100644
--- a/src/test/ui/error-codes/E0622.rs
+++ b/src/test/ui/error-codes/E0622.rs
@@ -1,13 +1,3 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(intrinsics)]
 extern "rust-intrinsic" {
     pub static breakpoint : unsafe extern "rust-intrinsic" fn();
diff --git a/src/test/ui/error-codes/E0622.stderr b/src/test/ui/error-codes/E0622.stderr
index ef13084dea0..8466dfe3848 100644
--- a/src/test/ui/error-codes/E0622.stderr
+++ b/src/test/ui/error-codes/E0622.stderr
@@ -1,5 +1,5 @@
 error[E0622]: intrinsic must be a function
-  --> $DIR/E0622.rs:13:5
+  --> $DIR/E0622.rs:3:5
    |
 LL |     pub static breakpoint : unsafe extern "rust-intrinsic" fn();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected a function
diff --git a/src/test/ui/error-codes/E0624.rs b/src/test/ui/error-codes/E0624.rs
index 952e0b31c4c..45f72a565ca 100644
--- a/src/test/ui/error-codes/E0624.rs
+++ b/src/test/ui/error-codes/E0624.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 mod inner {
     pub struct Foo;
 
diff --git a/src/test/ui/error-codes/E0624.stderr b/src/test/ui/error-codes/E0624.stderr
index ac911b9b7c0..31a2f607e58 100644
--- a/src/test/ui/error-codes/E0624.stderr
+++ b/src/test/ui/error-codes/E0624.stderr
@@ -1,5 +1,5 @@
 error[E0624]: method `method` is private
-  --> $DIR/E0624.rs:21:9
+  --> $DIR/E0624.rs:11:9
    |
 LL |     foo.method(); //~ ERROR method `method` is private [E0624]
    |         ^^^^^^
diff --git a/src/test/ui/error-codes/E0637.rs b/src/test/ui/error-codes/E0637.rs
index b4f769a749f..b4888d4af6a 100644
--- a/src/test/ui/error-codes/E0637.rs
+++ b/src/test/ui/error-codes/E0637.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Foo<'a: '_>(&'a u8); //~ ERROR cannot be used here
 fn foo<'a: '_>(_: &'a u8) {} //~ ERROR cannot be used here
 
diff --git a/src/test/ui/error-codes/E0637.stderr b/src/test/ui/error-codes/E0637.stderr
index 2a4545fc43d..f744520ef6e 100644
--- a/src/test/ui/error-codes/E0637.stderr
+++ b/src/test/ui/error-codes/E0637.stderr
@@ -1,17 +1,17 @@
 error[E0637]: `'_` cannot be used here
-  --> $DIR/E0637.rs:11:16
+  --> $DIR/E0637.rs:1:16
    |
 LL | struct Foo<'a: '_>(&'a u8); //~ ERROR cannot be used here
    |                ^^ `'_` is a reserved lifetime name
 
 error[E0637]: `'_` cannot be used here
-  --> $DIR/E0637.rs:12:12
+  --> $DIR/E0637.rs:2:12
    |
 LL | fn foo<'a: '_>(_: &'a u8) {} //~ ERROR cannot be used here
    |            ^^ `'_` is a reserved lifetime name
 
 error[E0637]: `'_` cannot be used here
-  --> $DIR/E0637.rs:15:10
+  --> $DIR/E0637.rs:5:10
    |
 LL | impl<'a: '_> Bar<'a> { //~ ERROR cannot be used here
    |          ^^ `'_` is a reserved lifetime name
diff --git a/src/test/ui/error-codes/E0646.rs b/src/test/ui/error-codes/E0646.rs
index 5fc711d9408..bb62428f53f 100644
--- a/src/test/ui/error-codes/E0646.rs
+++ b/src/test/ui/error-codes/E0646.rs
@@ -1,11 +1 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 fn main() where (): Copy {} //~ ERROR [E0646]
diff --git a/src/test/ui/error-codes/E0646.stderr b/src/test/ui/error-codes/E0646.stderr
index 7b2de775a10..502200c1d00 100644
--- a/src/test/ui/error-codes/E0646.stderr
+++ b/src/test/ui/error-codes/E0646.stderr
@@ -1,5 +1,5 @@
 error[E0646]: `main` function is not allowed to have a `where` clause
-  --> $DIR/E0646.rs:11:17
+  --> $DIR/E0646.rs:1:17
    |
 LL | fn main() where (): Copy {} //~ ERROR [E0646]
    |                 ^^^^^^^^ `main` cannot have a `where` clause
diff --git a/src/test/ui/error-codes/E0647.rs b/src/test/ui/error-codes/E0647.rs
index 0a0ffefdf95..fc085511cbc 100644
--- a/src/test/ui/error-codes/E0647.rs
+++ b/src/test/ui/error-codes/E0647.rs
@@ -1,13 +1,3 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![no_std]
 #![feature(start)]
 
diff --git a/src/test/ui/error-codes/E0647.stderr b/src/test/ui/error-codes/E0647.stderr
index afd37a7edf4..da9ba5bf34b 100644
--- a/src/test/ui/error-codes/E0647.stderr
+++ b/src/test/ui/error-codes/E0647.stderr
@@ -1,5 +1,5 @@
 error[E0647]: start function is not allowed to have a `where` clause
-  --> $DIR/E0647.rs:17:56
+  --> $DIR/E0647.rs:7:56
    |
 LL | fn start(_: isize, _: *const *const u8) -> isize where (): Copy { //~ ERROR [E0647]
    |                                                        ^^^^^^^^ start function cannot have a `where` clause
diff --git a/src/test/ui/error-codes/E0648.rs b/src/test/ui/error-codes/E0648.rs
index d3eac60de99..8408a78c7a6 100644
--- a/src/test/ui/error-codes/E0648.rs
+++ b/src/test/ui/error-codes/E0648.rs
@@ -1,13 +1,3 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[export_name="\0foo"] //~ ERROR E0648
 pub fn bar() {}
 
diff --git a/src/test/ui/error-codes/E0648.stderr b/src/test/ui/error-codes/E0648.stderr
index 1e11705e9b9..090157fb0d7 100644
--- a/src/test/ui/error-codes/E0648.stderr
+++ b/src/test/ui/error-codes/E0648.stderr
@@ -1,5 +1,5 @@
 error[E0648]: `export_name` may not contain null characters
-  --> $DIR/E0648.rs:11:1
+  --> $DIR/E0648.rs:1:1
    |
 LL | #[export_name="/0foo"] //~ ERROR E0648
    | ^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/error-codes/E0657.rs b/src/test/ui/error-codes/E0657.rs
index af91c9e2649..cb11de13f73 100644
--- a/src/test/ui/error-codes/E0657.rs
+++ b/src/test/ui/error-codes/E0657.rs
@@ -1,12 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
 #![allow(warnings)]
 
 trait Id<T> {}
diff --git a/src/test/ui/error-codes/E0657.stderr b/src/test/ui/error-codes/E0657.stderr
index 737ae3a163a..df76b45a589 100644
--- a/src/test/ui/error-codes/E0657.stderr
+++ b/src/test/ui/error-codes/E0657.stderr
@@ -1,11 +1,11 @@
 error[E0657]: `impl Trait` can only capture lifetimes bound at the fn or impl level
-  --> $DIR/E0657.rs:19:31
+  --> $DIR/E0657.rs:10:31
    |
 LL |     -> Box<for<'a> Id<impl Lt<'a>>>
    |                               ^^
 
 error[E0657]: `impl Trait` can only capture lifetimes bound at the fn or impl level
-  --> $DIR/E0657.rs:28:35
+  --> $DIR/E0657.rs:19:35
    |
 LL |         -> Box<for<'a> Id<impl Lt<'a>>>
    |                                   ^^
diff --git a/src/test/ui/error-codes/E0658.rs b/src/test/ui/error-codes/E0658.rs
index dcfa25e528a..9c9b95d70a7 100644
--- a/src/test/ui/error-codes/E0658.rs
+++ b/src/test/ui/error-codes/E0658.rs
@@ -1,13 +1,3 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[repr(u128)]
 enum Foo { //~ ERROR E0658
     Bar(u64),
diff --git a/src/test/ui/error-codes/E0658.stderr b/src/test/ui/error-codes/E0658.stderr
index b338b384a11..58802b23db3 100644
--- a/src/test/ui/error-codes/E0658.stderr
+++ b/src/test/ui/error-codes/E0658.stderr
@@ -1,5 +1,5 @@
 error[E0658]: repr with 128-bit type is unstable (see issue #35118)
-  --> $DIR/E0658.rs:12:1
+  --> $DIR/E0658.rs:2:1
    |
 LL | / enum Foo { //~ ERROR E0658
 LL | |     Bar(u64),
diff --git a/src/test/ui/error-codes/E0659.rs b/src/test/ui/error-codes/E0659.rs
index 4bd452b0aac..c00026bb7a7 100644
--- a/src/test/ui/error-codes/E0659.rs
+++ b/src/test/ui/error-codes/E0659.rs
@@ -1,13 +1,3 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 mod moon {
     pub fn foo() {}
 }
diff --git a/src/test/ui/error-codes/E0659.stderr b/src/test/ui/error-codes/E0659.stderr
index 7bfe159405b..b5aa1b21b09 100644
--- a/src/test/ui/error-codes/E0659.stderr
+++ b/src/test/ui/error-codes/E0659.stderr
@@ -1,17 +1,17 @@
 error[E0659]: `foo` is ambiguous (glob import vs glob import in the same module)
-  --> $DIR/E0659.rs:25:15
+  --> $DIR/E0659.rs:15:15
    |
 LL |     collider::foo(); //~ ERROR E0659
    |               ^^^ ambiguous name
    |
 note: `foo` could refer to the function imported here
-  --> $DIR/E0659.rs:20:13
+  --> $DIR/E0659.rs:10:13
    |
 LL |     pub use moon::*;
    |             ^^^^^^^
    = help: consider adding an explicit import of `foo` to disambiguate
 note: `foo` could also refer to the function imported here
-  --> $DIR/E0659.rs:21:13
+  --> $DIR/E0659.rs:11:13
    |
 LL |     pub use earth::*;
    |             ^^^^^^^^
diff --git a/src/test/ui/error-codes/E0718.rs b/src/test/ui/error-codes/E0718.rs
index 73678195492..82ab2d4af1b 100644
--- a/src/test/ui/error-codes/E0718.rs
+++ b/src/test/ui/error-codes/E0718.rs
@@ -1,13 +1,3 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(lang_items)]
 
 // Arc is expected to be a struct, so this will error.
diff --git a/src/test/ui/error-codes/E0718.stderr b/src/test/ui/error-codes/E0718.stderr
index 8544b07618b..4f9734d1acf 100644
--- a/src/test/ui/error-codes/E0718.stderr
+++ b/src/test/ui/error-codes/E0718.stderr
@@ -1,5 +1,5 @@
 error[E0718]: `arc` language item must be applied to a struct
-  --> $DIR/E0718.rs:14:1
+  --> $DIR/E0718.rs:4:1
    |
 LL | #[lang = "arc"] //~ ERROR language item must be applied to a struct
    | ^^^^^^^^^^^^^^^ attribute should be applied to a struct, not a static item
diff --git a/src/test/ui/error-codes/E0719.rs b/src/test/ui/error-codes/E0719.rs
index 895f9e04d88..6b572f49cee 100644
--- a/src/test/ui/error-codes/E0719.rs
+++ b/src/test/ui/error-codes/E0719.rs
@@ -1,13 +1,3 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 trait Foo: Iterator<Item = i32, Item = i32> {}
 //~^ ERROR is already specified
 
diff --git a/src/test/ui/error-codes/E0719.stderr b/src/test/ui/error-codes/E0719.stderr
index 0666e1ede3c..209bfbae07f 100644
--- a/src/test/ui/error-codes/E0719.stderr
+++ b/src/test/ui/error-codes/E0719.stderr
@@ -1,5 +1,5 @@
 error[E0719]: the value of the associated type `Item` (from the trait `std::iter::Iterator`) is already specified
-  --> $DIR/E0719.rs:11:33
+  --> $DIR/E0719.rs:1:33
    |
 LL | trait Foo: Iterator<Item = i32, Item = i32> {}
    |                     ----------  ^^^^^^^^^^ re-bound here
@@ -7,7 +7,7 @@ LL | trait Foo: Iterator<Item = i32, Item = i32> {}
    |                     `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from the trait `std::iter::Iterator`) is already specified
-  --> $DIR/E0719.rs:16:38
+  --> $DIR/E0719.rs:6:38
    |
 LL | fn test() -> Box<Iterator<Item = (), Item = Unit>> {
    |                           ---------  ^^^^^^^^^^^ re-bound here
diff --git a/src/test/ui/error-codes/ex-E0611.rs b/src/test/ui/error-codes/ex-E0611.rs
index 4e580242e64..8460341c44e 100644
--- a/src/test/ui/error-codes/ex-E0611.rs
+++ b/src/test/ui/error-codes/ex-E0611.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 mod a {
     pub struct Foo(u32);
 
diff --git a/src/test/ui/error-codes/ex-E0611.stderr b/src/test/ui/error-codes/ex-E0611.stderr
index 2f5066542db..f8c7cd8c146 100644
--- a/src/test/ui/error-codes/ex-E0611.stderr
+++ b/src/test/ui/error-codes/ex-E0611.stderr
@@ -1,5 +1,5 @@
 error[E0616]: field `0` of struct `a::Foo` is private
-  --> $DIR/ex-E0611.rs:21:4
+  --> $DIR/ex-E0611.rs:11:4
    |
 LL |    y.0; //~ ERROR field `0` of struct `a::Foo` is private
    |    ^^^
diff --git a/src/test/ui/error-codes/ex-E0612.rs b/src/test/ui/error-codes/ex-E0612.rs
index 46e26c87e5f..c8ea53ae9d8 100644
--- a/src/test/ui/error-codes/ex-E0612.rs
+++ b/src/test/ui/error-codes/ex-E0612.rs
@@ -1,13 +1,3 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 struct Foo(u32);
 
 fn main() {
diff --git a/src/test/ui/error-codes/ex-E0612.stderr b/src/test/ui/error-codes/ex-E0612.stderr
index a07efc939ab..e65e8bd8142 100644
--- a/src/test/ui/error-codes/ex-E0612.stderr
+++ b/src/test/ui/error-codes/ex-E0612.stderr
@@ -1,5 +1,5 @@
 error[E0609]: no field `1` on type `Foo`
-  --> $DIR/ex-E0612.rs:15:6
+  --> $DIR/ex-E0612.rs:5:6
    |
 LL |    y.1; //~ ERROR no field `1` on type `Foo`
    |      ^ did you mean `0`?