about summary refs log tree commit diff
path: root/src/test/ui/error-codes
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/ui/error-codes')
-rw-r--r--src/test/ui/error-codes/E0001.rs10
-rw-r--r--src/test/ui/error-codes/E0001.stderr14
-rw-r--r--src/test/ui/error-codes/E0004-2.rs5
-rw-r--r--src/test/ui/error-codes/E0004-2.stderr25
-rw-r--r--src/test/ui/error-codes/E0004.rs12
-rw-r--r--src/test/ui/error-codes/E0004.stderr23
-rw-r--r--src/test/ui/error-codes/E0005.rs4
-rw-r--r--src/test/ui/error-codes/E0005.stderr26
-rw-r--r--src/test/ui/error-codes/E0010-teach.rs8
-rw-r--r--src/test/ui/error-codes/E0010-teach.stderr11
-rw-r--r--src/test/ui/error-codes/E0010.rs6
-rw-r--r--src/test/ui/error-codes/E0010.stderr9
-rw-r--r--src/test/ui/error-codes/E0013.rs4
-rw-r--r--src/test/ui/error-codes/E0013.stderr11
-rw-r--r--src/test/ui/error-codes/E0015.rs8
-rw-r--r--src/test/ui/error-codes/E0015.stderr11
-rw-r--r--src/test/ui/error-codes/E0017.rs14
-rw-r--r--src/test/ui/error-codes/E0017.stderr72
-rw-r--r--src/test/ui/error-codes/E0023.rs17
-rw-r--r--src/test/ui/error-codes/E0023.stderr63
-rw-r--r--src/test/ui/error-codes/E0025.rs10
-rw-r--r--src/test/ui/error-codes/E0025.stderr11
-rw-r--r--src/test/ui/error-codes/E0026-teach.rs14
-rw-r--r--src/test/ui/error-codes/E0026-teach.stderr13
-rw-r--r--src/test/ui/error-codes/E0026.rs12
-rw-r--r--src/test/ui/error-codes/E0026.stderr9
-rw-r--r--src/test/ui/error-codes/E0027.rs24
-rw-r--r--src/test/ui/error-codes/E0027.stderr63
-rw-r--r--src/test/ui/error-codes/E0029-teach.rs11
-rw-r--r--src/test/ui/error-codes/E0029-teach.stderr14
-rw-r--r--src/test/ui/error-codes/E0029.rs9
-rw-r--r--src/test/ui/error-codes/E0029.stderr12
-rw-r--r--src/test/ui/error-codes/E0030-teach.rs9
-rw-r--r--src/test/ui/error-codes/E0030-teach.stderr17
-rw-r--r--src/test/ui/error-codes/E0030.rs7
-rw-r--r--src/test/ui/error-codes/E0030.stderr15
-rw-r--r--src/test/ui/error-codes/E0033-teach.rs14
-rw-r--r--src/test/ui/error-codes/E0033-teach.stderr13
-rw-r--r--src/test/ui/error-codes/E0033.rs13
-rw-r--r--src/test/ui/error-codes/E0033.stderr9
-rw-r--r--src/test/ui/error-codes/E0034.rs21
-rw-r--r--src/test/ui/error-codes/E0034.stderr28
-rw-r--r--src/test/ui/error-codes/E0038.rs11
-rw-r--r--src/test/ui/error-codes/E0038.stderr18
-rw-r--r--src/test/ui/error-codes/E0040.fixed18
-rw-r--r--src/test/ui/error-codes/E0040.rs18
-rw-r--r--src/test/ui/error-codes/E0040.stderr12
-rw-r--r--src/test/ui/error-codes/E0044.rs8
-rw-r--r--src/test/ui/error-codes/E0044.stderr11
-rw-r--r--src/test/ui/error-codes/E0045.rs4
-rw-r--r--src/test/ui/error-codes/E0045.stderr9
-rw-r--r--src/test/ui/error-codes/E0049.rs22
-rw-r--r--src/test/ui/error-codes/E0049.stderr23
-rw-r--r--src/test/ui/error-codes/E0050.rs16
-rw-r--r--src/test/ui/error-codes/E0050.stderr30
-rw-r--r--src/test/ui/error-codes/E0054.rs4
-rw-r--r--src/test/ui/error-codes/E0054.stderr9
-rw-r--r--src/test/ui/error-codes/E0055.rs13
-rw-r--r--src/test/ui/error-codes/E0055.stderr11
-rw-r--r--src/test/ui/error-codes/E0057.rs6
-rw-r--r--src/test/ui/error-codes/E0057.stderr35
-rw-r--r--src/test/ui/error-codes/E0059.rs6
-rw-r--r--src/test/ui/error-codes/E0059.stderr12
-rw-r--r--src/test/ui/error-codes/E0060.rs8
-rw-r--r--src/test/ui/error-codes/E0060.stderr19
-rw-r--r--src/test/ui/error-codes/E0061.rs11
-rw-r--r--src/test/ui/error-codes/E0061.stderr35
-rw-r--r--src/test/ui/error-codes/E0062.rs11
-rw-r--r--src/test/ui/error-codes/E0062.stderr11
-rw-r--r--src/test/ui/error-codes/E0063.rs38
-rw-r--r--src/test/ui/error-codes/E0063.stderr27
-rw-r--r--src/test/ui/error-codes/E0067.rs6
-rw-r--r--src/test/ui/error-codes/E0067.stderr20
-rw-r--r--src/test/ui/error-codes/E0069.rs7
-rw-r--r--src/test/ui/error-codes/E0069.stderr11
-rw-r--r--src/test/ui/error-codes/E0070.rs12
-rw-r--r--src/test/ui/error-codes/E0070.stderr27
-rw-r--r--src/test/ui/error-codes/E0071.rs7
-rw-r--r--src/test/ui/error-codes/E0071.stderr9
-rw-r--r--src/test/ui/error-codes/E0075.rs7
-rw-r--r--src/test/ui/error-codes/E0075.stderr9
-rw-r--r--src/test/ui/error-codes/E0076.rs8
-rw-r--r--src/test/ui/error-codes/E0076.stderr9
-rw-r--r--src/test/ui/error-codes/E0077.rs7
-rw-r--r--src/test/ui/error-codes/E0077.stderr9
-rw-r--r--src/test/ui/error-codes/E0080.rs8
-rw-r--r--src/test/ui/error-codes/E0080.stderr15
-rw-r--r--src/test/ui/error-codes/E0081.rs54
-rw-r--r--src/test/ui/error-codes/E0081.stderr78
-rw-r--r--src/test/ui/error-codes/E0084.rs5
-rw-r--r--src/test/ui/error-codes/E0084.stderr11
-rw-r--r--src/test/ui/error-codes/E0091.rs5
-rw-r--r--src/test/ui/error-codes/E0091.stderr15
-rw-r--r--src/test/ui/error-codes/E0092.rs7
-rw-r--r--src/test/ui/error-codes/E0092.stderr9
-rw-r--r--src/test/ui/error-codes/E0093.rs8
-rw-r--r--src/test/ui/error-codes/E0093.stderr9
-rw-r--r--src/test/ui/error-codes/E0094.rs9
-rw-r--r--src/test/ui/error-codes/E0094.stderr9
-rw-r--r--src/test/ui/error-codes/E0106.rs26
-rw-r--r--src/test/ui/error-codes/E0106.stderr66
-rw-r--r--src/test/ui/error-codes/E0107.rs60
-rw-r--r--src/test/ui/error-codes/E0107.stderr149
-rw-r--r--src/test/ui/error-codes/E0109.rs4
-rw-r--r--src/test/ui/error-codes/E0109.stderr17
-rw-r--r--src/test/ui/error-codes/E0110.rs3
-rw-r--r--src/test/ui/error-codes/E0110.stderr17
-rw-r--r--src/test/ui/error-codes/E0116.rs5
-rw-r--r--src/test/ui/error-codes/E0116.stderr11
-rw-r--r--src/test/ui/error-codes/E0117.rs4
-rw-r--r--src/test/ui/error-codes/E0117.stderr21
-rw-r--r--src/test/ui/error-codes/E0118.rs7
-rw-r--r--src/test/ui/error-codes/E0118.stderr11
-rw-r--r--src/test/ui/error-codes/E0119.rs18
-rw-r--r--src/test/ui/error-codes/E0119.stderr12
-rw-r--r--src/test/ui/error-codes/E0120.rs8
-rw-r--r--src/test/ui/error-codes/E0120.stderr9
-rw-r--r--src/test/ui/error-codes/E0121.rs5
-rw-r--r--src/test/ui/error-codes/E0121.stderr21
-rw-r--r--src/test/ui/error-codes/E0124.rs8
-rw-r--r--src/test/ui/error-codes/E0124.stderr11
-rw-r--r--src/test/ui/error-codes/E0128.rs7
-rw-r--r--src/test/ui/error-codes/E0128.stderr9
-rw-r--r--src/test/ui/error-codes/E0130.rs6
-rw-r--r--src/test/ui/error-codes/E0130.stderr9
-rw-r--r--src/test/ui/error-codes/E0131.rs3
-rw-r--r--src/test/ui/error-codes/E0131.stderr9
-rw-r--r--src/test/ui/error-codes/E0132.rs7
-rw-r--r--src/test/ui/error-codes/E0132.stderr9
-rw-r--r--src/test/ui/error-codes/E0133.mir.stderr11
-rw-r--r--src/test/ui/error-codes/E0133.rs9
-rw-r--r--src/test/ui/error-codes/E0133.thir.stderr11
-rw-r--r--src/test/ui/error-codes/E0138.rs8
-rw-r--r--src/test/ui/error-codes/E0138.stderr12
-rw-r--r--src/test/ui/error-codes/E0152.rs8
-rw-r--r--src/test/ui/error-codes/E0152.stderr13
-rw-r--r--src/test/ui/error-codes/E0161.base.stderr9
-rw-r--r--src/test/ui/error-codes/E0161.rs20
-rw-r--r--src/test/ui/error-codes/E0164.rs14
-rw-r--r--src/test/ui/error-codes/E0164.stderr9
-rw-r--r--src/test/ui/error-codes/E0184.rs10
-rw-r--r--src/test/ui/error-codes/E0184.stderr11
-rw-r--r--src/test/ui/error-codes/E0185.rs15
-rw-r--r--src/test/ui/error-codes/E0185.stderr12
-rw-r--r--src/test/ui/error-codes/E0186.rs13
-rw-r--r--src/test/ui/error-codes/E0186.stderr12
-rw-r--r--src/test/ui/error-codes/E0191.rs7
-rw-r--r--src/test/ui/error-codes/E0191.stderr12
-rw-r--r--src/test/ui/error-codes/E0194.rs8
-rw-r--r--src/test/ui/error-codes/E0194.stderr12
-rw-r--r--src/test/ui/error-codes/E0195.rs15
-rw-r--r--src/test/ui/error-codes/E0195.stderr12
-rw-r--r--src/test/ui/error-codes/E0197.rs6
-rw-r--r--src/test/ui/error-codes/E0197.stderr11
-rw-r--r--src/test/ui/error-codes/E0198.rs8
-rw-r--r--src/test/ui/error-codes/E0198.stderr12
-rw-r--r--src/test/ui/error-codes/E0199.rs9
-rw-r--r--src/test/ui/error-codes/E0199.stderr15
-rw-r--r--src/test/ui/error-codes/E0200.rs8
-rw-r--r--src/test/ui/error-codes/E0200.stderr15
-rw-r--r--src/test/ui/error-codes/E0201.rs22
-rw-r--r--src/test/ui/error-codes/E0201.stderr35
-rw-r--r--src/test/ui/error-codes/E0206.rs8
-rw-r--r--src/test/ui/error-codes/E0206.stderr9
-rw-r--r--src/test/ui/error-codes/E0207.rs10
-rw-r--r--src/test/ui/error-codes/E0207.stderr9
-rw-r--r--src/test/ui/error-codes/E0214.rs4
-rw-r--r--src/test/ui/error-codes/E0214.stderr14
-rw-r--r--src/test/ui/error-codes/E0220.rs8
-rw-r--r--src/test/ui/error-codes/E0220.stderr19
-rw-r--r--src/test/ui/error-codes/E0221.rs27
-rw-r--r--src/test/ui/error-codes/E0221.stderr39
-rw-r--r--src/test/ui/error-codes/E0223.rs6
-rw-r--r--src/test/ui/error-codes/E0223.stderr9
-rw-r--r--src/test/ui/error-codes/E0225.rs10
-rw-r--r--src/test/ui/error-codes/E0225.stderr31
-rw-r--r--src/test/ui/error-codes/E0227.rs12
-rw-r--r--src/test/ui/error-codes/E0227.stderr9
-rw-r--r--src/test/ui/error-codes/E0229.rs17
-rw-r--r--src/test/ui/error-codes/E0229.stderr9
-rw-r--r--src/test/ui/error-codes/E0252.rs15
-rw-r--r--src/test/ui/error-codes/E0252.stderr17
-rw-r--r--src/test/ui/error-codes/E0253.rs10
-rw-r--r--src/test/ui/error-codes/E0253.stderr9
-rw-r--r--src/test/ui/error-codes/E0254.rs14
-rw-r--r--src/test/ui/error-codes/E0254.stderr18
-rw-r--r--src/test/ui/error-codes/E0255.rs9
-rw-r--r--src/test/ui/error-codes/E0255.stderr18
-rw-r--r--src/test/ui/error-codes/E0259.rs8
-rw-r--r--src/test/ui/error-codes/E0259.stderr18
-rw-r--r--src/test/ui/error-codes/E0260.rs10
-rw-r--r--src/test/ui/error-codes/E0260.stderr18
-rw-r--r--src/test/ui/error-codes/E0261.rs9
-rw-r--r--src/test/ui/error-codes/E0261.stderr19
-rw-r--r--src/test/ui/error-codes/E0262.rs4
-rw-r--r--src/test/ui/error-codes/E0262.stderr9
-rw-r--r--src/test/ui/error-codes/E0263.rs5
-rw-r--r--src/test/ui/error-codes/E0263.stderr11
-rw-r--r--src/test/ui/error-codes/E0264.rs8
-rw-r--r--src/test/ui/error-codes/E0264.stderr9
-rw-r--r--src/test/ui/error-codes/E0267.rs3
-rw-r--r--src/test/ui/error-codes/E0267.stderr11
-rw-r--r--src/test/ui/error-codes/E0268.rs3
-rw-r--r--src/test/ui/error-codes/E0268.stderr9
-rw-r--r--src/test/ui/error-codes/E0271.rs11
-rw-r--r--src/test/ui/error-codes/E0271.stderr22
-rw-r--r--src/test/ui/error-codes/E0275.rs9
-rw-r--r--src/test/ui/error-codes/E0275.stderr19
-rw-r--r--src/test/ui/error-codes/E0276.rs10
-rw-r--r--src/test/ui/error-codes/E0276.stderr12
-rw-r--r--src/test/ui/error-codes/E0277-2.rs18
-rw-r--r--src/test/ui/error-codes/E0277-2.stderr31
-rw-r--r--src/test/ui/error-codes/E0277-3.rs8
-rw-r--r--src/test/ui/error-codes/E0277-3.stderr22
-rw-r--r--src/test/ui/error-codes/E0277.rs17
-rw-r--r--src/test/ui/error-codes/E0277.stderr31
-rw-r--r--src/test/ui/error-codes/E0282.rs4
-rw-r--r--src/test/ui/error-codes/E0282.stderr14
-rw-r--r--src/test/ui/error-codes/E0283.rs37
-rw-r--r--src/test/ui/error-codes/E0283.stderr37
-rw-r--r--src/test/ui/error-codes/E0297.rs6
-rw-r--r--src/test/ui/error-codes/E0297.stderr16
-rw-r--r--src/test/ui/error-codes/E0308-2.rs12
-rw-r--r--src/test/ui/error-codes/E0308-2.stderr18
-rw-r--r--src/test/ui/error-codes/E0308-4.rs7
-rw-r--r--src/test/ui/error-codes/E0308-4.stderr13
-rw-r--r--src/test/ui/error-codes/E0308.rs10
-rw-r--r--src/test/ui/error-codes/E0308.stderr12
-rw-r--r--src/test/ui/error-codes/E0311.rs9
-rw-r--r--src/test/ui/error-codes/E0311.stderr24
-rw-r--r--src/test/ui/error-codes/E0328.rs10
-rw-r--r--src/test/ui/error-codes/E0328.stderr9
-rw-r--r--src/test/ui/error-codes/E0365.rs8
-rw-r--r--src/test/ui/error-codes/E0365.stderr11
-rw-r--r--src/test/ui/error-codes/E0370.rs10
-rw-r--r--src/test/ui/error-codes/E0370.stderr11
-rw-r--r--src/test/ui/error-codes/E0374.rs11
-rw-r--r--src/test/ui/error-codes/E0374.stderr9
-rw-r--r--src/test/ui/error-codes/E0375.rs13
-rw-r--r--src/test/ui/error-codes/E0375.stderr12
-rw-r--r--src/test/ui/error-codes/E0376.rs10
-rw-r--r--src/test/ui/error-codes/E0376.stderr9
-rw-r--r--src/test/ui/error-codes/E0377.rs14
-rw-r--r--src/test/ui/error-codes/E0377.stderr9
-rw-r--r--src/test/ui/error-codes/E0388.rs13
-rw-r--r--src/test/ui/error-codes/E0388.stderr66
-rw-r--r--src/test/ui/error-codes/E0389.rs10
-rw-r--r--src/test/ui/error-codes/E0389.stderr14
-rw-r--r--src/test/ui/error-codes/E0390.rs10
-rw-r--r--src/test/ui/error-codes/E0390.stderr19
-rw-r--r--src/test/ui/error-codes/E0392.rs4
-rw-r--r--src/test/ui/error-codes/E0392.stderr12
-rw-r--r--src/test/ui/error-codes/E0393.rs7
-rw-r--r--src/test/ui/error-codes/E0393.stderr14
-rw-r--r--src/test/ui/error-codes/E0396-fixed.rs9
-rw-r--r--src/test/ui/error-codes/E0396-fixed.stderr9
-rw-r--r--src/test/ui/error-codes/E0396.rs18
-rw-r--r--src/test/ui/error-codes/E0396.stderr30
-rw-r--r--src/test/ui/error-codes/E0401.rs32
-rw-r--r--src/test/ui/error-codes/E0401.stderr70
-rw-r--r--src/test/ui/error-codes/E0403.rs4
-rw-r--r--src/test/ui/error-codes/E0403.stderr11
-rw-r--r--src/test/ui/error-codes/E0404.rs8
-rw-r--r--src/test/ui/error-codes/E0404.stderr15
-rw-r--r--src/test/ui/error-codes/E0405.rs6
-rw-r--r--src/test/ui/error-codes/E0405.stderr9
-rw-r--r--src/test/ui/error-codes/E0407.rs14
-rw-r--r--src/test/ui/error-codes/E0407.stderr12
-rw-r--r--src/test/ui/error-codes/E0408.rs8
-rw-r--r--src/test/ui/error-codes/E0408.stderr11
-rw-r--r--src/test/ui/error-codes/E0411.rs3
-rw-r--r--src/test/ui/error-codes/E0411.stderr11
-rw-r--r--src/test/ui/error-codes/E0412.rs4
-rw-r--r--src/test/ui/error-codes/E0412.stderr9
-rw-r--r--src/test/ui/error-codes/E0415.rs4
-rw-r--r--src/test/ui/error-codes/E0415.stderr9
-rw-r--r--src/test/ui/error-codes/E0416.rs5
-rw-r--r--src/test/ui/error-codes/E0416.stderr9
-rw-r--r--src/test/ui/error-codes/E0423.rs22
-rw-r--r--src/test/ui/error-codes/E0423.stderr63
-rw-r--r--src/test/ui/error-codes/E0424.rs21
-rw-r--r--src/test/ui/error-codes/E0424.stderr50
-rw-r--r--src/test/ui/error-codes/E0425.rs8
-rw-r--r--src/test/ui/error-codes/E0425.stderr9
-rw-r--r--src/test/ui/error-codes/E0426.rs6
-rw-r--r--src/test/ui/error-codes/E0426.stderr9
-rw-r--r--src/test/ui/error-codes/E0428.rs5
-rw-r--r--src/test/ui/error-codes/E0428.stderr13
-rw-r--r--src/test/ui/error-codes/E0429.rs4
-rw-r--r--src/test/ui/error-codes/E0429.stderr19
-rw-r--r--src/test/ui/error-codes/E0430.rs5
-rw-r--r--src/test/ui/error-codes/E0430.stderr22
-rw-r--r--src/test/ui/error-codes/E0431.rs4
-rw-r--r--src/test/ui/error-codes/E0431.stderr9
-rw-r--r--src/test/ui/error-codes/E0432.rs4
-rw-r--r--src/test/ui/error-codes/E0432.stderr11
-rw-r--r--src/test/ui/error-codes/E0433.rs3
-rw-r--r--src/test/ui/error-codes/E0433.stderr9
-rw-r--r--src/test/ui/error-codes/E0434.rs9
-rw-r--r--src/test/ui/error-codes/E0434.stderr11
-rw-r--r--src/test/ui/error-codes/E0435.fixed6
-rw-r--r--src/test/ui/error-codes/E0435.rs6
-rw-r--r--src/test/ui/error-codes/E0435.stderr11
-rw-r--r--src/test/ui/error-codes/E0437.rs8
-rw-r--r--src/test/ui/error-codes/E0437.stderr9
-rw-r--r--src/test/ui/error-codes/E0438.rs8
-rw-r--r--src/test/ui/error-codes/E0438.stderr9
-rw-r--r--src/test/ui/error-codes/E0445.rs12
-rw-r--r--src/test/ui/error-codes/E0445.stderr30
-rw-r--r--src/test/ui/error-codes/E0446.rs9
-rw-r--r--src/test/ui/error-codes/E0446.stderr12
-rw-r--r--src/test/ui/error-codes/E0449.rs14
-rw-r--r--src/test/ui/error-codes/E0449.stderr23
-rw-r--r--src/test/ui/error-codes/E0451.rs19
-rw-r--r--src/test/ui/error-codes/E0451.stderr15
-rw-r--r--src/test/ui/error-codes/E0452.rs6
-rw-r--r--src/test/ui/error-codes/E0452.stderr27
-rw-r--r--src/test/ui/error-codes/E0453.rs7
-rw-r--r--src/test/ui/error-codes/E0453.stderr21
-rw-r--r--src/test/ui/error-codes/E0454.rs5
-rw-r--r--src/test/ui/error-codes/E0454.stderr9
-rw-r--r--src/test/ui/error-codes/E0458.rs5
-rw-r--r--src/test/ui/error-codes/E0458.stderr16
-rw-r--r--src/test/ui/error-codes/E0459.rs4
-rw-r--r--src/test/ui/error-codes/E0459.stderr9
-rw-r--r--src/test/ui/error-codes/E0462.rs11
-rw-r--r--src/test/ui/error-codes/E0462.stderr13
-rw-r--r--src/test/ui/error-codes/E0463.rs7
-rw-r--r--src/test/ui/error-codes/E0463.stderr9
-rw-r--r--src/test/ui/error-codes/E0464.rs14
-rw-r--r--src/test/ui/error-codes/E0464.stderr13
-rw-r--r--src/test/ui/error-codes/E0478.rs8
-rw-r--r--src/test/ui/error-codes/E0478.stderr20
-rw-r--r--src/test/ui/error-codes/E0492.rs10
-rw-r--r--src/test/ui/error-codes/E0492.stderr17
-rw-r--r--src/test/ui/error-codes/E0496.rs11
-rw-r--r--src/test/ui/error-codes/E0496.stderr11
-rw-r--r--src/test/ui/error-codes/E0499.rs10
-rw-r--r--src/test/ui/error-codes/E0499.stderr14
-rw-r--r--src/test/ui/error-codes/E0501.rs24
-rw-r--r--src/test/ui/error-codes/E0501.stderr31
-rw-r--r--src/test/ui/error-codes/E0502.rs12
-rw-r--r--src/test/ui/error-codes/E0502.stderr13
-rw-r--r--src/test/ui/error-codes/E0503.rs9
-rw-r--r--src/test/ui/error-codes/E0503.stderr13
-rw-r--r--src/test/ui/error-codes/E0504.rs15
-rw-r--r--src/test/ui/error-codes/E0504.stderr17
-rw-r--r--src/test/ui/error-codes/E0505.rs15
-rw-r--r--src/test/ui/error-codes/E0505.stderr13
-rw-r--r--src/test/ui/error-codes/E0506.rs11
-rw-r--r--src/test/ui/error-codes/E0506.stderr14
-rw-r--r--src/test/ui/error-codes/E0507.rs13
-rw-r--r--src/test/ui/error-codes/E0507.stderr18
-rw-r--r--src/test/ui/error-codes/E0508-fail.rs6
-rw-r--r--src/test/ui/error-codes/E0508-fail.stderr17
-rw-r--r--src/test/ui/error-codes/E0508.rs6
-rw-r--r--src/test/ui/error-codes/E0508.stderr17
-rw-r--r--src/test/ui/error-codes/E0509.rs18
-rw-r--r--src/test/ui/error-codes/E0509.stderr17
-rw-r--r--src/test/ui/error-codes/E0511.rs11
-rw-r--r--src/test/ui/error-codes/E0511.stderr9
-rw-r--r--src/test/ui/error-codes/E0512.rs5
-rw-r--r--src/test/ui/error-codes/E0512.stderr12
-rw-r--r--src/test/ui/error-codes/E0516.rs4
-rw-r--r--src/test/ui/error-codes/E0516.stderr14
-rw-r--r--src/test/ui/error-codes/E0517.rs15
-rw-r--r--src/test/ui/error-codes/E0517.stderr36
-rw-r--r--src/test/ui/error-codes/E0518.rs9
-rw-r--r--src/test/ui/error-codes/E0518.stderr20
-rw-r--r--src/test/ui/error-codes/E0519.rs8
-rw-r--r--src/test/ui/error-codes/E0519.stderr9
-rw-r--r--src/test/ui/error-codes/E0520.rs22
-rw-r--r--src/test/ui/error-codes/E0520.stderr24
-rw-r--r--src/test/ui/error-codes/E0522.rs9
-rw-r--r--src/test/ui/error-codes/E0522.stderr9
-rw-r--r--src/test/ui/error-codes/E0527.rs9
-rw-r--r--src/test/ui/error-codes/E0527.stderr9
-rw-r--r--src/test/ui/error-codes/E0528.rs8
-rw-r--r--src/test/ui/error-codes/E0528.stderr9
-rw-r--r--src/test/ui/error-codes/E0529.rs8
-rw-r--r--src/test/ui/error-codes/E0529.stderr9
-rw-r--r--src/test/ui/error-codes/E0530.rs8
-rw-r--r--src/test/ui/error-codes/E0530.stderr12
-rw-r--r--src/test/ui/error-codes/E0532.rs14
-rw-r--r--src/test/ui/error-codes/E0532.stderr9
-rw-r--r--src/test/ui/error-codes/E0534.rs6
-rw-r--r--src/test/ui/error-codes/E0534.stderr9
-rw-r--r--src/test/ui/error-codes/E0559.rs8
-rw-r--r--src/test/ui/error-codes/E0559.stderr11
-rw-r--r--src/test/ui/error-codes/E0560.rs8
-rw-r--r--src/test/ui/error-codes/E0560.stderr11
-rw-r--r--src/test/ui/error-codes/E0565-1.rs5
-rw-r--r--src/test/ui/error-codes/E0565-1.stderr9
-rw-r--r--src/test/ui/error-codes/E0565-2.rs5
-rw-r--r--src/test/ui/error-codes/E0565-2.stderr11
-rw-r--r--src/test/ui/error-codes/E0565.rs5
-rw-r--r--src/test/ui/error-codes/E0565.stderr9
-rw-r--r--src/test/ui/error-codes/E0572.rs3
-rw-r--r--src/test/ui/error-codes/E0572.stderr9
-rw-r--r--src/test/ui/error-codes/E0582.rs42
-rw-r--r--src/test/ui/error-codes/E0582.stderr15
-rw-r--r--src/test/ui/error-codes/E0583.rs4
-rw-r--r--src/test/ui/error-codes/E0583.stderr11
-rw-r--r--src/test/ui/error-codes/E0585.rs4
-rw-r--r--src/test/ui/error-codes/E0585.stderr11
-rw-r--r--src/test/ui/error-codes/E0586.rs4
-rw-r--r--src/test/ui/error-codes/E0586.stderr11
-rw-r--r--src/test/ui/error-codes/E0594.rs5
-rw-r--r--src/test/ui/error-codes/E0594.stderr9
-rw-r--r--src/test/ui/error-codes/E0596.rs4
-rw-r--r--src/test/ui/error-codes/E0596.stderr14
-rw-r--r--src/test/ui/error-codes/E0597.rs12
-rw-r--r--src/test/ui/error-codes/E0597.stderr17
-rw-r--r--src/test/ui/error-codes/E0599.rs5
-rw-r--r--src/test/ui/error-codes/E0599.stderr12
-rw-r--r--src/test/ui/error-codes/E0600.rs3
-rw-r--r--src/test/ui/error-codes/E0600.stderr9
-rw-r--r--src/test/ui/error-codes/E0601.rs1
-rw-r--r--src/test/ui/error-codes/E0601.stderr9
-rw-r--r--src/test/ui/error-codes/E0602.rs6
-rw-r--r--src/test/ui/error-codes/E0602.stderr11
-rw-r--r--src/test/ui/error-codes/E0603.rs7
-rw-r--r--src/test/ui/error-codes/E0603.stderr15
-rw-r--r--src/test/ui/error-codes/E0604.rs3
-rw-r--r--src/test/ui/error-codes/E0604.stderr12
-rw-r--r--src/test/ui/error-codes/E0605.rs7
-rw-r--r--src/test/ui/error-codes/E0605.stderr21
-rw-r--r--src/test/ui/error-codes/E0606.rs3
-rw-r--r--src/test/ui/error-codes/E0606.stderr12
-rw-r--r--src/test/ui/error-codes/E0607.rs4
-rw-r--r--src/test/ui/error-codes/E0607.stderr9
-rw-r--r--src/test/ui/error-codes/E0608.rs3
-rw-r--r--src/test/ui/error-codes/E0608.stderr9
-rw-r--r--src/test/ui/error-codes/E0609.rs12
-rw-r--r--src/test/ui/error-codes/E0609.stderr17
-rw-r--r--src/test/ui/error-codes/E0610.rs4
-rw-r--r--src/test/ui/error-codes/E0610.stderr9
-rw-r--r--src/test/ui/error-codes/E0614.rs4
-rw-r--r--src/test/ui/error-codes/E0614.stderr9
-rw-r--r--src/test/ui/error-codes/E0615.rs12
-rw-r--r--src/test/ui/error-codes/E0615.stderr14
-rw-r--r--src/test/ui/error-codes/E0616.rs14
-rw-r--r--src/test/ui/error-codes/E0616.stderr9
-rw-r--r--src/test/ui/error-codes/E0617.rs26
-rw-r--r--src/test/ui/error-codes/E0617.stderr44
-rw-r--r--src/test/ui/error-codes/E0618.rs11
-rw-r--r--src/test/ui/error-codes/E0618.stderr30
-rw-r--r--src/test/ui/error-codes/E0620.rs3
-rw-r--r--src/test/ui/error-codes/E0620.stderr15
-rw-r--r--src/test/ui/error-codes/E0621-does-not-trigger-for-closures.rs16
-rw-r--r--src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr11
-rw-r--r--src/test/ui/error-codes/E0622.rs6
-rw-r--r--src/test/ui/error-codes/E0622.stderr9
-rw-r--r--src/test/ui/error-codes/E0624.rs12
-rw-r--r--src/test/ui/error-codes/E0624.stderr12
-rw-r--r--src/test/ui/error-codes/E0637.rs17
-rw-r--r--src/test/ui/error-codes/E0637.stderr34
-rw-r--r--src/test/ui/error-codes/E0642.fixed20
-rw-r--r--src/test/ui/error-codes/E0642.rs20
-rw-r--r--src/test/ui/error-codes/E0642.stderr36
-rw-r--r--src/test/ui/error-codes/E0646.rs1
-rw-r--r--src/test/ui/error-codes/E0646.stderr9
-rw-r--r--src/test/ui/error-codes/E0647.rs9
-rw-r--r--src/test/ui/error-codes/E0647.stderr9
-rw-r--r--src/test/ui/error-codes/E0648.rs4
-rw-r--r--src/test/ui/error-codes/E0648.stderr9
-rw-r--r--src/test/ui/error-codes/E0657.rs26
-rw-r--r--src/test/ui/error-codes/E0657.stderr15
-rw-r--r--src/test/ui/error-codes/E0658.rs6
-rw-r--r--src/test/ui/error-codes/E0658.stderr12
-rw-r--r--src/test/ui/error-codes/E0659.rs16
-rw-r--r--src/test/ui/error-codes/E0659.stderr23
-rw-r--r--src/test/ui/error-codes/E0705.rs10
-rw-r--r--src/test/ui/error-codes/E0705.stderr9
-rw-r--r--src/test/ui/error-codes/E0711.rs18
-rw-r--r--src/test/ui/error-codes/E0711.stderr15
-rw-r--r--src/test/ui/error-codes/E0718.rs7
-rw-r--r--src/test/ui/error-codes/E0718.stderr9
-rw-r--r--src/test/ui/error-codes/E0719.rs14
-rw-r--r--src/test/ui/error-codes/E0719.stderr19
-rw-r--r--src/test/ui/error-codes/E0730.rs8
-rw-r--r--src/test/ui/error-codes/E0730.stderr9
-rw-r--r--src/test/ui/error-codes/E0746.fixed18
-rw-r--r--src/test/ui/error-codes/E0746.rs18
-rw-r--r--src/test/ui/error-codes/E0746.stderr27
-rw-r--r--src/test/ui/error-codes/E0767.rs8
-rw-r--r--src/test/ui/error-codes/E0767.stderr27
-rw-r--r--src/test/ui/error-codes/E0771.rs8
-rw-r--r--src/test/ui/error-codes/E0771.stderr20
-rw-r--r--src/test/ui/error-codes/E0777.rs7
-rw-r--r--src/test/ui/error-codes/E0777.stderr21
-rw-r--r--src/test/ui/error-codes/E0778.rs4
-rw-r--r--src/test/ui/error-codes/E0778.stderr9
-rw-r--r--src/test/ui/error-codes/E0779.rs2
-rw-r--r--src/test/ui/error-codes/E0779.stderr9
-rw-r--r--src/test/ui/error-codes/E0790.rs53
-rw-r--r--src/test/ui/error-codes/E0790.stderr73
-rw-r--r--src/test/ui/error-codes/auxiliary/crateresolve1-1.rs6
-rw-r--r--src/test/ui/error-codes/auxiliary/crateresolve1-2.rs6
-rw-r--r--src/test/ui/error-codes/auxiliary/crateresolve1-3.rs6
-rw-r--r--src/test/ui/error-codes/auxiliary/found-staticlib.rs4
-rw-r--r--src/test/ui/error-codes/e0119/auxiliary/complex_impl_support.rs22
-rw-r--r--src/test/ui/error-codes/e0119/auxiliary/issue-23563-a.rs25
-rw-r--r--src/test/ui/error-codes/e0119/complex-impl.rs11
-rw-r--r--src/test/ui/error-codes/e0119/complex-impl.stderr14
-rw-r--r--src/test/ui/error-codes/e0119/conflict-with-std.rs26
-rw-r--r--src/test/ui/error-codes/e0119/conflict-with-std.stderr32
-rw-r--r--src/test/ui/error-codes/e0119/issue-23563.rs29
-rw-r--r--src/test/ui/error-codes/e0119/issue-23563.stderr13
-rw-r--r--src/test/ui/error-codes/e0119/issue-27403.rs11
-rw-r--r--src/test/ui/error-codes/e0119/issue-27403.stderr13
-rw-r--r--src/test/ui/error-codes/e0119/issue-28981.rs7
-rw-r--r--src/test/ui/error-codes/e0119/issue-28981.stderr12
-rw-r--r--src/test/ui/error-codes/e0119/so-37347311.rs17
-rw-r--r--src/test/ui/error-codes/e0119/so-37347311.stderr12
-rw-r--r--src/test/ui/error-codes/ex-E0611.rs12
-rw-r--r--src/test/ui/error-codes/ex-E0611.stderr9
-rw-r--r--src/test/ui/error-codes/ex-E0612.rs6
-rw-r--r--src/test/ui/error-codes/ex-E0612.stderr9
519 files changed, 0 insertions, 7197 deletions
diff --git a/src/test/ui/error-codes/E0001.rs b/src/test/ui/error-codes/E0001.rs
deleted file mode 100644
index 2c95f02bf34..00000000000
--- a/src/test/ui/error-codes/E0001.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#![deny(unreachable_patterns)]
-
-fn main() {
-    let foo = Some(1);
-    match foo {
-        Some(_) => {/* ... */}
-        None => {/* ... */}
-        _ => {/* ... */} //~ ERROR unreachable pattern
-    }
-}
diff --git a/src/test/ui/error-codes/E0001.stderr b/src/test/ui/error-codes/E0001.stderr
deleted file mode 100644
index 577c49032d7..00000000000
--- a/src/test/ui/error-codes/E0001.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error: unreachable pattern
-  --> $DIR/E0001.rs:8:9
-   |
-LL |         _ => {/* ... */}
-   |         ^
-   |
-note: the lint level is defined here
-  --> $DIR/E0001.rs:1:9
-   |
-LL | #![deny(unreachable_patterns)]
-   |         ^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/error-codes/E0004-2.rs b/src/test/ui/error-codes/E0004-2.rs
deleted file mode 100644
index c7612fd50a7..00000000000
--- a/src/test/ui/error-codes/E0004-2.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-fn main() {
-    let x = Some(1);
-
-    match x { } //~ ERROR E0004
-}
diff --git a/src/test/ui/error-codes/E0004-2.stderr b/src/test/ui/error-codes/E0004-2.stderr
deleted file mode 100644
index e829bac196f..00000000000
--- a/src/test/ui/error-codes/E0004-2.stderr
+++ /dev/null
@@ -1,25 +0,0 @@
-error[E0004]: non-exhaustive patterns: `None` and `Some(_)` not covered
-  --> $DIR/E0004-2.rs:4:11
-   |
-LL |     match x { }
-   |           ^ patterns `None` and `Some(_)` not covered
-   |
-note: `Option<i32>` defined here
-  --> $SRC_DIR/core/src/option.rs:LL:COL
-  ::: $SRC_DIR/core/src/option.rs:LL:COL
-   |
-   = note: not covered
-  ::: $SRC_DIR/core/src/option.rs:LL:COL
-   |
-   = note: not covered
-   = note: the matched value is of type `Option<i32>`
-help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern, a match arm with multiple or-patterns as shown, or multiple match arms
-   |
-LL ~     match x {
-LL +         None | Some(_) => todo!(),
-LL ~     }
-   |
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0004`.
diff --git a/src/test/ui/error-codes/E0004.rs b/src/test/ui/error-codes/E0004.rs
deleted file mode 100644
index 1ee9d2bad14..00000000000
--- a/src/test/ui/error-codes/E0004.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-enum Terminator {
-    HastaLaVistaBaby,
-    TalkToMyHand,
-}
-
-fn main() {
-    let x = Terminator::HastaLaVistaBaby;
-
-    match x { //~ ERROR E0004
-        Terminator::TalkToMyHand => {}
-    }
-}
diff --git a/src/test/ui/error-codes/E0004.stderr b/src/test/ui/error-codes/E0004.stderr
deleted file mode 100644
index 4ac8c904f05..00000000000
--- a/src/test/ui/error-codes/E0004.stderr
+++ /dev/null
@@ -1,23 +0,0 @@
-error[E0004]: non-exhaustive patterns: `Terminator::HastaLaVistaBaby` not covered
-  --> $DIR/E0004.rs:9:11
-   |
-LL |     match x {
-   |           ^ pattern `Terminator::HastaLaVistaBaby` not covered
-   |
-note: `Terminator` defined here
-  --> $DIR/E0004.rs:2:5
-   |
-LL | enum Terminator {
-   |      ----------
-LL |     HastaLaVistaBaby,
-   |     ^^^^^^^^^^^^^^^^ not covered
-   = note: the matched value is of type `Terminator`
-help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
-   |
-LL ~         Terminator::TalkToMyHand => {}
-LL +         Terminator::HastaLaVistaBaby => todo!()
-   |
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0004`.
diff --git a/src/test/ui/error-codes/E0005.rs b/src/test/ui/error-codes/E0005.rs
deleted file mode 100644
index f4730697e18..00000000000
--- a/src/test/ui/error-codes/E0005.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 0f179259356..00000000000
--- a/src/test/ui/error-codes/E0005.stderr
+++ /dev/null
@@ -1,26 +0,0 @@
-error[E0005]: refutable pattern in local binding: `None` not covered
-  --> $DIR/E0005.rs:3:9
-   |
-LL |     let Some(y) = x;
-   |         ^^^^^^^ pattern `None` not covered
-   |
-   = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
-   = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
-note: `Option<i32>` defined here
-  --> $SRC_DIR/core/src/option.rs:LL:COL
-  ::: $SRC_DIR/core/src/option.rs:LL:COL
-   |
-   = note: not covered
-   = note: the matched value is of type `Option<i32>`
-help: you might want to use `if let` to ignore the variant that isn't matched
-   |
-LL |     let y = if let Some(y) = x { y } else { todo!() };
-   |     ++++++++++                 ++++++++++++++++++++++
-help: alternatively, you might want to use let else to handle the variant that isn't matched
-   |
-LL |     let Some(y) = x else { todo!() };
-   |                     ++++++++++++++++
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0005`.
diff --git a/src/test/ui/error-codes/E0010-teach.rs b/src/test/ui/error-codes/E0010-teach.rs
deleted file mode 100644
index fc5dffb37cf..00000000000
--- a/src/test/ui/error-codes/E0010-teach.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// compile-flags: -Z teach
-
-#![feature(box_syntax)]
-#![allow(warnings)]
-
-const CON : Box<i32> = box 0; //~ ERROR E0010
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0010-teach.stderr b/src/test/ui/error-codes/E0010-teach.stderr
deleted file mode 100644
index 33de9fd685e..00000000000
--- a/src/test/ui/error-codes/E0010-teach.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0010]: allocations are not allowed in constants
-  --> $DIR/E0010-teach.rs:6:24
-   |
-LL | const CON : Box<i32> = box 0;
-   |                        ^^^^^ allocation not allowed in constants
-   |
-   = note: The value of statics and constants must be known at compile time, and they live for the entire lifetime of a program. Creating a boxed value allocates memory on the heap at runtime, and therefore cannot be done at compile time.
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0010`.
diff --git a/src/test/ui/error-codes/E0010.rs b/src/test/ui/error-codes/E0010.rs
deleted file mode 100644
index e62997640f4..00000000000
--- a/src/test/ui/error-codes/E0010.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#![feature(box_syntax)]
-#![allow(warnings)]
-
-const CON : Box<i32> = box 0; //~ ERROR E0010
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0010.stderr b/src/test/ui/error-codes/E0010.stderr
deleted file mode 100644
index 0042333b98a..00000000000
--- a/src/test/ui/error-codes/E0010.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0010]: allocations are not allowed in constants
-  --> $DIR/E0010.rs:4:24
-   |
-LL | const CON : Box<i32> = box 0;
-   |                        ^^^^^ allocation not allowed in constants
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0010`.
diff --git a/src/test/ui/error-codes/E0013.rs b/src/test/ui/error-codes/E0013.rs
deleted file mode 100644
index 9b3982a785b..00000000000
--- a/src/test/ui/error-codes/E0013.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-static X: i32 = 42;
-const Y: i32 = X; //~ ERROR constants cannot refer to statics [E0013]
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0013.stderr b/src/test/ui/error-codes/E0013.stderr
deleted file mode 100644
index dc22053a638..00000000000
--- a/src/test/ui/error-codes/E0013.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0013]: constants cannot refer to statics
-  --> $DIR/E0013.rs:2:16
-   |
-LL | const Y: i32 = X;
-   |                ^
-   |
-   = help: consider extracting the value of the `static` to a `const`, and referring to that
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0013`.
diff --git a/src/test/ui/error-codes/E0015.rs b/src/test/ui/error-codes/E0015.rs
deleted file mode 100644
index b0211358d81..00000000000
--- a/src/test/ui/error-codes/E0015.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-fn create_some() -> Option<u8> {
-    Some(1)
-}
-
-const FOO: Option<u8> = create_some();
-//~^ ERROR cannot call non-const fn `create_some` in constants [E0015]
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0015.stderr b/src/test/ui/error-codes/E0015.stderr
deleted file mode 100644
index ec1ce47b2ce..00000000000
--- a/src/test/ui/error-codes/E0015.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0015]: cannot call non-const fn `create_some` in constants
-  --> $DIR/E0015.rs:5:25
-   |
-LL | const FOO: Option<u8> = create_some();
-   |                         ^^^^^^^^^^^^^
-   |
-   = note: calls in constants are limited to constant functions, tuple structs and tuple variants
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0015`.
diff --git a/src/test/ui/error-codes/E0017.rs b/src/test/ui/error-codes/E0017.rs
deleted file mode 100644
index c211ad1a2f8..00000000000
--- a/src/test/ui/error-codes/E0017.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-static X: i32 = 1;
-const C: i32 = 2;
-static mut M: i32 = 3;
-
-const CR: &'static mut i32 = &mut C; //~ ERROR mutable references are not allowed
-                                     //~| WARN taking a mutable
-static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0658
-                                              //~| ERROR cannot borrow
-                                              //~| ERROR mutable references are not allowed
-
-static CONST_REF: &'static mut i32 = &mut C; //~ ERROR mutable references are not allowed
-                                              //~| WARN taking a mutable
-static STATIC_MUT_REF: &'static mut i32 = unsafe { &mut M }; //~ ERROR mutable references are not
-fn main() {}
diff --git a/src/test/ui/error-codes/E0017.stderr b/src/test/ui/error-codes/E0017.stderr
deleted file mode 100644
index 6e48f9582f1..00000000000
--- a/src/test/ui/error-codes/E0017.stderr
+++ /dev/null
@@ -1,72 +0,0 @@
-warning: taking a mutable reference to a `const` item
-  --> $DIR/E0017.rs:5:30
-   |
-LL | const CR: &'static mut i32 = &mut C;
-   |                              ^^^^^^
-   |
-   = note: each usage of a `const` item creates a new temporary
-   = note: the mutable reference will refer to this temporary, not the original `const` item
-note: `const` item defined here
-  --> $DIR/E0017.rs:2:1
-   |
-LL | const C: i32 = 2;
-   | ^^^^^^^^^^^^
-   = note: `#[warn(const_item_mutation)]` on by default
-
-error[E0764]: mutable references are not allowed in the final value of constants
-  --> $DIR/E0017.rs:5:30
-   |
-LL | const CR: &'static mut i32 = &mut C;
-   |                              ^^^^^^
-
-error[E0658]: mutation through a reference is not allowed in statics
-  --> $DIR/E0017.rs:7:39
-   |
-LL | static STATIC_REF: &'static mut i32 = &mut X;
-   |                                       ^^^^^^
-   |
-   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
-   = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
-
-error[E0764]: mutable references are not allowed in the final value of statics
-  --> $DIR/E0017.rs:7:39
-   |
-LL | static STATIC_REF: &'static mut i32 = &mut X;
-   |                                       ^^^^^^
-
-error[E0596]: cannot borrow immutable static item `X` as mutable
-  --> $DIR/E0017.rs:7:39
-   |
-LL | static STATIC_REF: &'static mut i32 = &mut X;
-   |                                       ^^^^^^ cannot borrow as mutable
-
-warning: taking a mutable reference to a `const` item
-  --> $DIR/E0017.rs:11:38
-   |
-LL | static CONST_REF: &'static mut i32 = &mut C;
-   |                                      ^^^^^^
-   |
-   = note: each usage of a `const` item creates a new temporary
-   = note: the mutable reference will refer to this temporary, not the original `const` item
-note: `const` item defined here
-  --> $DIR/E0017.rs:2:1
-   |
-LL | const C: i32 = 2;
-   | ^^^^^^^^^^^^
-
-error[E0764]: mutable references are not allowed in the final value of statics
-  --> $DIR/E0017.rs:11:38
-   |
-LL | static CONST_REF: &'static mut i32 = &mut C;
-   |                                      ^^^^^^
-
-error[E0764]: mutable references are not allowed in the final value of statics
-  --> $DIR/E0017.rs:13:52
-   |
-LL | static STATIC_MUT_REF: &'static mut i32 = unsafe { &mut M };
-   |                                                    ^^^^^^
-
-error: aborting due to 6 previous errors; 2 warnings emitted
-
-Some errors have detailed explanations: E0596, E0658, E0764.
-For more information about an error, try `rustc --explain E0596`.
diff --git a/src/test/ui/error-codes/E0023.rs b/src/test/ui/error-codes/E0023.rs
deleted file mode 100644
index 7ac22bb7109..00000000000
--- a/src/test/ui/error-codes/E0023.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-enum Fruit {
-    Apple(String, String),
-    Pear(u32),
-    Orange((String, String)),
-    Banana(()),
-}
-
-fn main() {
-    let x = Fruit::Apple(String::new(), String::new());
-    match x {
-        Fruit::Apple(a) => {}, //~ ERROR E0023
-        Fruit::Apple(a, b, c) => {}, //~ ERROR E0023
-        Fruit::Pear(1, 2) => {}, //~ ERROR E0023
-        Fruit::Orange(a, b) => {}, //~ ERROR E0023
-        Fruit::Banana() => {}, //~ ERROR E0023
-    }
-}
diff --git a/src/test/ui/error-codes/E0023.stderr b/src/test/ui/error-codes/E0023.stderr
deleted file mode 100644
index 3e321b037b2..00000000000
--- a/src/test/ui/error-codes/E0023.stderr
+++ /dev/null
@@ -1,63 +0,0 @@
-error[E0023]: this pattern has 1 field, but the corresponding tuple variant has 2 fields
-  --> $DIR/E0023.rs:11:22
-   |
-LL |     Apple(String, String),
-   |           ------  ------ tuple variant has 2 fields
-...
-LL |         Fruit::Apple(a) => {},
-   |                      ^ expected 2 fields, found 1
-   |
-help: use `_` to explicitly ignore each field
-   |
-LL |         Fruit::Apple(a, _) => {},
-   |                       +++
-
-error[E0023]: this pattern has 3 fields, but the corresponding tuple variant has 2 fields
-  --> $DIR/E0023.rs:12:22
-   |
-LL |     Apple(String, String),
-   |           ------  ------ tuple variant has 2 fields
-...
-LL |         Fruit::Apple(a, b, c) => {},
-   |                      ^  ^  ^ expected 2 fields, found 3
-
-error[E0023]: this pattern has 2 fields, but the corresponding tuple variant has 1 field
-  --> $DIR/E0023.rs:13:21
-   |
-LL |     Pear(u32),
-   |          --- tuple variant has 1 field
-...
-LL |         Fruit::Pear(1, 2) => {},
-   |                     ^  ^ expected 1 field, found 2
-
-error[E0023]: this pattern has 2 fields, but the corresponding tuple variant has 1 field
-  --> $DIR/E0023.rs:14:23
-   |
-LL |     Orange((String, String)),
-   |            ---------------- tuple variant has 1 field
-...
-LL |         Fruit::Orange(a, b) => {},
-   |                       ^  ^ expected 1 field, found 2
-   |
-help: missing parentheses
-   |
-LL |         Fruit::Orange((a, b)) => {},
-   |                       +    +
-
-error[E0023]: this pattern has 0 fields, but the corresponding tuple variant has 1 field
-  --> $DIR/E0023.rs:15:9
-   |
-LL |     Banana(()),
-   |            -- tuple variant has 1 field
-...
-LL |         Fruit::Banana() => {},
-   |         ^^^^^^^^^^^^^^^ expected 1 field, found 0
-   |
-help: missing parentheses
-   |
-LL |         Fruit::Banana(()) => {},
-   |                      +  +
-
-error: aborting due to 5 previous errors
-
-For more information about this error, try `rustc --explain E0023`.
diff --git a/src/test/ui/error-codes/E0025.rs b/src/test/ui/error-codes/E0025.rs
deleted file mode 100644
index 549269a7542..00000000000
--- a/src/test/ui/error-codes/E0025.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-struct Foo {
-    a: u8,
-    b: u8,
-}
-
-fn main() {
-    let x = Foo { a:1, b:2 };
-    let Foo { a: x, a: y, b: 0 } = x;
-    //~^ ERROR field `a` bound multiple times in the pattern
-}
diff --git a/src/test/ui/error-codes/E0025.stderr b/src/test/ui/error-codes/E0025.stderr
deleted file mode 100644
index dfec6d0276a..00000000000
--- a/src/test/ui/error-codes/E0025.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0025]: field `a` bound multiple times in the pattern
-  --> $DIR/E0025.rs:8:21
-   |
-LL |     let Foo { a: x, a: y, b: 0 } = x;
-   |               ----  ^^^^ multiple uses of `a` in pattern
-   |               |
-   |               first use of `a`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0025`.
diff --git a/src/test/ui/error-codes/E0026-teach.rs b/src/test/ui/error-codes/E0026-teach.rs
deleted file mode 100644
index 7c51004ffe4..00000000000
--- a/src/test/ui/error-codes/E0026-teach.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// compile-flags: -Z teach
-
-struct Thing {
-    x: u32,
-    y: u32
-}
-
-fn main() {
-    let thing = Thing { x: 0, y: 0 };
-    match thing {
-        Thing { x, y, z } => {}
-        //~^ ERROR struct `Thing` does not have a field named `z` [E0026]
-    }
-}
diff --git a/src/test/ui/error-codes/E0026-teach.stderr b/src/test/ui/error-codes/E0026-teach.stderr
deleted file mode 100644
index 1a80edcbbe2..00000000000
--- a/src/test/ui/error-codes/E0026-teach.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-error[E0026]: struct `Thing` does not have a field named `z`
-  --> $DIR/E0026-teach.rs:11:23
-   |
-LL |         Thing { x, y, z } => {}
-   |                       ^ struct `Thing` does not have this field
-   |
-   = note: This error indicates that a struct pattern attempted to extract a non-existent field from a struct. Struct fields are identified by the name used before the colon : so struct patterns should resemble the declaration of the struct type being matched.
-           
-           If you are using shorthand field patterns but want to refer to the struct field by a different name, you should rename it explicitly.
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0026`.
diff --git a/src/test/ui/error-codes/E0026.rs b/src/test/ui/error-codes/E0026.rs
deleted file mode 100644
index 0b1ea1c7bcd..00000000000
--- a/src/test/ui/error-codes/E0026.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-struct Thing {
-    x: u32,
-    y: u32
-}
-
-fn main() {
-    let thing = Thing { x: 0, y: 0 };
-    match thing {
-        Thing { x, y, z } => {}
-        //~^ ERROR struct `Thing` does not have a field named `z` [E0026]
-    }
-}
diff --git a/src/test/ui/error-codes/E0026.stderr b/src/test/ui/error-codes/E0026.stderr
deleted file mode 100644
index 031481812d0..00000000000
--- a/src/test/ui/error-codes/E0026.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0026]: struct `Thing` does not have a field named `z`
-  --> $DIR/E0026.rs:9:23
-   |
-LL |         Thing { x, y, z } => {}
-   |                       ^ struct `Thing` does not have this field
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0026`.
diff --git a/src/test/ui/error-codes/E0027.rs b/src/test/ui/error-codes/E0027.rs
deleted file mode 100644
index e7eca1ce5af..00000000000
--- a/src/test/ui/error-codes/E0027.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-struct Dog {
-    name: String,
-    age: u32,
-}
-
-
-fn main() {
-    let d = Dog { name: "Rusty".to_string(), age: 8 };
-
-    match d {
-        Dog { age: x } => {} //~ ERROR pattern does not mention field `name`
-    }
-    match d {
-        // trailing comma
-        Dog { name: x, } => {} //~ ERROR pattern does not mention field `age`
-    }
-    match d {
-        // trailing comma with weird whitespace
-        Dog { name: x  , } => {} //~ ERROR pattern does not mention field `age`
-    }
-    match d {
-        Dog {} => {} //~ ERROR pattern does not mention fields `name`, `age`
-    }
-}
diff --git a/src/test/ui/error-codes/E0027.stderr b/src/test/ui/error-codes/E0027.stderr
deleted file mode 100644
index 9ae97e4a994..00000000000
--- a/src/test/ui/error-codes/E0027.stderr
+++ /dev/null
@@ -1,63 +0,0 @@
-error[E0027]: pattern does not mention field `name`
-  --> $DIR/E0027.rs:11:9
-   |
-LL |         Dog { age: x } => {}
-   |         ^^^^^^^^^^^^^^ missing field `name`
-   |
-help: include the missing field in the pattern
-   |
-LL |         Dog { age: x, name } => {}
-   |                     ~~~~~~~~
-help: if you don't care about this missing field, you can explicitly ignore it
-   |
-LL |         Dog { age: x, .. } => {}
-   |                     ~~~~~~
-
-error[E0027]: pattern does not mention field `age`
-  --> $DIR/E0027.rs:15:9
-   |
-LL |         Dog { name: x, } => {}
-   |         ^^^^^^^^^^^^^^^^ missing field `age`
-   |
-help: include the missing field in the pattern
-   |
-LL |         Dog { name: x, age } => {}
-   |                      ~~~~~~~
-help: if you don't care about this missing field, you can explicitly ignore it
-   |
-LL |         Dog { name: x, .. } => {}
-   |                      ~~~~~~
-
-error[E0027]: pattern does not mention field `age`
-  --> $DIR/E0027.rs:19:9
-   |
-LL |         Dog { name: x  , } => {}
-   |         ^^^^^^^^^^^^^^^^^^ missing field `age`
-   |
-help: include the missing field in the pattern
-   |
-LL |         Dog { name: x, age } => {}
-   |                      ~~~~~~~
-help: if you don't care about this missing field, you can explicitly ignore it
-   |
-LL |         Dog { name: x, .. } => {}
-   |                      ~~~~~~
-
-error[E0027]: pattern does not mention fields `name`, `age`
-  --> $DIR/E0027.rs:22:9
-   |
-LL |         Dog {} => {}
-   |         ^^^^^^ missing fields `name`, `age`
-   |
-help: include the missing fields in the pattern
-   |
-LL |         Dog { name, age } => {}
-   |             ~~~~~~~~~~~~~
-help: if you don't care about these missing fields, you can explicitly ignore them
-   |
-LL |         Dog { .. } => {}
-   |             ~~~~~~
-
-error: aborting due to 4 previous errors
-
-For more information about this error, try `rustc --explain E0027`.
diff --git a/src/test/ui/error-codes/E0029-teach.rs b/src/test/ui/error-codes/E0029-teach.rs
deleted file mode 100644
index 3ff8cb348e7..00000000000
--- a/src/test/ui/error-codes/E0029-teach.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// compile-flags: -Z teach
-
-fn main() {
-    let s = "hoho";
-
-    match s {
-        "hello" ..= "world" => {}
-        //~^ ERROR only `char` and numeric types are allowed in range patterns
-        _ => {}
-    }
-}
diff --git a/src/test/ui/error-codes/E0029-teach.stderr b/src/test/ui/error-codes/E0029-teach.stderr
deleted file mode 100644
index b89b2e7d11e..00000000000
--- a/src/test/ui/error-codes/E0029-teach.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error[E0029]: only `char` and numeric types are allowed in range patterns
-  --> $DIR/E0029-teach.rs:7:9
-   |
-LL |         "hello" ..= "world" => {}
-   |         -------^^^^^-------
-   |         |           |
-   |         |           this is of type `&'static str` but it should be `char` or numeric
-   |         this is of type `&'static str` but it should be `char` or numeric
-   |
-   = note: In a match expression, only numbers and characters can be matched against a range. This is because the compiler checks that the range is non-empty at compile-time, and is unable to evaluate arbitrary comparison functions. If you want to capture values of an orderable type between two end-points, you can use a guard.
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0029`.
diff --git a/src/test/ui/error-codes/E0029.rs b/src/test/ui/error-codes/E0029.rs
deleted file mode 100644
index d9b53e113c0..00000000000
--- a/src/test/ui/error-codes/E0029.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-fn main() {
-    let s = "hoho";
-
-    match s {
-        "hello" ..= "world" => {}
-        //~^ ERROR only `char` and numeric types are allowed in range patterns
-        _ => {}
-    }
-}
diff --git a/src/test/ui/error-codes/E0029.stderr b/src/test/ui/error-codes/E0029.stderr
deleted file mode 100644
index f7250b39d3f..00000000000
--- a/src/test/ui/error-codes/E0029.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0029]: only `char` and numeric types are allowed in range patterns
-  --> $DIR/E0029.rs:5:9
-   |
-LL |         "hello" ..= "world" => {}
-   |         -------^^^^^-------
-   |         |           |
-   |         |           this is of type `&'static str` but it should be `char` or numeric
-   |         this is of type `&'static str` but it should be `char` or numeric
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0029`.
diff --git a/src/test/ui/error-codes/E0030-teach.rs b/src/test/ui/error-codes/E0030-teach.rs
deleted file mode 100644
index 8caa4f0931d..00000000000
--- a/src/test/ui/error-codes/E0030-teach.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// compile-flags: -Z teach
-
-fn main() {
-    match 5u32 {
-        1000 ..= 5 => {}
-        //~^ ERROR lower range bound must be less than or equal to upper
-        //~| ERROR lower range bound must be less than or equal to upper
-    }
-}
diff --git a/src/test/ui/error-codes/E0030-teach.stderr b/src/test/ui/error-codes/E0030-teach.stderr
deleted file mode 100644
index 800f66416a8..00000000000
--- a/src/test/ui/error-codes/E0030-teach.stderr
+++ /dev/null
@@ -1,17 +0,0 @@
-error[E0030]: lower range bound must be less than or equal to upper
-  --> $DIR/E0030-teach.rs:5:9
-   |
-LL |         1000 ..= 5 => {}
-   |         ^^^^ lower bound larger than upper bound
-   |
-   = note: When matching against a range, the compiler verifies that the range is non-empty. Range patterns include both end-points, so this is equivalent to requiring the start of the range to be less than or equal to the end of the range.
-
-error[E0030]: lower range bound must be less than or equal to upper
-  --> $DIR/E0030-teach.rs:5:9
-   |
-LL |         1000 ..= 5 => {}
-   |         ^^^^ lower bound larger than upper bound
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0030`.
diff --git a/src/test/ui/error-codes/E0030.rs b/src/test/ui/error-codes/E0030.rs
deleted file mode 100644
index a5d8f87261b..00000000000
--- a/src/test/ui/error-codes/E0030.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-fn main() {
-    match 5u32 {
-        1000 ..= 5 => {}
-        //~^ ERROR lower range bound must be less than or equal to upper
-        //~| ERROR lower range bound must be less than or equal to upper
-    }
-}
diff --git a/src/test/ui/error-codes/E0030.stderr b/src/test/ui/error-codes/E0030.stderr
deleted file mode 100644
index 8a6114024b6..00000000000
--- a/src/test/ui/error-codes/E0030.stderr
+++ /dev/null
@@ -1,15 +0,0 @@
-error[E0030]: lower range bound must be less than or equal to upper
-  --> $DIR/E0030.rs:3:9
-   |
-LL |         1000 ..= 5 => {}
-   |         ^^^^ lower bound larger than upper bound
-
-error[E0030]: lower range bound must be less than or equal to upper
-  --> $DIR/E0030.rs:3:9
-   |
-LL |         1000 ..= 5 => {}
-   |         ^^^^ lower bound larger than upper bound
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0030`.
diff --git a/src/test/ui/error-codes/E0033-teach.rs b/src/test/ui/error-codes/E0033-teach.rs
deleted file mode 100644
index 289561bad8a..00000000000
--- a/src/test/ui/error-codes/E0033-teach.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// compile-flags: -Z teach
-trait SomeTrait {
-    fn foo(&self);
-}
-struct S;
-impl SomeTrait for S {
-    fn foo(&self) {}
-}
-fn main() {
-    let trait_obj: &dyn SomeTrait = &S;
-
-    let &invalid = trait_obj;
-    //~^ ERROR E0033
-}
diff --git a/src/test/ui/error-codes/E0033-teach.stderr b/src/test/ui/error-codes/E0033-teach.stderr
deleted file mode 100644
index 31bc6719a56..00000000000
--- a/src/test/ui/error-codes/E0033-teach.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-error[E0033]: type `&dyn SomeTrait` cannot be dereferenced
-  --> $DIR/E0033-teach.rs:12:9
-   |
-LL |     let &invalid = trait_obj;
-   |         ^^^^^^^^ type `&dyn SomeTrait` cannot be dereferenced
-   |
-   = note: This error indicates that a pointer to a trait type cannot be implicitly dereferenced by a pattern. Every trait defines a type, but because the size of trait implementors isn't fixed, this type has no compile-time size. Therefore, all accesses to trait types must be through pointers. If you encounter this error you should try to avoid dereferencing the pointer.
-           
-           You can read more about trait objects in the Trait Objects section of the Reference: https://doc.rust-lang.org/reference/types.html#trait-objects
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0033`.
diff --git a/src/test/ui/error-codes/E0033.rs b/src/test/ui/error-codes/E0033.rs
deleted file mode 100644
index bd6ec207223..00000000000
--- a/src/test/ui/error-codes/E0033.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-trait SomeTrait {
-    fn foo(&self);
-}
-struct S;
-impl SomeTrait for S {
-    fn foo(&self) {}
-}
-fn main() {
-    let trait_obj: &dyn SomeTrait = &S;
-
-    let &invalid = trait_obj;
-    //~^ ERROR E0033
-}
diff --git a/src/test/ui/error-codes/E0033.stderr b/src/test/ui/error-codes/E0033.stderr
deleted file mode 100644
index ab2e780ee62..00000000000
--- a/src/test/ui/error-codes/E0033.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0033]: type `&dyn SomeTrait` cannot be dereferenced
-  --> $DIR/E0033.rs:11:9
-   |
-LL |     let &invalid = trait_obj;
-   |         ^^^^^^^^ type `&dyn SomeTrait` cannot be dereferenced
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0033`.
diff --git a/src/test/ui/error-codes/E0034.rs b/src/test/ui/error-codes/E0034.rs
deleted file mode 100644
index f962da115e0..00000000000
--- a/src/test/ui/error-codes/E0034.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-struct Test;
-
-trait Trait1 {
-    fn foo();
-}
-
-trait Trait2 {
-    fn foo();
-}
-
-impl Trait1 for Test {
-    fn foo() {}
-}
-
-impl Trait2 for Test {
-    fn foo() {}
-}
-
-fn main() {
-    Test::foo() //~ ERROR multiple applicable items in scope
-}
diff --git a/src/test/ui/error-codes/E0034.stderr b/src/test/ui/error-codes/E0034.stderr
deleted file mode 100644
index e2962170265..00000000000
--- a/src/test/ui/error-codes/E0034.stderr
+++ /dev/null
@@ -1,28 +0,0 @@
-error[E0034]: multiple applicable items in scope
-  --> $DIR/E0034.rs:20:11
-   |
-LL |     Test::foo()
-   |           ^^^ multiple `foo` found
-   |
-note: candidate #1 is defined in an impl of the trait `Trait1` for the type `Test`
-  --> $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:16:5
-   |
-LL |     fn foo() {}
-   |     ^^^^^^^^
-help: disambiguate the associated function for candidate #1
-   |
-LL |     <Test as Trait1>::foo()
-   |     ~~~~~~~~~~~~~~~~~~
-help: disambiguate the associated function for candidate #2
-   |
-LL |     <Test as Trait2>::foo()
-   |     ~~~~~~~~~~~~~~~~~~
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0034`.
diff --git a/src/test/ui/error-codes/E0038.rs b/src/test/ui/error-codes/E0038.rs
deleted file mode 100644
index 9757e2ab10c..00000000000
--- a/src/test/ui/error-codes/E0038.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-trait Trait {
-    fn foo(&self) -> Self;
-}
-
-fn call_foo(x: Box<dyn Trait>) {
-    //~^ ERROR E0038
-    let y = x.foo();
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0038.stderr b/src/test/ui/error-codes/E0038.stderr
deleted file mode 100644
index 3773d6f5234..00000000000
--- a/src/test/ui/error-codes/E0038.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error[E0038]: the trait `Trait` cannot be made into an object
-  --> $DIR/E0038.rs:5:20
-   |
-LL | fn call_foo(x: Box<dyn Trait>) {
-   |                    ^^^^^^^^^ `Trait` cannot be made into an object
-   |
-note: for a trait to be "object safe" it needs to allow building a vtable to allow the call to be resolvable dynamically; for more information visit <https://doc.rust-lang.org/reference/items/traits.html#object-safety>
-  --> $DIR/E0038.rs:2:22
-   |
-LL | trait Trait {
-   |       ----- this trait cannot be made into an object...
-LL |     fn foo(&self) -> Self;
-   |                      ^^^^ ...because method `foo` references the `Self` type in its return type
-   = help: consider moving `foo` to another trait
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0038`.
diff --git a/src/test/ui/error-codes/E0040.fixed b/src/test/ui/error-codes/E0040.fixed
deleted file mode 100644
index 139dc8f9496..00000000000
--- a/src/test/ui/error-codes/E0040.fixed
+++ /dev/null
@@ -1,18 +0,0 @@
-// run-rustfix
-struct Foo {
-    x: i32,
-}
-
-impl Drop for Foo {
-    fn drop(&mut self) {
-        println!("kaboom");
-    }
-}
-
-fn main() {
-    let mut x = Foo { x: -7 };
-    x.x = 0;
-    println!("{}", x.x);
-    drop(x);
-    //~^ ERROR E0040
-}
diff --git a/src/test/ui/error-codes/E0040.rs b/src/test/ui/error-codes/E0040.rs
deleted file mode 100644
index 9ffc42d0c78..00000000000
--- a/src/test/ui/error-codes/E0040.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// run-rustfix
-struct Foo {
-    x: i32,
-}
-
-impl Drop for Foo {
-    fn drop(&mut self) {
-        println!("kaboom");
-    }
-}
-
-fn main() {
-    let mut x = Foo { x: -7 };
-    x.x = 0;
-    println!("{}", x.x);
-    x.drop();
-    //~^ ERROR E0040
-}
diff --git a/src/test/ui/error-codes/E0040.stderr b/src/test/ui/error-codes/E0040.stderr
deleted file mode 100644
index 9fcda1a9385..00000000000
--- a/src/test/ui/error-codes/E0040.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0040]: explicit use of destructor method
-  --> $DIR/E0040.rs:16:7
-   |
-LL |     x.drop();
-   |     --^^^^--
-   |     | |
-   |     | explicit destructor calls not allowed
-   |     help: consider using `drop` function: `drop(x)`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0040`.
diff --git a/src/test/ui/error-codes/E0044.rs b/src/test/ui/error-codes/E0044.rs
deleted file mode 100644
index d9cdaf83c69..00000000000
--- a/src/test/ui/error-codes/E0044.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-extern "C" {
-    fn sqrt<T>(f: T) -> T;
-//~^ ERROR foreign items may not have type parameters [E0044]
-//~| HELP replace the type parameters with concrete types
-//~| NOTE can't have type parameters
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0044.stderr b/src/test/ui/error-codes/E0044.stderr
deleted file mode 100644
index e889c167b98..00000000000
--- a/src/test/ui/error-codes/E0044.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0044]: foreign items may not have type parameters
-  --> $DIR/E0044.rs:2:5
-   |
-LL |     fn sqrt<T>(f: T) -> T;
-   |     ^^^^^^^^^^^^^^^^^^^^^^ can't have type parameters
-   |
-   = help: replace the type parameters with concrete types like `u32`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0044`.
diff --git a/src/test/ui/error-codes/E0045.rs b/src/test/ui/error-codes/E0045.rs
deleted file mode 100644
index fb3df56f706..00000000000
--- a/src/test/ui/error-codes/E0045.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index fcc613b11b8..00000000000
--- a/src/test/ui/error-codes/E0045.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0045]: C-variadic function must have a compatible calling convention, like `C` or `cdecl`
-  --> $DIR/E0045.rs:1:17
-   |
-LL | extern "Rust" { fn foo(x: u8, ...); }
-   |                 ^^^^^^^^^^^^^^^^^^^ C-variadic function must have a compatible calling convention
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0045`.
diff --git a/src/test/ui/error-codes/E0049.rs b/src/test/ui/error-codes/E0049.rs
deleted file mode 100644
index 3dd910019bf..00000000000
--- a/src/test/ui/error-codes/E0049.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-trait Foo {
-    fn foo<T: Default>(x: T) -> Self;
-}
-
-struct Bar;
-
-impl Foo for Bar {
-    fn foo(x: bool) -> Self { Bar } //~ ERROR E0049
-}
-
-trait Fuzz {
-    fn fuzz<A: Default, B>(x: A, y: B) -> Self;
-}
-
-struct Baz;
-
-impl Fuzz for Baz {
-    fn fuzz(x: bool, y: bool) -> Self { Baz } //~ ERROR E0049
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0049.stderr b/src/test/ui/error-codes/E0049.stderr
deleted file mode 100644
index c0cd31faa90..00000000000
--- a/src/test/ui/error-codes/E0049.stderr
+++ /dev/null
@@ -1,23 +0,0 @@
-error[E0049]: method `foo` has 0 type parameters but its trait declaration has 1 type parameter
-  --> $DIR/E0049.rs:8:11
-   |
-LL |     fn foo<T: Default>(x: T) -> Self;
-   |            - expected 1 type parameter
-...
-LL |     fn foo(x: bool) -> Self { Bar }
-   |           ^ found 0 type parameters
-
-error[E0049]: method `fuzz` has 0 type parameters but its trait declaration has 2 type parameters
-  --> $DIR/E0049.rs:18:12
-   |
-LL |     fn fuzz<A: Default, B>(x: A, y: B) -> Self;
-   |             -           -
-   |             |
-   |             expected 2 type parameters
-...
-LL |     fn fuzz(x: bool, y: bool) -> Self { Baz }
-   |            ^ found 0 type parameters
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0049`.
diff --git a/src/test/ui/error-codes/E0050.rs b/src/test/ui/error-codes/E0050.rs
deleted file mode 100644
index 98fb62785ee..00000000000
--- a/src/test/ui/error-codes/E0050.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-trait Foo {
-    fn foo(&self, x: u8) -> bool;
-    fn bar(&self, x: u8, y: u8, z: u8);
-    fn less(&self);
-}
-
-struct Bar;
-
-impl Foo for Bar {
-    fn foo(&self) -> bool { true } //~ ERROR E0050
-    fn bar(&self) { } //~ ERROR E0050
-    fn less(&self, x: u8, y: u8, z: u8) { } //~ ERROR E0050
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0050.stderr b/src/test/ui/error-codes/E0050.stderr
deleted file mode 100644
index fe9ac5e8eb0..00000000000
--- a/src/test/ui/error-codes/E0050.stderr
+++ /dev/null
@@ -1,30 +0,0 @@
-error[E0050]: method `foo` has 1 parameter but the declaration in trait `Foo::foo` has 2
-  --> $DIR/E0050.rs:10:12
-   |
-LL |     fn foo(&self, x: u8) -> bool;
-   |            ------------ trait requires 2 parameters
-...
-LL |     fn foo(&self) -> bool { true }
-   |            ^^^^^ expected 2 parameters, found 1
-
-error[E0050]: method `bar` has 1 parameter but the declaration in trait `Foo::bar` has 4
-  --> $DIR/E0050.rs:11:12
-   |
-LL |     fn bar(&self, x: u8, y: u8, z: u8);
-   |            -------------------------- trait requires 4 parameters
-...
-LL |     fn bar(&self) { }
-   |            ^^^^^ expected 4 parameters, found 1
-
-error[E0050]: method `less` has 4 parameters but the declaration in trait `Foo::less` has 1
-  --> $DIR/E0050.rs:12:13
-   |
-LL |     fn less(&self);
-   |             ----- trait requires 1 parameter
-...
-LL |     fn less(&self, x: u8, y: u8, z: u8) { }
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected 1 parameter, found 4
-
-error: aborting due to 3 previous errors
-
-For more information about this error, try `rustc --explain E0050`.
diff --git a/src/test/ui/error-codes/E0054.rs b/src/test/ui/error-codes/E0054.rs
deleted file mode 100644
index 55bda4ead96..00000000000
--- a/src/test/ui/error-codes/E0054.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 6b1092760fb..00000000000
--- a/src/test/ui/error-codes/E0054.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0054]: cannot cast as `bool`
-  --> $DIR/E0054.rs:3:24
-   |
-LL |     let x_is_nonzero = x as bool;
-   |                        ^^^^^^^^^ help: compare with zero instead: `x != 0`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0054`.
diff --git a/src/test/ui/error-codes/E0055.rs b/src/test/ui/error-codes/E0055.rs
deleted file mode 100644
index fd5804bbc2a..00000000000
--- a/src/test/ui/error-codes/E0055.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-#![recursion_limit="4"]
-struct Foo;
-
-impl Foo {
-    fn foo(&self) {}
-}
-
-fn main() {
-    let foo = Foo;
-    let ref_foo = &&&&&Foo;
-    ref_foo.foo();
-    //~^ ERROR E0055
-}
diff --git a/src/test/ui/error-codes/E0055.stderr b/src/test/ui/error-codes/E0055.stderr
deleted file mode 100644
index a52c9096235..00000000000
--- a/src/test/ui/error-codes/E0055.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0055]: reached the recursion limit while auto-dereferencing `Foo`
-  --> $DIR/E0055.rs:11:13
-   |
-LL |     ref_foo.foo();
-   |             ^^^ deref recursion limit reached
-   |
-   = help: consider increasing the recursion limit by adding a `#![recursion_limit = "8"]` attribute to your crate (`E0055`)
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0055`.
diff --git a/src/test/ui/error-codes/E0057.rs b/src/test/ui/error-codes/E0057.rs
deleted file mode 100644
index 83f941f65b9..00000000000
--- a/src/test/ui/error-codes/E0057.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-fn main() {
-    let f = |x| x * 3;
-    let a = f(); //~ ERROR E0057
-    let b = f(4);
-    let c = f(2, 3); //~ ERROR E0057
-}
diff --git a/src/test/ui/error-codes/E0057.stderr b/src/test/ui/error-codes/E0057.stderr
deleted file mode 100644
index 163737895fe..00000000000
--- a/src/test/ui/error-codes/E0057.stderr
+++ /dev/null
@@ -1,35 +0,0 @@
-error[E0057]: this function takes 1 argument but 0 arguments were supplied
-  --> $DIR/E0057.rs:3:13
-   |
-LL |     let a = f();
-   |             ^-- an argument is missing
-   |
-note: closure defined here
-  --> $DIR/E0057.rs:2:13
-   |
-LL |     let f = |x| x * 3;
-   |             ^^^
-help: provide the argument
-   |
-LL |     let a = f(/* x */);
-   |              ~~~~~~~~~
-
-error[E0057]: this function takes 1 argument but 2 arguments were supplied
-  --> $DIR/E0057.rs:5:13
-   |
-LL |     let c = f(2, 3);
-   |             ^    - argument of type `{integer}` unexpected
-   |
-note: closure defined here
-  --> $DIR/E0057.rs:2:13
-   |
-LL |     let f = |x| x * 3;
-   |             ^^^
-help: remove the extra argument
-   |
-LL |     let c = f(2);
-   |              ~~~
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0057`.
diff --git a/src/test/ui/error-codes/E0059.rs b/src/test/ui/error-codes/E0059.rs
deleted file mode 100644
index f775089bfb9..00000000000
--- a/src/test/ui/error-codes/E0059.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#![feature(unboxed_closures)]
-
-fn foo<F: Fn<i32>>(f: F) -> F::Output { f(3) } //~ ERROR E0059
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0059.stderr b/src/test/ui/error-codes/E0059.stderr
deleted file mode 100644
index 4f6abb22ab2..00000000000
--- a/src/test/ui/error-codes/E0059.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0059]: type parameter to bare `Fn` trait must be a tuple
-  --> $DIR/E0059.rs:3:11
-   |
-LL | fn foo<F: Fn<i32>>(f: F) -> F::Output { f(3) }
-   |           ^^^^^^^ the trait `Tuple` is not implemented for `i32`
-   |
-note: required by a bound in `Fn`
-  --> $SRC_DIR/core/src/ops/function.rs:LL:COL
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0059`.
diff --git a/src/test/ui/error-codes/E0060.rs b/src/test/ui/error-codes/E0060.rs
deleted file mode 100644
index 7050a1dff6c..00000000000
--- a/src/test/ui/error-codes/E0060.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-extern "C" {
-    fn printf(_: *const u8, ...) -> u32;
-}
-
-fn main() {
-    unsafe { printf(); }
-    //~^ ERROR E0060
-}
diff --git a/src/test/ui/error-codes/E0060.stderr b/src/test/ui/error-codes/E0060.stderr
deleted file mode 100644
index 934a18d896d..00000000000
--- a/src/test/ui/error-codes/E0060.stderr
+++ /dev/null
@@ -1,19 +0,0 @@
-error[E0060]: this function takes at least 1 argument but 0 arguments were supplied
-  --> $DIR/E0060.rs:6:14
-   |
-LL |     unsafe { printf(); }
-   |              ^^^^^^-- an argument of type `*const u8` is missing
-   |
-note: function defined here
-  --> $DIR/E0060.rs:2:8
-   |
-LL |     fn printf(_: *const u8, ...) -> u32;
-   |        ^^^^^^
-help: provide the argument
-   |
-LL |     unsafe { printf(/* *const u8 */); }
-   |                    ~~~~~~~~~~~~~~~~~
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0060`.
diff --git a/src/test/ui/error-codes/E0061.rs b/src/test/ui/error-codes/E0061.rs
deleted file mode 100644
index b6fae6c63d7..00000000000
--- a/src/test/ui/error-codes/E0061.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-fn f(a: u16, b: &str) {}
-
-fn f2(a: u16) {}
-
-fn main() {
-    f(0);
-    //~^ ERROR E0061
-
-    f2();
-    //~^ ERROR E0061
-}
diff --git a/src/test/ui/error-codes/E0061.stderr b/src/test/ui/error-codes/E0061.stderr
deleted file mode 100644
index fa4ccbe6677..00000000000
--- a/src/test/ui/error-codes/E0061.stderr
+++ /dev/null
@@ -1,35 +0,0 @@
-error[E0061]: this function takes 2 arguments but 1 argument was supplied
-  --> $DIR/E0061.rs:6:5
-   |
-LL |     f(0);
-   |     ^--- an argument of type `&str` is missing
-   |
-note: function defined here
-  --> $DIR/E0061.rs:1:4
-   |
-LL | fn f(a: u16, b: &str) {}
-   |    ^ ------  -------
-help: provide the argument
-   |
-LL |     f(0, /* &str */);
-   |      ~~~~~~~~~~~~~~~
-
-error[E0061]: this function takes 1 argument but 0 arguments were supplied
-  --> $DIR/E0061.rs:9:5
-   |
-LL |     f2();
-   |     ^^-- an argument of type `u16` is missing
-   |
-note: function defined here
-  --> $DIR/E0061.rs:3:4
-   |
-LL | fn f2(a: u16) {}
-   |    ^^ ------
-help: provide the argument
-   |
-LL |     f2(/* u16 */);
-   |       ~~~~~~~~~~~
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0061`.
diff --git a/src/test/ui/error-codes/E0062.rs b/src/test/ui/error-codes/E0062.rs
deleted file mode 100644
index 3b7f8875086..00000000000
--- a/src/test/ui/error-codes/E0062.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-struct Foo {
-    x: i32
-}
-
-fn main() {
-    let x = Foo {
-        x: 0,
-        x: 0,
-        //~^ ERROR E0062
-    };
-}
diff --git a/src/test/ui/error-codes/E0062.stderr b/src/test/ui/error-codes/E0062.stderr
deleted file mode 100644
index a3e14099507..00000000000
--- a/src/test/ui/error-codes/E0062.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0062]: field `x` specified more than once
-  --> $DIR/E0062.rs:8:9
-   |
-LL |         x: 0,
-   |         ---- first use of `x`
-LL |         x: 0,
-   |         ^ used more than once
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0062`.
diff --git a/src/test/ui/error-codes/E0063.rs b/src/test/ui/error-codes/E0063.rs
deleted file mode 100644
index 48c9c13f018..00000000000
--- a/src/test/ui/error-codes/E0063.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-struct SingleFoo {
-    x: i32
-}
-
-struct PluralFoo {
-    x: i32,
-    y: i32,
-    z: i32
-}
-
-struct TruncatedFoo {
-    a: i32,
-    b: i32,
-    x: i32,
-    y: i32,
-    z: i32
-}
-
-struct TruncatedPluralFoo {
-    a: i32,
-    b: i32,
-    c: i32,
-    x: i32,
-    y: i32,
-    z: i32
-}
-
-
-fn main() {
-    let w = SingleFoo { };
-    //~^ ERROR missing field `x` in initializer of `SingleFoo`
-    let x = PluralFoo {x: 1};
-    //~^ ERROR missing fields `y` and `z` in initializer of `PluralFoo`
-    let y = TruncatedFoo{x:1};
-    //~^ missing fields `a`, `b`, `y` and 1 other field in initializer of `TruncatedFoo`
-    let z = TruncatedPluralFoo{x:1};
-    //~^ ERROR missing fields `a`, `b`, `c` and 2 other fields in initializer of `TruncatedPluralFoo`
-}
diff --git a/src/test/ui/error-codes/E0063.stderr b/src/test/ui/error-codes/E0063.stderr
deleted file mode 100644
index 235e204025a..00000000000
--- a/src/test/ui/error-codes/E0063.stderr
+++ /dev/null
@@ -1,27 +0,0 @@
-error[E0063]: missing field `x` in initializer of `SingleFoo`
-  --> $DIR/E0063.rs:30:13
-   |
-LL |     let w = SingleFoo { };
-   |             ^^^^^^^^^ missing `x`
-
-error[E0063]: missing fields `y` and `z` in initializer of `PluralFoo`
-  --> $DIR/E0063.rs:32:13
-   |
-LL |     let x = PluralFoo {x: 1};
-   |             ^^^^^^^^^ missing `y` and `z`
-
-error[E0063]: missing fields `a`, `b`, `y` and 1 other field in initializer of `TruncatedFoo`
-  --> $DIR/E0063.rs:34: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:36:13
-   |
-LL |     let z = TruncatedPluralFoo{x:1};
-   |             ^^^^^^^^^^^^^^^^^^ missing `a`, `b`, `c` and 2 other fields
-
-error: aborting due to 4 previous errors
-
-For more information about this error, try `rustc --explain E0063`.
diff --git a/src/test/ui/error-codes/E0067.rs b/src/test/ui/error-codes/E0067.rs
deleted file mode 100644
index 5925443ddc4..00000000000
--- a/src/test/ui/error-codes/E0067.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use std::collections::LinkedList;
-
-fn main() {
-    LinkedList::new() += 1; //~ ERROR E0368
-                            //~^ ERROR E0067
-}
diff --git a/src/test/ui/error-codes/E0067.stderr b/src/test/ui/error-codes/E0067.stderr
deleted file mode 100644
index ec0358cb7df..00000000000
--- a/src/test/ui/error-codes/E0067.stderr
+++ /dev/null
@@ -1,20 +0,0 @@
-error[E0368]: binary assignment operation `+=` cannot be applied to type `LinkedList<_>`
-  --> $DIR/E0067.rs:4:5
-   |
-LL |     LinkedList::new() += 1;
-   |     -----------------^^^^^
-   |     |
-   |     cannot use `+=` on type `LinkedList<_>`
-
-error[E0067]: invalid left-hand side of assignment
-  --> $DIR/E0067.rs:4:23
-   |
-LL |     LinkedList::new() += 1;
-   |     ----------------- ^^
-   |     |
-   |     cannot assign to this expression
-
-error: aborting due to 2 previous errors
-
-Some errors have detailed explanations: E0067, E0368.
-For more information about an error, try `rustc --explain E0067`.
diff --git a/src/test/ui/error-codes/E0069.rs b/src/test/ui/error-codes/E0069.rs
deleted file mode 100644
index a4ba9fd8deb..00000000000
--- a/src/test/ui/error-codes/E0069.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-fn foo() -> u8 {
-    return;
-    //~^ ERROR `return;` in a function whose return type is not `()`
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0069.stderr b/src/test/ui/error-codes/E0069.stderr
deleted file mode 100644
index ff9bbe01dd5..00000000000
--- a/src/test/ui/error-codes/E0069.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0069]: `return;` in a function whose return type is not `()`
-  --> $DIR/E0069.rs:2:5
-   |
-LL | fn foo() -> u8 {
-   |             -- expected `u8` because of this return type
-LL |     return;
-   |     ^^^^^^ return type is not `()`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0069`.
diff --git a/src/test/ui/error-codes/E0070.rs b/src/test/ui/error-codes/E0070.rs
deleted file mode 100644
index 3aae0c9ff6e..00000000000
--- a/src/test/ui/error-codes/E0070.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-const SOME_CONST : i32 = 12;
-
-fn some_other_func() {}
-
-fn some_function() {
-    SOME_CONST = 14; //~ ERROR E0070
-    1 = 3; //~ ERROR E0070
-    some_other_func() = 4; //~ ERROR E0070
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0070.stderr b/src/test/ui/error-codes/E0070.stderr
deleted file mode 100644
index 8868bc257a7..00000000000
--- a/src/test/ui/error-codes/E0070.stderr
+++ /dev/null
@@ -1,27 +0,0 @@
-error[E0070]: invalid left-hand side of assignment
-  --> $DIR/E0070.rs:6:16
-   |
-LL |     SOME_CONST = 14;
-   |     ---------- ^
-   |     |
-   |     cannot assign to this expression
-
-error[E0070]: invalid left-hand side of assignment
-  --> $DIR/E0070.rs:7:7
-   |
-LL |     1 = 3;
-   |     - ^
-   |     |
-   |     cannot assign to this expression
-
-error[E0070]: invalid left-hand side of assignment
-  --> $DIR/E0070.rs:8:23
-   |
-LL |     some_other_func() = 4;
-   |     ----------------- ^
-   |     |
-   |     cannot assign to this expression
-
-error: aborting due to 3 previous errors
-
-For more information about this error, try `rustc --explain E0070`.
diff --git a/src/test/ui/error-codes/E0071.rs b/src/test/ui/error-codes/E0071.rs
deleted file mode 100644
index bd8469de75d..00000000000
--- a/src/test/ui/error-codes/E0071.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-enum Foo {}
-type FooAlias = Foo;
-
-fn main() {
-    let u = FooAlias { value: 0 };
-    //~^ ERROR expected struct, variant or union type, found enum `Foo` [E0071]
-}
diff --git a/src/test/ui/error-codes/E0071.stderr b/src/test/ui/error-codes/E0071.stderr
deleted file mode 100644
index ae312fc400a..00000000000
--- a/src/test/ui/error-codes/E0071.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0071]: expected struct, variant or union type, found enum `Foo`
-  --> $DIR/E0071.rs:5:13
-   |
-LL |     let u = FooAlias { value: 0 };
-   |             ^^^^^^^^ not a struct
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0071`.
diff --git a/src/test/ui/error-codes/E0075.rs b/src/test/ui/error-codes/E0075.rs
deleted file mode 100644
index 7feab0a8bd7..00000000000
--- a/src/test/ui/error-codes/E0075.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#![feature(repr_simd)]
-
-#[repr(simd)]
-struct Bad; //~ ERROR E0075
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0075.stderr b/src/test/ui/error-codes/E0075.stderr
deleted file mode 100644
index 3f927726a03..00000000000
--- a/src/test/ui/error-codes/E0075.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0075]: SIMD vector cannot be empty
-  --> $DIR/E0075.rs:4:1
-   |
-LL | struct Bad;
-   | ^^^^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0075`.
diff --git a/src/test/ui/error-codes/E0076.rs b/src/test/ui/error-codes/E0076.rs
deleted file mode 100644
index a27072eb71e..00000000000
--- a/src/test/ui/error-codes/E0076.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#![feature(repr_simd)]
-
-#[repr(simd)]
-struct Bad(u16, u32, u32);
-//~^ ERROR E0076
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0076.stderr b/src/test/ui/error-codes/E0076.stderr
deleted file mode 100644
index 7d4ff879816..00000000000
--- a/src/test/ui/error-codes/E0076.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0076]: SIMD vector should be homogeneous
-  --> $DIR/E0076.rs:4:1
-   |
-LL | struct Bad(u16, u32, u32);
-   | ^^^^^^^^^^ SIMD elements must have the same type
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0076`.
diff --git a/src/test/ui/error-codes/E0077.rs b/src/test/ui/error-codes/E0077.rs
deleted file mode 100644
index fa2d5e24fa3..00000000000
--- a/src/test/ui/error-codes/E0077.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#![feature(repr_simd)]
-
-#[repr(simd)]
-struct Bad(String); //~ ERROR E0077
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0077.stderr b/src/test/ui/error-codes/E0077.stderr
deleted file mode 100644
index 9a84b2ec406..00000000000
--- a/src/test/ui/error-codes/E0077.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0077]: SIMD vector element type should be a primitive scalar (integer/float/pointer) type
-  --> $DIR/E0077.rs:4:1
-   |
-LL | struct Bad(String);
-   | ^^^^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0077`.
diff --git a/src/test/ui/error-codes/E0080.rs b/src/test/ui/error-codes/E0080.rs
deleted file mode 100644
index ea3264b61b3..00000000000
--- a/src/test/ui/error-codes/E0080.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-enum Enum {
-    X = (1 << 500), //~ ERROR E0080
-    //~| attempt to shift left by `500_i32`, which would overflow
-    Y = (1 / 0) //~ ERROR E0080
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0080.stderr b/src/test/ui/error-codes/E0080.stderr
deleted file mode 100644
index 60ed9a4358f..00000000000
--- a/src/test/ui/error-codes/E0080.stderr
+++ /dev/null
@@ -1,15 +0,0 @@
-error[E0080]: evaluation of constant value failed
-  --> $DIR/E0080.rs:2:9
-   |
-LL |     X = (1 << 500),
-   |         ^^^^^^^^^^ attempt to shift left by `500_i32`, which would overflow
-
-error[E0080]: evaluation of constant value failed
-  --> $DIR/E0080.rs:4:9
-   |
-LL |     Y = (1 / 0)
-   |         ^^^^^^^ attempt to divide `1_isize` by zero
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/error-codes/E0081.rs b/src/test/ui/error-codes/E0081.rs
deleted file mode 100644
index f53fda864d6..00000000000
--- a/src/test/ui/error-codes/E0081.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-enum Enum {
-    //~^ ERROR discriminant value `3` assigned more than once
-    P = 3,
-    //~^ NOTE `3` assigned here
-    X = 3,
-    //~^ NOTE `3` assigned here
-    Y = 5
-}
-
-#[repr(u8)]
-enum EnumOverflowRepr {
-    //~^ ERROR discriminant value `1` assigned more than once
-    P = 257,
-    //~^ NOTE `1` (overflowed from `257`) assigned here
-    X = 513,
-    //~^ NOTE `1` (overflowed from `513`) assigned here
-}
-
-#[repr(i8)]
-enum NegDisEnum {
-    //~^ ERROR discriminant value `-1` assigned more than once
-    First = -1,
-    //~^ NOTE `-1` assigned here
-    Second = -2,
-    //~^ NOTE discriminant for `Last` incremented from this startpoint (`Second` + 1 variant later => `Last` = -1)
-    Last,
-    //~^ NOTE `-1` assigned here
-}
-
-enum MultipleDuplicates {
-    //~^ ERROR discriminant value `0` assigned more than once
-    //~^^ ERROR discriminant value `-2` assigned more than once
-    V0,
-    //~^ NOTE `0` assigned here
-    V1 = 0,
-    //~^ NOTE `0` assigned here
-    V2,
-    V3,
-    V4 = 0,
-    //~^ NOTE `0` assigned here
-    V5 = -2,
-    //~^ NOTE discriminant for `V7` incremented from this startpoint (`V5` + 2 variants later => `V7` = 0)
-    //~^^ NOTE `-2` assigned here
-    V6,
-    V7,
-    //~^ NOTE `0` assigned here
-    V8 = -3,
-    //~^ NOTE discriminant for `V9` incremented from this startpoint (`V8` + 1 variant later => `V9` = -2)
-    V9,
-    //~^ NOTE `-2` assigned here
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0081.stderr b/src/test/ui/error-codes/E0081.stderr
deleted file mode 100644
index d4b21f6893b..00000000000
--- a/src/test/ui/error-codes/E0081.stderr
+++ /dev/null
@@ -1,78 +0,0 @@
-error[E0081]: discriminant value `3` assigned more than once
-  --> $DIR/E0081.rs:1:1
-   |
-LL | enum Enum {
-   | ^^^^^^^^^
-LL |
-LL |     P = 3,
-   |         - `3` assigned here
-LL |
-LL |     X = 3,
-   |         - `3` assigned here
-
-error[E0081]: discriminant value `1` assigned more than once
-  --> $DIR/E0081.rs:11:1
-   |
-LL | enum EnumOverflowRepr {
-   | ^^^^^^^^^^^^^^^^^^^^^
-LL |
-LL |     P = 257,
-   |         --- `1` (overflowed from `257`) assigned here
-LL |
-LL |     X = 513,
-   |         --- `1` (overflowed from `513`) assigned here
-
-error[E0081]: discriminant value `-1` assigned more than once
-  --> $DIR/E0081.rs:20:1
-   |
-LL | enum NegDisEnum {
-   | ^^^^^^^^^^^^^^^
-LL |
-LL |     First = -1,
-   |             -- `-1` assigned here
-LL |
-LL |     Second = -2,
-   |     ------ discriminant for `Last` incremented from this startpoint (`Second` + 1 variant later => `Last` = -1)
-LL |
-LL |     Last,
-   |     ---- `-1` assigned here
-
-error[E0081]: discriminant value `0` assigned more than once
-  --> $DIR/E0081.rs:30:1
-   |
-LL | enum MultipleDuplicates {
-   | ^^^^^^^^^^^^^^^^^^^^^^^
-...
-LL |     V0,
-   |     -- `0` assigned here
-LL |
-LL |     V1 = 0,
-   |          - `0` assigned here
-...
-LL |     V4 = 0,
-   |          - `0` assigned here
-LL |
-LL |     V5 = -2,
-   |     -- discriminant for `V7` incremented from this startpoint (`V5` + 2 variants later => `V7` = 0)
-...
-LL |     V7,
-   |     -- `0` assigned here
-
-error[E0081]: discriminant value `-2` assigned more than once
-  --> $DIR/E0081.rs:30:1
-   |
-LL | enum MultipleDuplicates {
-   | ^^^^^^^^^^^^^^^^^^^^^^^
-...
-LL |     V5 = -2,
-   |          -- `-2` assigned here
-...
-LL |     V8 = -3,
-   |     -- discriminant for `V9` incremented from this startpoint (`V8` + 1 variant later => `V9` = -2)
-LL |
-LL |     V9,
-   |     -- `-2` assigned here
-
-error: aborting due to 5 previous errors
-
-For more information about this error, try `rustc --explain E0081`.
diff --git a/src/test/ui/error-codes/E0084.rs b/src/test/ui/error-codes/E0084.rs
deleted file mode 100644
index a550e04129a..00000000000
--- a/src/test/ui/error-codes/E0084.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#[repr(i32)] //~ ERROR: E0084
-enum Foo {}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0084.stderr b/src/test/ui/error-codes/E0084.stderr
deleted file mode 100644
index e1bda22b8d1..00000000000
--- a/src/test/ui/error-codes/E0084.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0084]: unsupported representation for zero-variant enum
-  --> $DIR/E0084.rs:1:1
-   |
-LL | #[repr(i32)]
-   | ^^^^^^^^^^^^
-LL | enum Foo {}
-   | -------- zero-variant enum
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0084`.
diff --git a/src/test/ui/error-codes/E0091.rs b/src/test/ui/error-codes/E0091.rs
deleted file mode 100644
index 2427f5cfe13..00000000000
--- a/src/test/ui/error-codes/E0091.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-type Foo<T> = u32; //~ ERROR E0091
-type Foo2<A, B> = Box<A>; //~ ERROR E0091
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0091.stderr b/src/test/ui/error-codes/E0091.stderr
deleted file mode 100644
index a596b75e481..00000000000
--- a/src/test/ui/error-codes/E0091.stderr
+++ /dev/null
@@ -1,15 +0,0 @@
-error[E0091]: type parameter `T` is unused
-  --> $DIR/E0091.rs:1:10
-   |
-LL | type Foo<T> = u32;
-   |          ^ unused type parameter
-
-error[E0091]: type parameter `B` is unused
-  --> $DIR/E0091.rs:2:14
-   |
-LL | type Foo2<A, B> = Box<A>;
-   |              ^ unused type parameter
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0091`.
diff --git a/src/test/ui/error-codes/E0092.rs b/src/test/ui/error-codes/E0092.rs
deleted file mode 100644
index ddaace98bd4..00000000000
--- a/src/test/ui/error-codes/E0092.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#![feature(intrinsics)]
-extern "rust-intrinsic" {
-    fn atomic_foo(); //~ ERROR E0092
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0092.stderr b/src/test/ui/error-codes/E0092.stderr
deleted file mode 100644
index 2d590a8e1d7..00000000000
--- a/src/test/ui/error-codes/E0092.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0092]: unrecognized atomic operation function: `foo`
-  --> $DIR/E0092.rs:3:5
-   |
-LL |     fn atomic_foo();
-   |     ^^^^^^^^^^^^^^^^ unrecognized atomic operation
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0092`.
diff --git a/src/test/ui/error-codes/E0093.rs b/src/test/ui/error-codes/E0093.rs
deleted file mode 100644
index a2f0b1ae443..00000000000
--- a/src/test/ui/error-codes/E0093.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#![feature(intrinsics)]
-extern "rust-intrinsic" {
-    fn foo();
-    //~^ ERROR E0093
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0093.stderr b/src/test/ui/error-codes/E0093.stderr
deleted file mode 100644
index cb0305593a7..00000000000
--- a/src/test/ui/error-codes/E0093.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0093]: unrecognized intrinsic function: `foo`
-  --> $DIR/E0093.rs:3:5
-   |
-LL |     fn foo();
-   |     ^^^^^^^^^ unrecognized intrinsic
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0093`.
diff --git a/src/test/ui/error-codes/E0094.rs b/src/test/ui/error-codes/E0094.rs
deleted file mode 100644
index a2ec932c124..00000000000
--- a/src/test/ui/error-codes/E0094.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-#![feature(intrinsics)]
-
-extern "rust-intrinsic" {
-    #[rustc_safe_intrinsic]
-    fn size_of<T, U>() -> usize; //~ ERROR E0094
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0094.stderr b/src/test/ui/error-codes/E0094.stderr
deleted file mode 100644
index 531cd4c784d..00000000000
--- a/src/test/ui/error-codes/E0094.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0094]: intrinsic has wrong number of type parameters: found 2, expected 1
-  --> $DIR/E0094.rs:5:15
-   |
-LL |     fn size_of<T, U>() -> usize;
-   |               ^^^^^^ expected 1 type parameter
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0094`.
diff --git a/src/test/ui/error-codes/E0106.rs b/src/test/ui/error-codes/E0106.rs
deleted file mode 100644
index cc3438727a8..00000000000
--- a/src/test/ui/error-codes/E0106.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-struct Foo {
-    x: &bool,
-    //~^ ERROR E0106
-}
-enum Bar {
-    A(u8),
-    B(&bool),
-   //~^ ERROR E0106
-}
-type MyStr = &str;
-        //~^ ERROR E0106
-
-struct Baz<'a>(&'a str);
-struct Buzz<'a, 'b>(&'a str, &'b str);
-
-struct Quux {
-    baz: Baz,
-    //~^ ERROR E0106
-    //~| expected named lifetime parameter
-    buzz: Buzz,
-    //~^ ERROR E0106
-    //~| expected 2 lifetime parameters
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0106.stderr b/src/test/ui/error-codes/E0106.stderr
deleted file mode 100644
index d11a24f7768..00000000000
--- a/src/test/ui/error-codes/E0106.stderr
+++ /dev/null
@@ -1,66 +0,0 @@
-error[E0106]: missing lifetime specifier
-  --> $DIR/E0106.rs:2:8
-   |
-LL |     x: &bool,
-   |        ^ expected named lifetime parameter
-   |
-help: consider introducing a named lifetime parameter
-   |
-LL ~ struct Foo<'a> {
-LL ~     x: &'a bool,
-   |
-
-error[E0106]: missing lifetime specifier
-  --> $DIR/E0106.rs:7:7
-   |
-LL |     B(&bool),
-   |       ^ expected named lifetime parameter
-   |
-help: consider introducing a named lifetime parameter
-   |
-LL ~ enum Bar<'a> {
-LL |     A(u8),
-LL ~     B(&'a bool),
-   |
-
-error[E0106]: missing lifetime specifier
-  --> $DIR/E0106.rs:10:14
-   |
-LL | type MyStr = &str;
-   |              ^ expected named lifetime parameter
-   |
-help: consider introducing a named lifetime parameter
-   |
-LL | type MyStr<'a> = &'a str;
-   |           ++++    ++
-
-error[E0106]: missing lifetime specifier
-  --> $DIR/E0106.rs:17:10
-   |
-LL |     baz: Baz,
-   |          ^^^ expected named lifetime parameter
-   |
-help: consider introducing a named lifetime parameter
-   |
-LL ~ struct Quux<'a> {
-LL ~     baz: Baz<'a>,
-   |
-
-error[E0106]: missing lifetime specifiers
-  --> $DIR/E0106.rs:20:11
-   |
-LL |     buzz: Buzz,
-   |           ^^^^ expected 2 lifetime parameters
-   |
-help: consider introducing a named lifetime parameter
-   |
-LL ~ struct Quux<'a> {
-LL |     baz: Baz,
-LL |
-LL |
-LL ~     buzz: Buzz<'a, 'a>,
-   |
-
-error: aborting due to 5 previous errors
-
-For more information about this error, try `rustc --explain E0106`.
diff --git a/src/test/ui/error-codes/E0107.rs b/src/test/ui/error-codes/E0107.rs
deleted file mode 100644
index d369fc2a565..00000000000
--- a/src/test/ui/error-codes/E0107.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-struct Foo<'a>(&'a str);
-struct Buzz<'a, 'b>(&'a str, &'b str);
-struct Qux<'a, T>(&'a T);
-struct Quux<T>(T);
-
-enum Bar {
-    A,
-    B,
-    C,
-}
-
-struct Baz<'a, 'b, 'c> {
-    buzz: Buzz<'a>,
-    //~^ ERROR this struct takes 2 lifetime arguments
-    //~| HELP add missing lifetime argument
-
-    bar: Bar<'a>,
-    //~^ ERROR this enum takes 0 lifetime arguments
-    //~| HELP remove these generics
-
-    foo2: Foo<'a, 'b, 'c>,
-    //~^ ERROR this struct takes 1 lifetime argument
-    //~| HELP remove these lifetime arguments
-
-    qux1: Qux<'a, 'b, i32>,
-    //~^ ERROR this struct takes 1 lifetime argument
-    //~| HELP remove this lifetime argument
-
-    qux2: Qux<'a, i32, 'b>,
-    //~^ ERROR this struct takes 1 lifetime argument
-    //~| HELP remove this lifetime argument
-
-    qux3: Qux<'a, 'b, 'c, i32>,
-    //~^ ERROR this struct takes 1 lifetime argument
-    //~| HELP remove these lifetime arguments
-
-    qux4: Qux<'a, i32, 'b, 'c>,
-    //~^ ERROR this struct takes 1 lifetime argument
-    //~| HELP remove these lifetime arguments
-
-    qux5: Qux<'a, 'b, i32, 'c>,
-    //~^ ERROR this struct takes 1 lifetime argument
-    //~| HELP remove this lifetime argument
-
-    quux: Quux<'a, i32, 'b>,
-    //~^ ERROR this struct takes 0 lifetime arguments
-    //~| HELP remove this lifetime argument
-}
-
-pub trait T {
-    type A;
-    type B;
-}
-
-fn trait_bound_generic<I: T<u8, u16>>(_i: I) {
-    //~^ ERROR this trait takes 0 generic arguments
-    //~| HELP replace the generic bounds with the associated types
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0107.stderr b/src/test/ui/error-codes/E0107.stderr
deleted file mode 100644
index 03430f8fa3a..00000000000
--- a/src/test/ui/error-codes/E0107.stderr
+++ /dev/null
@@ -1,149 +0,0 @@
-error[E0107]: this struct takes 2 lifetime arguments but 1 lifetime argument was supplied
-  --> $DIR/E0107.rs:13:11
-   |
-LL |     buzz: Buzz<'a>,
-   |           ^^^^ -- supplied 1 lifetime argument
-   |           |
-   |           expected 2 lifetime arguments
-   |
-note: struct defined here, with 2 lifetime parameters: `'a`, `'b`
-  --> $DIR/E0107.rs:2:8
-   |
-LL | struct Buzz<'a, 'b>(&'a str, &'b str);
-   |        ^^^^ --  --
-help: add missing lifetime argument
-   |
-LL |     buzz: Buzz<'a, 'a>,
-   |                  ++++
-
-error[E0107]: this enum takes 0 lifetime arguments but 1 lifetime argument was supplied
-  --> $DIR/E0107.rs:17:10
-   |
-LL |     bar: Bar<'a>,
-   |          ^^^---- help: remove these generics
-   |          |
-   |          expected 0 lifetime arguments
-   |
-note: enum defined here, with 0 lifetime parameters
-  --> $DIR/E0107.rs:6:6
-   |
-LL | enum Bar {
-   |      ^^^
-
-error[E0107]: this struct takes 1 lifetime argument but 3 lifetime arguments were supplied
-  --> $DIR/E0107.rs:21:11
-   |
-LL |     foo2: Foo<'a, 'b, 'c>,
-   |           ^^^     ------ help: remove these lifetime arguments
-   |           |
-   |           expected 1 lifetime argument
-   |
-note: struct defined here, with 1 lifetime parameter: `'a`
-  --> $DIR/E0107.rs:1:8
-   |
-LL | struct Foo<'a>(&'a str);
-   |        ^^^ --
-
-error[E0107]: this struct takes 1 lifetime argument but 2 lifetime arguments were supplied
-  --> $DIR/E0107.rs:25:11
-   |
-LL |     qux1: Qux<'a, 'b, i32>,
-   |           ^^^     -- help: remove this lifetime argument
-   |           |
-   |           expected 1 lifetime argument
-   |
-note: struct defined here, with 1 lifetime parameter: `'a`
-  --> $DIR/E0107.rs:3:8
-   |
-LL | struct Qux<'a, T>(&'a T);
-   |        ^^^ --
-
-error[E0107]: this struct takes 1 lifetime argument but 2 lifetime arguments were supplied
-  --> $DIR/E0107.rs:29:11
-   |
-LL |     qux2: Qux<'a, i32, 'b>,
-   |           ^^^          -- help: remove this lifetime argument
-   |           |
-   |           expected 1 lifetime argument
-   |
-note: struct defined here, with 1 lifetime parameter: `'a`
-  --> $DIR/E0107.rs:3:8
-   |
-LL | struct Qux<'a, T>(&'a T);
-   |        ^^^ --
-
-error[E0107]: this struct takes 1 lifetime argument but 3 lifetime arguments were supplied
-  --> $DIR/E0107.rs:33:11
-   |
-LL |     qux3: Qux<'a, 'b, 'c, i32>,
-   |           ^^^     ------ help: remove these lifetime arguments
-   |           |
-   |           expected 1 lifetime argument
-   |
-note: struct defined here, with 1 lifetime parameter: `'a`
-  --> $DIR/E0107.rs:3:8
-   |
-LL | struct Qux<'a, T>(&'a T);
-   |        ^^^ --
-
-error[E0107]: this struct takes 1 lifetime argument but 3 lifetime arguments were supplied
-  --> $DIR/E0107.rs:37:11
-   |
-LL |     qux4: Qux<'a, i32, 'b, 'c>,
-   |           ^^^          ------ help: remove these lifetime arguments
-   |           |
-   |           expected 1 lifetime argument
-   |
-note: struct defined here, with 1 lifetime parameter: `'a`
-  --> $DIR/E0107.rs:3:8
-   |
-LL | struct Qux<'a, T>(&'a T);
-   |        ^^^ --
-
-error[E0107]: this struct takes 1 lifetime argument but 3 lifetime arguments were supplied
-  --> $DIR/E0107.rs:41:11
-   |
-LL |     qux5: Qux<'a, 'b, i32, 'c>,
-   |           ^^^     -- help: remove this lifetime argument
-   |           |
-   |           expected 1 lifetime argument
-   |
-note: struct defined here, with 1 lifetime parameter: `'a`
-  --> $DIR/E0107.rs:3:8
-   |
-LL | struct Qux<'a, T>(&'a T);
-   |        ^^^ --
-
-error[E0107]: this struct takes 0 lifetime arguments but 2 lifetime arguments were supplied
-  --> $DIR/E0107.rs:45:11
-   |
-LL |     quux: Quux<'a, i32, 'b>,
-   |           ^^^^ -- help: remove this lifetime argument
-   |           |
-   |           expected 0 lifetime arguments
-   |
-note: struct defined here, with 0 lifetime parameters
-  --> $DIR/E0107.rs:4:8
-   |
-LL | struct Quux<T>(T);
-   |        ^^^^
-
-error[E0107]: this trait takes 0 generic arguments but 2 generic arguments were supplied
-  --> $DIR/E0107.rs:55:27
-   |
-LL | fn trait_bound_generic<I: T<u8, u16>>(_i: I) {
-   |                           ^ expected 0 generic arguments
-   |
-note: trait defined here, with 0 generic parameters
-  --> $DIR/E0107.rs:50:11
-   |
-LL | pub trait T {
-   |           ^
-help: replace the generic bounds with the associated types
-   |
-LL | fn trait_bound_generic<I: T<A = u8, B = u16>>(_i: I) {
-   |                             +++     +++
-
-error: aborting due to 10 previous errors
-
-For more information about this error, try `rustc --explain E0107`.
diff --git a/src/test/ui/error-codes/E0109.rs b/src/test/ui/error-codes/E0109.rs
deleted file mode 100644
index 2e382564962..00000000000
--- a/src/test/ui/error-codes/E0109.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 8f4cb86de99..00000000000
--- a/src/test/ui/error-codes/E0109.stderr
+++ /dev/null
@@ -1,17 +0,0 @@
-error[E0109]: type arguments are not allowed on builtin type `u32`
-  --> $DIR/E0109.rs:1:14
-   |
-LL | type X = u32<i32>;
-   |          --- ^^^ type argument not allowed
-   |          |
-   |          not allowed on builtin type `u32`
-   |
-help: primitive type `u32` doesn't have generic parameters
-   |
-LL - type X = u32<i32>;
-LL + type X = u32;
-   |
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0109`.
diff --git a/src/test/ui/error-codes/E0110.rs b/src/test/ui/error-codes/E0110.rs
deleted file mode 100644
index 314c7f5af60..00000000000
--- a/src/test/ui/error-codes/E0110.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-type X = u32<'static>; //~ ERROR E0109
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0110.stderr b/src/test/ui/error-codes/E0110.stderr
deleted file mode 100644
index 4ce2a0a410c..00000000000
--- a/src/test/ui/error-codes/E0110.stderr
+++ /dev/null
@@ -1,17 +0,0 @@
-error[E0109]: lifetime arguments are not allowed on builtin type `u32`
-  --> $DIR/E0110.rs:1:14
-   |
-LL | type X = u32<'static>;
-   |          --- ^^^^^^^ lifetime argument not allowed
-   |          |
-   |          not allowed on builtin type `u32`
-   |
-help: primitive type `u32` doesn't have generic parameters
-   |
-LL - type X = u32<'static>;
-LL + type X = u32;
-   |
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0109`.
diff --git a/src/test/ui/error-codes/E0116.rs b/src/test/ui/error-codes/E0116.rs
deleted file mode 100644
index 898beb10b6c..00000000000
--- a/src/test/ui/error-codes/E0116.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-impl Vec<u8> {}
-//~^ ERROR E0116
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0116.stderr b/src/test/ui/error-codes/E0116.stderr
deleted file mode 100644
index a5ceeb4a55d..00000000000
--- a/src/test/ui/error-codes/E0116.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0116]: cannot define inherent `impl` for a type outside of the crate where the type is defined
-  --> $DIR/E0116.rs:1:1
-   |
-LL | impl Vec<u8> {}
-   | ^^^^^^^^^^^^^^^ impl for type defined outside of crate.
-   |
-   = note: define and implement a trait or new type instead
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0116`.
diff --git a/src/test/ui/error-codes/E0117.rs b/src/test/ui/error-codes/E0117.rs
deleted file mode 100644
index 406d24e3666..00000000000
--- a/src/test/ui/error-codes/E0117.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-impl Drop for u32 {} //~ ERROR E0117
-//~| ERROR the `Drop` trait may only be implemented for local structs, enums, and unions
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0117.stderr b/src/test/ui/error-codes/E0117.stderr
deleted file mode 100644
index f144aa9f72c..00000000000
--- a/src/test/ui/error-codes/E0117.stderr
+++ /dev/null
@@ -1,21 +0,0 @@
-error[E0117]: only traits defined in the current crate can be implemented for primitive types
-  --> $DIR/E0117.rs:1:1
-   |
-LL | impl Drop for u32 {}
-   | ^^^^^^^^^^^^^^---
-   | |             |
-   | |             `u32` is not defined in the current crate
-   | impl doesn't use only types from inside the current crate
-   |
-   = note: define and implement a trait or new type instead
-
-error[E0120]: the `Drop` trait may only be implemented for local structs, enums, and unions
-  --> $DIR/E0117.rs:1:15
-   |
-LL | impl Drop for u32 {}
-   |               ^^^ must be a struct, enum, or union in the current crate
-
-error: aborting due to 2 previous errors
-
-Some errors have detailed explanations: E0117, E0120.
-For more information about an error, try `rustc --explain E0117`.
diff --git a/src/test/ui/error-codes/E0118.rs b/src/test/ui/error-codes/E0118.rs
deleted file mode 100644
index a61ba7bbf32..00000000000
--- a/src/test/ui/error-codes/E0118.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-impl<T> T { //~ ERROR E0118
-    fn get_state(&self) -> String {
-       String::new()
-    }
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0118.stderr b/src/test/ui/error-codes/E0118.stderr
deleted file mode 100644
index 8c6fa7947a8..00000000000
--- a/src/test/ui/error-codes/E0118.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0118]: no nominal type found for inherent implementation
-  --> $DIR/E0118.rs:1:9
-   |
-LL | impl<T> T {
-   |         ^ impl requires a nominal type
-   |
-   = note: either implement a trait on it or create a newtype to wrap it instead
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0118`.
diff --git a/src/test/ui/error-codes/E0119.rs b/src/test/ui/error-codes/E0119.rs
deleted file mode 100644
index 7f89e5a1a52..00000000000
--- a/src/test/ui/error-codes/E0119.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-trait MyTrait {
-    fn get(&self) -> usize;
-}
-
-impl<T> MyTrait for T {
-    fn get(&self) -> usize { 0 }
-}
-
-struct Foo {
-    value: usize
-}
-
-impl MyTrait for Foo { //~ ERROR E0119
-    fn get(&self) -> usize { self.value }
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0119.stderr b/src/test/ui/error-codes/E0119.stderr
deleted file mode 100644
index e08a2c7fcbb..00000000000
--- a/src/test/ui/error-codes/E0119.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0119]: conflicting implementations of trait `MyTrait` for type `Foo`
-  --> $DIR/E0119.rs:13:1
-   |
-LL | impl<T> MyTrait for T {
-   | --------------------- first implementation here
-...
-LL | impl MyTrait for Foo {
-   | ^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Foo`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0119`.
diff --git a/src/test/ui/error-codes/E0120.rs b/src/test/ui/error-codes/E0120.rs
deleted file mode 100644
index a0a301a06e2..00000000000
--- a/src/test/ui/error-codes/E0120.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-trait MyTrait { fn foo() {} }
-
-impl Drop for dyn MyTrait {
-              //~^ ERROR E0120
-    fn drop(&mut self) {}
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0120.stderr b/src/test/ui/error-codes/E0120.stderr
deleted file mode 100644
index 75778f1f94a..00000000000
--- a/src/test/ui/error-codes/E0120.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0120]: the `Drop` trait may only be implemented for local structs, enums, and unions
-  --> $DIR/E0120.rs:3:15
-   |
-LL | impl Drop for dyn MyTrait {
-   |               ^^^^^^^^^^^ must be a struct, enum, or union in the current crate
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0120`.
diff --git a/src/test/ui/error-codes/E0121.rs b/src/test/ui/error-codes/E0121.rs
deleted file mode 100644
index 98cd6d54c1f..00000000000
--- a/src/test/ui/error-codes/E0121.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-fn foo() -> _ { 5 } //~ ERROR E0121
-
-static BAR: _ = "test"; //~ ERROR E0121
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0121.stderr b/src/test/ui/error-codes/E0121.stderr
deleted file mode 100644
index 023d7e011bf..00000000000
--- a/src/test/ui/error-codes/E0121.stderr
+++ /dev/null
@@ -1,21 +0,0 @@
-error[E0121]: the placeholder `_` is not allowed within types on item signatures for return types
-  --> $DIR/E0121.rs:1:13
-   |
-LL | fn foo() -> _ { 5 }
-   |             ^
-   |             |
-   |             not allowed in type signatures
-   |             help: replace with the correct return type: `i32`
-
-error[E0121]: the placeholder `_` is not allowed within types on item signatures for static variables
-  --> $DIR/E0121.rs:3:13
-   |
-LL | static BAR: _ = "test";
-   |             ^
-   |             |
-   |             not allowed in type signatures
-   |             help: replace with the correct type: `&str`
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0121`.
diff --git a/src/test/ui/error-codes/E0124.rs b/src/test/ui/error-codes/E0124.rs
deleted file mode 100644
index 9d6a716a6da..00000000000
--- a/src/test/ui/error-codes/E0124.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-struct Foo {
-    field1: i32,
-    field1: i32,
-    //~^ ERROR field `field1` is already declared [E0124]
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0124.stderr b/src/test/ui/error-codes/E0124.stderr
deleted file mode 100644
index 73819a89d75..00000000000
--- a/src/test/ui/error-codes/E0124.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0124]: field `field1` is already declared
-  --> $DIR/E0124.rs:3:5
-   |
-LL |     field1: i32,
-   |     ----------- `field1` first declared here
-LL |     field1: i32,
-   |     ^^^^^^^^^^^ field already declared
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0124`.
diff --git a/src/test/ui/error-codes/E0128.rs b/src/test/ui/error-codes/E0128.rs
deleted file mode 100644
index f42c32b91cc..00000000000
--- a/src/test/ui/error-codes/E0128.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-struct Foo<T=U, U=()> { //~ ERROR E0128
-    field1: T,
-    field2: U,
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0128.stderr b/src/test/ui/error-codes/E0128.stderr
deleted file mode 100644
index eb66d46936a..00000000000
--- a/src/test/ui/error-codes/E0128.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0128]: generic parameters with a default cannot use forward declared identifiers
-  --> $DIR/E0128.rs:1:14
-   |
-LL | struct Foo<T=U, U=()> {
-   |              ^ defaulted generic parameters cannot be forward declared
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0128`.
diff --git a/src/test/ui/error-codes/E0130.rs b/src/test/ui/error-codes/E0130.rs
deleted file mode 100644
index d523507899f..00000000000
--- a/src/test/ui/error-codes/E0130.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-extern "C" {
-    fn foo((a, b): (u32, u32));
-//~^ ERROR E0130
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0130.stderr b/src/test/ui/error-codes/E0130.stderr
deleted file mode 100644
index a45571f40a1..00000000000
--- a/src/test/ui/error-codes/E0130.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0130]: patterns aren't allowed in foreign function declarations
-  --> $DIR/E0130.rs:2:12
-   |
-LL |     fn foo((a, b): (u32, u32));
-   |            ^^^^^^ pattern not allowed in foreign function
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0130`.
diff --git a/src/test/ui/error-codes/E0131.rs b/src/test/ui/error-codes/E0131.rs
deleted file mode 100644
index 3ed739949a0..00000000000
--- a/src/test/ui/error-codes/E0131.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn main<T>() {
-    //~^ ERROR E0131
-}
diff --git a/src/test/ui/error-codes/E0131.stderr b/src/test/ui/error-codes/E0131.stderr
deleted file mode 100644
index 4467e19e95d..00000000000
--- a/src/test/ui/error-codes/E0131.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0131]: `main` function is not allowed to have generic parameters
-  --> $DIR/E0131.rs:1:8
-   |
-LL | fn main<T>() {
-   |        ^^^ `main` cannot have generic parameters
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0131`.
diff --git a/src/test/ui/error-codes/E0132.rs b/src/test/ui/error-codes/E0132.rs
deleted file mode 100644
index fb5e5d7b95a..00000000000
--- a/src/test/ui/error-codes/E0132.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#![feature(start)]
-
-#[start]
-fn f< T >() {} //~ ERROR E0132
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0132.stderr b/src/test/ui/error-codes/E0132.stderr
deleted file mode 100644
index c21363756b3..00000000000
--- a/src/test/ui/error-codes/E0132.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0132]: start function is not allowed to have type parameters
-  --> $DIR/E0132.rs:4:5
-   |
-LL | fn f< T >() {}
-   |     ^^^^^ start function cannot have type parameters
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0132`.
diff --git a/src/test/ui/error-codes/E0133.mir.stderr b/src/test/ui/error-codes/E0133.mir.stderr
deleted file mode 100644
index b11d5e2c2fc..00000000000
--- a/src/test/ui/error-codes/E0133.mir.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0133]: call to unsafe function is unsafe and requires unsafe function or block
-  --> $DIR/E0133.rs:7:5
-   |
-LL |     f();
-   |     ^^^ call to unsafe function
-   |
-   = note: consult the function's documentation for information on how to avoid undefined behavior
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0133`.
diff --git a/src/test/ui/error-codes/E0133.rs b/src/test/ui/error-codes/E0133.rs
deleted file mode 100644
index dee1475ba21..00000000000
--- a/src/test/ui/error-codes/E0133.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// revisions: mir thir
-// [thir]compile-flags: -Z thir-unsafeck
-
-unsafe fn f() { return; }
-
-fn main() {
-    f();
-    //~^ ERROR E0133
-}
diff --git a/src/test/ui/error-codes/E0133.thir.stderr b/src/test/ui/error-codes/E0133.thir.stderr
deleted file mode 100644
index f1d7aba2aa3..00000000000
--- a/src/test/ui/error-codes/E0133.thir.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0133]: call to unsafe function `f` is unsafe and requires unsafe function or block
-  --> $DIR/E0133.rs:7:5
-   |
-LL |     f();
-   |     ^^^ call to unsafe function
-   |
-   = note: consult the function's documentation for information on how to avoid undefined behavior
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0133`.
diff --git a/src/test/ui/error-codes/E0138.rs b/src/test/ui/error-codes/E0138.rs
deleted file mode 100644
index 6f3c36282e8..00000000000
--- a/src/test/ui/error-codes/E0138.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#![feature(start)]
-
-#[start]
-fn foo(argc: isize, argv: *const *const u8) -> isize { 0 }
-
-#[start]
-fn f(argc: isize, argv: *const *const u8) -> isize { 0 }
-//~^ ERROR E0138
diff --git a/src/test/ui/error-codes/E0138.stderr b/src/test/ui/error-codes/E0138.stderr
deleted file mode 100644
index fa8c3942732..00000000000
--- a/src/test/ui/error-codes/E0138.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0138]: multiple `start` functions
-  --> $DIR/E0138.rs:7:1
-   |
-LL | fn foo(argc: isize, argv: *const *const u8) -> isize { 0 }
-   | ---------------------------------------------------- previous `#[start]` function here
-...
-LL | fn f(argc: isize, argv: *const *const u8) -> isize { 0 }
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ multiple `start` functions
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0138`.
diff --git a/src/test/ui/error-codes/E0152.rs b/src/test/ui/error-codes/E0152.rs
deleted file mode 100644
index ee8e5e6dffe..00000000000
--- a/src/test/ui/error-codes/E0152.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// normalize-stderr-test "loaded from .*liballoc-.*.rlib" -> "loaded from SYSROOT/liballoc-*.rlib"
-#![feature(lang_items)]
-
-#[lang = "owned_box"]
-struct Foo<T>(T); //~ ERROR E0152
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0152.stderr b/src/test/ui/error-codes/E0152.stderr
deleted file mode 100644
index 29f7e4ad683..00000000000
--- a/src/test/ui/error-codes/E0152.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-error[E0152]: found duplicate lang item `owned_box`
-  --> $DIR/E0152.rs:5:1
-   |
-LL | struct Foo<T>(T);
-   | ^^^^^^^^^^^^^
-   |
-   = note: the lang item is first defined in crate `alloc` (which `std` depends on)
-   = note: first definition in `alloc` loaded from SYSROOT/liballoc-*.rlib
-   = note: second definition in the local crate (`E0152`)
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0152`.
diff --git a/src/test/ui/error-codes/E0161.base.stderr b/src/test/ui/error-codes/E0161.base.stderr
deleted file mode 100644
index 15d98b657a2..00000000000
--- a/src/test/ui/error-codes/E0161.base.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0161]: cannot move a value of type `dyn Bar`
-  --> $DIR/E0161.rs:16:5
-   |
-LL |     x.f();
-   |     ^^^^^ the size of `dyn Bar` cannot be statically determined
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0161`.
diff --git a/src/test/ui/error-codes/E0161.rs b/src/test/ui/error-codes/E0161.rs
deleted file mode 100644
index c906e3c352d..00000000000
--- a/src/test/ui/error-codes/E0161.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Check that E0161 is a hard error in all possible configurations that might
-// affect it.
-
-// revisions: base ul
-//[base] check-fail
-//[ul] check-pass
-
-#![allow(incomplete_features)]
-#![cfg_attr(ul, feature(unsized_locals))]
-
-trait Bar {
-    fn f(self);
-}
-
-fn foo(x: Box<dyn Bar>) {
-    x.f();
-    //[base]~^ ERROR E0161
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0164.rs b/src/test/ui/error-codes/E0164.rs
deleted file mode 100644
index 2d412f754ed..00000000000
--- a/src/test/ui/error-codes/E0164.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-enum Foo {}
-
-impl Foo {
-    const B: u8 = 0;
-}
-
-fn bar(foo: Foo) -> u32 {
-    match foo {
-        Foo::B(i) => i, //~ ERROR E0164
-    }
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0164.stderr b/src/test/ui/error-codes/E0164.stderr
deleted file mode 100644
index 5a80d6ec31a..00000000000
--- a/src/test/ui/error-codes/E0164.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0164]: expected tuple struct or tuple variant, found associated constant `Foo::B`
-  --> $DIR/E0164.rs:9:9
-   |
-LL |         Foo::B(i) => i,
-   |         ^^^^^^^^^ not a tuple struct or tuple variant
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0164`.
diff --git a/src/test/ui/error-codes/E0184.rs b/src/test/ui/error-codes/E0184.rs
deleted file mode 100644
index 0c448e4ad8b..00000000000
--- a/src/test/ui/error-codes/E0184.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#[derive(Copy)] //~ ERROR E0184
-struct Foo;
-
-impl Drop for Foo {
-    fn drop(&mut self) {
-    }
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0184.stderr b/src/test/ui/error-codes/E0184.stderr
deleted file mode 100644
index bb3017b6ec2..00000000000
--- a/src/test/ui/error-codes/E0184.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0184]: the trait `Copy` may not be implemented for this type; the type has a destructor
-  --> $DIR/E0184.rs:1:10
-   |
-LL | #[derive(Copy)]
-   |          ^^^^ `Copy` not allowed on types with destructors
-   |
-   = note: this error originates in the derive macro `Copy` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0184`.
diff --git a/src/test/ui/error-codes/E0185.rs b/src/test/ui/error-codes/E0185.rs
deleted file mode 100644
index 45eb8b0f239..00000000000
--- a/src/test/ui/error-codes/E0185.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-trait Foo {
-    fn foo();
-    //~^ NOTE trait method declared without `&self`
-}
-
-struct Bar;
-
-impl Foo for Bar {
-    fn foo(&self) {}
-    //~^ ERROR E0185
-    //~| NOTE `&self` used in impl
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0185.stderr b/src/test/ui/error-codes/E0185.stderr
deleted file mode 100644
index 8a99c0688e3..00000000000
--- a/src/test/ui/error-codes/E0185.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0185]: method `foo` has a `&self` declaration in the impl, but not in the trait
-  --> $DIR/E0185.rs:9:5
-   |
-LL |     fn foo();
-   |     --------- trait method declared without `&self`
-...
-LL |     fn foo(&self) {}
-   |     ^^^^^^^^^^^^^ `&self` used in impl
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0185`.
diff --git a/src/test/ui/error-codes/E0186.rs b/src/test/ui/error-codes/E0186.rs
deleted file mode 100644
index 83ef78ef2c0..00000000000
--- a/src/test/ui/error-codes/E0186.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-trait Foo {
-    fn foo(&self); //~ `&self` used in trait
-}
-
-struct Bar;
-
-impl Foo for Bar {
-    fn foo() {} //~ ERROR E0186
-    //~^ expected `&self` in impl
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0186.stderr b/src/test/ui/error-codes/E0186.stderr
deleted file mode 100644
index 8971d61fc75..00000000000
--- a/src/test/ui/error-codes/E0186.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0186]: method `foo` has a `&self` declaration in the trait, but not in the impl
-  --> $DIR/E0186.rs:8:5
-   |
-LL |     fn foo(&self);
-   |     -------------- `&self` used in trait
-...
-LL |     fn foo() {}
-   |     ^^^^^^^^ expected `&self` in impl
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0186`.
diff --git a/src/test/ui/error-codes/E0191.rs b/src/test/ui/error-codes/E0191.rs
deleted file mode 100644
index 22f739b9e76..00000000000
--- a/src/test/ui/error-codes/E0191.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-trait Trait {
-    type Bar;
-}
-
-type Foo = dyn Trait; //~ ERROR E0191
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0191.stderr b/src/test/ui/error-codes/E0191.stderr
deleted file mode 100644
index cf80c9c46ca..00000000000
--- a/src/test/ui/error-codes/E0191.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0191]: the value of the associated type `Bar` (from trait `Trait`) must be specified
-  --> $DIR/E0191.rs:5:16
-   |
-LL |     type Bar;
-   |     -------- `Bar` defined here
-...
-LL | type Foo = dyn Trait;
-   |                ^^^^^ help: specify the associated type: `Trait<Bar = Type>`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0191`.
diff --git a/src/test/ui/error-codes/E0194.rs b/src/test/ui/error-codes/E0194.rs
deleted file mode 100644
index 8a43f38fcfd..00000000000
--- a/src/test/ui/error-codes/E0194.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-trait Foo<T> {
-    fn do_something(&self) -> T;
-    fn do_something_else<T: Clone>(&self, bar: T);
-    //~^ ERROR E0403
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0194.stderr b/src/test/ui/error-codes/E0194.stderr
deleted file mode 100644
index f2c908eea0b..00000000000
--- a/src/test/ui/error-codes/E0194.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0403]: the name `T` is already used for a generic parameter in this item's generic parameters
-  --> $DIR/E0194.rs:3:26
-   |
-LL | trait Foo<T> {
-   |           - first use of `T`
-LL |     fn do_something(&self) -> T;
-LL |     fn do_something_else<T: Clone>(&self, bar: T);
-   |                          ^ already used
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0403`.
diff --git a/src/test/ui/error-codes/E0195.rs b/src/test/ui/error-codes/E0195.rs
deleted file mode 100644
index f712ee42b8c..00000000000
--- a/src/test/ui/error-codes/E0195.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-trait Trait {
-    fn bar<'a,'b:'a>(x: &'a str, y: &'b str);
-    //~^ NOTE lifetimes in impl do not match this method in trait
-}
-
-struct Foo;
-
-impl Trait for Foo {
-    fn bar<'a,'b>(x: &'a str, y: &'b str) { //~ ERROR E0195
-    //~^ NOTE lifetimes do not match method in trait
-    }
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0195.stderr b/src/test/ui/error-codes/E0195.stderr
deleted file mode 100644
index 6eaa1750ee3..00000000000
--- a/src/test/ui/error-codes/E0195.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0195]: lifetime parameters or bounds on method `bar` do not match the trait declaration
-  --> $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
-...
-LL |     fn bar<'a,'b>(x: &'a str, y: &'b str) {
-   |           ^^^^^^^ lifetimes do not match method in trait
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0195`.
diff --git a/src/test/ui/error-codes/E0197.rs b/src/test/ui/error-codes/E0197.rs
deleted file mode 100644
index 4025a1f6c33..00000000000
--- a/src/test/ui/error-codes/E0197.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-struct Foo;
-
-unsafe impl Foo { } //~ ERROR E0197
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0197.stderr b/src/test/ui/error-codes/E0197.stderr
deleted file mode 100644
index 35e1042649e..00000000000
--- a/src/test/ui/error-codes/E0197.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0197]: inherent impls cannot be unsafe
-  --> $DIR/E0197.rs:3:13
-   |
-LL | unsafe impl Foo { }
-   | ------      ^^^ inherent impl for this type
-   | |
-   | unsafe because of this
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0197`.
diff --git a/src/test/ui/error-codes/E0198.rs b/src/test/ui/error-codes/E0198.rs
deleted file mode 100644
index 041bbe8fdcf..00000000000
--- a/src/test/ui/error-codes/E0198.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#![feature(negative_impls)]
-
-struct Foo;
-
-unsafe impl !Send for Foo { } //~ ERROR E0198
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0198.stderr b/src/test/ui/error-codes/E0198.stderr
deleted file mode 100644
index bb2efefb427..00000000000
--- a/src/test/ui/error-codes/E0198.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0198]: negative impls cannot be unsafe
-  --> $DIR/E0198.rs:5:13
-   |
-LL | unsafe impl !Send for Foo { }
-   | ------      -^^^^
-   | |           |
-   | |           negative because of this
-   | unsafe because of this
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0198`.
diff --git a/src/test/ui/error-codes/E0199.rs b/src/test/ui/error-codes/E0199.rs
deleted file mode 100644
index 2421bf0a55f..00000000000
--- a/src/test/ui/error-codes/E0199.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-#![feature(negative_impls)]
-
-struct Foo;
-
-trait Bar { }
-unsafe impl Bar for Foo { } //~ ERROR implementing the trait `Bar` is not unsafe [E0199]
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0199.stderr b/src/test/ui/error-codes/E0199.stderr
deleted file mode 100644
index 68c308b15cc..00000000000
--- a/src/test/ui/error-codes/E0199.stderr
+++ /dev/null
@@ -1,15 +0,0 @@
-error[E0199]: implementing the trait `Bar` is not unsafe
-  --> $DIR/E0199.rs:6:1
-   |
-LL | unsafe impl Bar for Foo { }
-   | ^^^^^^^^^^^^^^^^^^^^^^^
-   |
-help: remove `unsafe` from this trait implementation
-   |
-LL - unsafe impl Bar for Foo { }
-LL + impl Bar for Foo { }
-   |
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0199`.
diff --git a/src/test/ui/error-codes/E0200.rs b/src/test/ui/error-codes/E0200.rs
deleted file mode 100644
index 24806a6cbb0..00000000000
--- a/src/test/ui/error-codes/E0200.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-struct Foo;
-
-unsafe trait Bar { }
-
-impl Bar for Foo { } //~ ERROR E0200
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0200.stderr b/src/test/ui/error-codes/E0200.stderr
deleted file mode 100644
index c70a2d4f3d1..00000000000
--- a/src/test/ui/error-codes/E0200.stderr
+++ /dev/null
@@ -1,15 +0,0 @@
-error[E0200]: the trait `Bar` requires an `unsafe impl` declaration
-  --> $DIR/E0200.rs:5:1
-   |
-LL | impl Bar for Foo { }
-   | ^^^^^^^^^^^^^^^^
-   |
-   = note: the trait `Bar` enforces invariants that the compiler can't check. Review the trait documentation and make sure this implementation upholds those invariants before adding the `unsafe` keyword
-help: add `unsafe` to this trait implementation
-   |
-LL | unsafe impl Bar for Foo { }
-   | ++++++
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0200`.
diff --git a/src/test/ui/error-codes/E0201.rs b/src/test/ui/error-codes/E0201.rs
deleted file mode 100644
index 04b37091b2f..00000000000
--- a/src/test/ui/error-codes/E0201.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-struct Foo(u8);
-
-impl Foo {
-    fn bar(&self) -> bool { self.0 > 5 }
-    fn bar() {} //~ ERROR E0592
-}
-
-trait Baz {
-    type Quux;
-    fn baz(&self) -> bool;
-}
-
-impl Baz for Foo {
-    type Quux = u32;
-
-    fn baz(&self) -> bool { true }
-    fn baz(&self) -> bool { self.0 > 5 } //~ ERROR E0201
-    type Quux = u32; //~ ERROR E0201
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0201.stderr b/src/test/ui/error-codes/E0201.stderr
deleted file mode 100644
index 608ff691776..00000000000
--- a/src/test/ui/error-codes/E0201.stderr
+++ /dev/null
@@ -1,35 +0,0 @@
-error[E0201]: duplicate definitions with name `baz`:
-  --> $DIR/E0201.rs:17:5
-   |
-LL |     fn baz(&self) -> bool;
-   |     ---------------------- item in trait
-...
-LL |     fn baz(&self) -> bool { true }
-   |     ------------------------------ previous definition here
-LL |     fn baz(&self) -> bool { self.0 > 5 }
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ duplicate definition
-
-error[E0201]: duplicate definitions with name `Quux`:
-  --> $DIR/E0201.rs:18:5
-   |
-LL |     type Quux;
-   |     ---------- item in trait
-...
-LL |     type Quux = u32;
-   |     ---------------- previous definition here
-...
-LL |     type Quux = u32;
-   |     ^^^^^^^^^^^^^^^^ duplicate definition
-
-error[E0592]: duplicate definitions with name `bar`
-  --> $DIR/E0201.rs:5:5
-   |
-LL |     fn bar(&self) -> bool { self.0 > 5 }
-   |     --------------------- other definition for `bar`
-LL |     fn bar() {}
-   |     ^^^^^^^^ duplicate definitions for `bar`
-
-error: aborting due to 3 previous errors
-
-Some errors have detailed explanations: E0201, E0592.
-For more information about an error, try `rustc --explain E0201`.
diff --git a/src/test/ui/error-codes/E0206.rs b/src/test/ui/error-codes/E0206.rs
deleted file mode 100644
index 0f3d427ce11..00000000000
--- a/src/test/ui/error-codes/E0206.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#[derive(Copy, Clone)]
-struct Bar;
-
-impl Copy for &'static mut Bar { }
-//~^ ERROR the trait `Copy` may not be implemented for this type
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0206.stderr b/src/test/ui/error-codes/E0206.stderr
deleted file mode 100644
index 57ae2647d33..00000000000
--- a/src/test/ui/error-codes/E0206.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0206]: the trait `Copy` may not be implemented for this type
-  --> $DIR/E0206.rs:4:15
-   |
-LL | impl Copy for &'static mut Bar { }
-   |               ^^^^^^^^^^^^^^^^ type is not a structure or enumeration
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0206`.
diff --git a/src/test/ui/error-codes/E0207.rs b/src/test/ui/error-codes/E0207.rs
deleted file mode 100644
index 7f5d4ab5133..00000000000
--- a/src/test/ui/error-codes/E0207.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-struct Foo;
-
-impl<T: Default> Foo { //~ ERROR E0207
-    fn get(&self) -> T {
-        <T as Default>::default()
-    }
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0207.stderr b/src/test/ui/error-codes/E0207.stderr
deleted file mode 100644
index 5ef51ed8692..00000000000
--- a/src/test/ui/error-codes/E0207.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0207]: the type parameter `T` is not constrained by the impl trait, self type, or predicates
-  --> $DIR/E0207.rs:3:6
-   |
-LL | impl<T: Default> Foo {
-   |      ^ unconstrained type parameter
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0207`.
diff --git a/src/test/ui/error-codes/E0214.rs b/src/test/ui/error-codes/E0214.rs
deleted file mode 100644
index fd73189f970..00000000000
--- a/src/test/ui/error-codes/E0214.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index e0179aac27f..00000000000
--- a/src/test/ui/error-codes/E0214.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error[E0214]: parenthesized type parameters may only be used with a `Fn` trait
-  --> $DIR/E0214.rs:2:12
-   |
-LL |     let v: Vec(&str) = vec!["foo"];
-   |            ^^^^^^^^^ only `Fn` traits may use parentheses
-   |
-help: use angle brackets instead
-   |
-LL |     let v: Vec<&str> = vec!["foo"];
-   |               ~    ~
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0214`.
diff --git a/src/test/ui/error-codes/E0220.rs b/src/test/ui/error-codes/E0220.rs
deleted file mode 100644
index e11a570df79..00000000000
--- a/src/test/ui/error-codes/E0220.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-trait Trait {
-    type Bar;
-}
-
-type Foo = dyn Trait<F=i32>; //~ ERROR E0220
-                             //~| ERROR E0191
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0220.stderr b/src/test/ui/error-codes/E0220.stderr
deleted file mode 100644
index 11763ce788d..00000000000
--- a/src/test/ui/error-codes/E0220.stderr
+++ /dev/null
@@ -1,19 +0,0 @@
-error[E0220]: associated type `F` not found for `Trait`
-  --> $DIR/E0220.rs:5:22
-   |
-LL | type Foo = dyn Trait<F=i32>;
-   |                      ^ associated type `F` not found
-
-error[E0191]: the value of the associated type `Bar` (from trait `Trait`) must be specified
-  --> $DIR/E0220.rs:5:16
-   |
-LL |     type Bar;
-   |     -------- `Bar` defined here
-...
-LL | type Foo = dyn Trait<F=i32>;
-   |                ^^^^^^^^^^^^ help: specify the associated type: `Trait<F=i32, Bar = Type>`
-
-error: aborting due to 2 previous errors
-
-Some errors have detailed explanations: E0191, E0220.
-For more information about an error, try `rustc --explain E0191`.
diff --git a/src/test/ui/error-codes/E0221.rs b/src/test/ui/error-codes/E0221.rs
deleted file mode 100644
index 7c7e139a098..00000000000
--- a/src/test/ui/error-codes/E0221.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-trait T1 {}
-trait T2 {}
-
-trait Foo {
-    type A: T1;
-}
-
-trait Bar : Foo {
-    type A: T2;
-    fn do_something() {
-        let _: Self::A;
-        //~^ ERROR E0221
-    }
-}
-
-trait T3 {}
-
-trait My : std::str::FromStr {
-    type Err: T3;
-    fn test() {
-        let _: Self::Err;
-        //~^ ERROR E0221
-    }
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0221.stderr b/src/test/ui/error-codes/E0221.stderr
deleted file mode 100644
index 5414d77ad7c..00000000000
--- a/src/test/ui/error-codes/E0221.stderr
+++ /dev/null
@@ -1,39 +0,0 @@
-error[E0221]: ambiguous associated type `A` in bounds of `Self`
-  --> $DIR/E0221.rs:11:16
-   |
-LL |     type A: T1;
-   |     ---------- ambiguous `A` from `Foo`
-...
-LL |     type A: T2;
-   |     ---------- ambiguous `A` from `Bar`
-LL |     fn do_something() {
-LL |         let _: Self::A;
-   |                ^^^^^^^ ambiguous associated type `A`
-   |
-help: use fully qualified syntax to disambiguate
-   |
-LL |         let _: <Self as Foo>::A;
-   |                ~~~~~~~~~~~~~~~
-help: use fully qualified syntax to disambiguate
-   |
-LL |         let _: <Self as Bar>::A;
-   |                ~~~~~~~~~~~~~~~
-
-error[E0221]: ambiguous associated type `Err` in bounds of `Self`
-  --> $DIR/E0221.rs:21:16
-   |
-LL |     type Err: T3;
-   |     ------------ ambiguous `Err` from `My`
-LL |     fn test() {
-LL |         let _: Self::Err;
-   |                ^^^^^^^^^ ambiguous associated type `Err`
-   |
-   = note: associated type `Self` could derive from `FromStr`
-help: use fully qualified syntax to disambiguate
-   |
-LL |         let _: <Self as My>::Err;
-   |                ~~~~~~~~~~~~~~
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0221`.
diff --git a/src/test/ui/error-codes/E0223.rs b/src/test/ui/error-codes/E0223.rs
deleted file mode 100644
index 6031b682d72..00000000000
--- a/src/test/ui/error-codes/E0223.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-trait MyTrait { type X; }
-
-fn main() {
-    let foo: MyTrait::X;
-    //~^ ERROR ambiguous associated type
-}
diff --git a/src/test/ui/error-codes/E0223.stderr b/src/test/ui/error-codes/E0223.stderr
deleted file mode 100644
index 726f39e11f1..00000000000
--- a/src/test/ui/error-codes/E0223.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0223]: ambiguous associated type
-  --> $DIR/E0223.rs:4:14
-   |
-LL |     let foo: MyTrait::X;
-   |              ^^^^^^^^^^ help: use fully-qualified syntax: `<Type as MyTrait>::X`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0223`.
diff --git a/src/test/ui/error-codes/E0225.rs b/src/test/ui/error-codes/E0225.rs
deleted file mode 100644
index b50f68e6451..00000000000
--- a/src/test/ui/error-codes/E0225.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#![feature(trait_alias)]
-
-trait Foo = std::io::Read + std::io::Write;
-
-fn main() {
-    let _: Box<dyn std::io::Read + std::io::Write>;
-    //~^ ERROR only auto traits can be used as additional traits in a trait object [E0225]
-    let _: Box<dyn Foo>;
-    //~^ 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
deleted file mode 100644
index a4b33a0b7b4..00000000000
--- a/src/test/ui/error-codes/E0225.stderr
+++ /dev/null
@@ -1,31 +0,0 @@
-error[E0225]: only auto traits can be used as additional traits in a trait object
-  --> $DIR/E0225.rs:6:36
-   |
-LL |     let _: Box<dyn std::io::Read + std::io::Write>;
-   |                    -------------   ^^^^^^^^^^^^^^ additional non-auto trait
-   |                    |
-   |                    first non-auto trait
-   |
-   = help: consider creating a new trait with all of these as supertraits and using that trait here instead: `trait NewTrait: std::io::Read + std::io::Write {}`
-   = note: auto-traits like `Send` and `Sync` are traits that have special properties; for more information on them, visit <https://doc.rust-lang.org/reference/special-types-and-traits.html#auto-traits>
-
-error[E0225]: only auto traits can be used as additional traits in a trait object
-  --> $DIR/E0225.rs:8:20
-   |
-LL | trait Foo = std::io::Read + std::io::Write;
-   |             -------------   -------------- additional non-auto trait
-   |             |
-   |             first non-auto trait
-...
-LL |     let _: Box<dyn Foo>;
-   |                    ^^^
-   |                    |
-   |                    trait alias used in trait object type (additional use)
-   |                    trait alias used in trait object type (first use)
-   |
-   = help: consider creating a new trait with all of these as supertraits and using that trait here instead: `trait NewTrait: std::io::Read + std::io::Write {}`
-   = note: auto-traits like `Send` and `Sync` are traits that have special properties; for more information on them, visit <https://doc.rust-lang.org/reference/special-types-and-traits.html#auto-traits>
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0225`.
diff --git a/src/test/ui/error-codes/E0227.rs b/src/test/ui/error-codes/E0227.rs
deleted file mode 100644
index 0f0a781d2f9..00000000000
--- a/src/test/ui/error-codes/E0227.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-trait Foo<'foo>: 'foo {}
-trait Bar<'bar>: 'bar {}
-
-trait FooBar<'foo, 'bar>: Foo<'foo> + Bar<'bar> {}
-
-struct Baz<'foo, 'bar> {
-    baz: dyn FooBar<'foo, 'bar>,
-    //~^ ERROR ambiguous lifetime bound, explicit lifetime bound required
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0227.stderr b/src/test/ui/error-codes/E0227.stderr
deleted file mode 100644
index 26de5b4c400..00000000000
--- a/src/test/ui/error-codes/E0227.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0227]: ambiguous lifetime bound, explicit lifetime bound required
-  --> $DIR/E0227.rs:7:10
-   |
-LL |     baz: dyn FooBar<'foo, 'bar>,
-   |          ^^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0227`.
diff --git a/src/test/ui/error-codes/E0229.rs b/src/test/ui/error-codes/E0229.rs
deleted file mode 100644
index 4c1934107a6..00000000000
--- a/src/test/ui/error-codes/E0229.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-pub trait Foo {
-    type A;
-    fn boo(&self) -> <Self as Foo>::A;
-}
-
-struct Bar;
-
-impl Foo for isize {
-    type A = usize;
-    fn boo(&self) -> usize { 42 }
-}
-
-fn baz<I>(x: &<I as Foo<A=Bar>>::A) {}
-//~^ ERROR associated type bindings are not allowed here [E0229]
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0229.stderr b/src/test/ui/error-codes/E0229.stderr
deleted file mode 100644
index 46793314bf9..00000000000
--- a/src/test/ui/error-codes/E0229.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0229]: associated type bindings are not allowed here
-  --> $DIR/E0229.rs:13:25
-   |
-LL | fn baz<I>(x: &<I as Foo<A=Bar>>::A) {}
-   |                         ^^^^^ associated type not allowed here
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0229`.
diff --git a/src/test/ui/error-codes/E0252.rs b/src/test/ui/error-codes/E0252.rs
deleted file mode 100644
index 6b5163417bf..00000000000
--- a/src/test/ui/error-codes/E0252.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-#![allow(non_camel_case_types)]
-
-use foo::baz;
-use bar::baz; //~ ERROR E0252
-
-mod foo {
-    pub struct baz;
-}
-
-mod bar {
-    pub mod baz {}
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0252.stderr b/src/test/ui/error-codes/E0252.stderr
deleted file mode 100644
index 2722dfe5e05..00000000000
--- a/src/test/ui/error-codes/E0252.stderr
+++ /dev/null
@@ -1,17 +0,0 @@
-error[E0252]: the name `baz` is defined multiple times
-  --> $DIR/E0252.rs:4:5
-   |
-LL | use foo::baz;
-   |     -------- previous import of the type `baz` here
-LL | use bar::baz;
-   |     ^^^^^^^^ `baz` reimported here
-   |
-   = note: `baz` must be defined only once in the type namespace of this module
-help: you can use `as` to change the binding name of the import
-   |
-LL | use bar::baz as other_baz;
-   |     ~~~~~~~~~~~~~~~~~~~~~
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0252`.
diff --git a/src/test/ui/error-codes/E0253.rs b/src/test/ui/error-codes/E0253.rs
deleted file mode 100644
index 284b16da8f2..00000000000
--- a/src/test/ui/error-codes/E0253.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-mod foo {
-    pub trait MyTrait {
-        fn do_something();
-    }
-}
-
-use foo::MyTrait::do_something;
-    //~^ ERROR E0253
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0253.stderr b/src/test/ui/error-codes/E0253.stderr
deleted file mode 100644
index 8f21a0aaba5..00000000000
--- a/src/test/ui/error-codes/E0253.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0253]: `do_something` is not directly importable
-  --> $DIR/E0253.rs:7:5
-   |
-LL | use foo::MyTrait::do_something;
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot be imported directly
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0253`.
diff --git a/src/test/ui/error-codes/E0254.rs b/src/test/ui/error-codes/E0254.rs
deleted file mode 100644
index e291268be86..00000000000
--- a/src/test/ui/error-codes/E0254.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-#![allow(non_camel_case_types)]
-
-extern crate alloc;
-
-mod foo {
-    pub trait alloc {
-        fn do_something();
-    }
-}
-
-use foo::alloc;
-//~^ ERROR E0254
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0254.stderr b/src/test/ui/error-codes/E0254.stderr
deleted file mode 100644
index b098f8e1a7f..00000000000
--- a/src/test/ui/error-codes/E0254.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error[E0254]: the name `alloc` is defined multiple times
-  --> $DIR/E0254.rs:11:5
-   |
-LL | extern crate alloc;
-   | ------------------- previous import of the extern crate `alloc` here
-...
-LL | use foo::alloc;
-   |     ^^^^^^^^^^ `alloc` reimported here
-   |
-   = note: `alloc` must be defined only once in the type namespace of this module
-help: you can use `as` to change the binding name of the import
-   |
-LL | use foo::alloc as other_alloc;
-   |     ~~~~~~~~~~~~~~~~~~~~~~~~~
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0254`.
diff --git a/src/test/ui/error-codes/E0255.rs b/src/test/ui/error-codes/E0255.rs
deleted file mode 100644
index d1c21eb79de..00000000000
--- a/src/test/ui/error-codes/E0255.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-use bar::foo;
-
-fn foo() {} //~ ERROR E0255
-
-mod bar {
-     pub fn foo() {}
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0255.stderr b/src/test/ui/error-codes/E0255.stderr
deleted file mode 100644
index 352c5ba5be0..00000000000
--- a/src/test/ui/error-codes/E0255.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error[E0255]: the name `foo` is defined multiple times
-  --> $DIR/E0255.rs:3:1
-   |
-LL | use bar::foo;
-   |     -------- previous import of the value `foo` here
-LL |
-LL | fn foo() {}
-   | ^^^^^^^^ `foo` redefined here
-   |
-   = note: `foo` must be defined only once in the value namespace of this module
-help: you can use `as` to change the binding name of the import
-   |
-LL | use bar::foo as other_foo;
-   |     ~~~~~~~~~~~~~~~~~~~~~
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0255`.
diff --git a/src/test/ui/error-codes/E0259.rs b/src/test/ui/error-codes/E0259.rs
deleted file mode 100644
index e7e94d58635..00000000000
--- a/src/test/ui/error-codes/E0259.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#![feature(rustc_private)]
-
-extern crate alloc;
-
-extern crate libc as alloc;
-//~^ ERROR E0259
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0259.stderr b/src/test/ui/error-codes/E0259.stderr
deleted file mode 100644
index 06cbc5b4fb5..00000000000
--- a/src/test/ui/error-codes/E0259.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error[E0259]: the name `alloc` is defined multiple times
-  --> $DIR/E0259.rs:5:1
-   |
-LL | extern crate alloc;
-   | ------------------- previous import of the extern crate `alloc` here
-LL |
-LL | extern crate libc as alloc;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ `alloc` reimported here
-   |
-   = note: `alloc` must be defined only once in the type namespace of this module
-help: you can use `as` to change the binding name of the import
-   |
-LL | extern crate libc as other_alloc;
-   |
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0259`.
diff --git a/src/test/ui/error-codes/E0260.rs b/src/test/ui/error-codes/E0260.rs
deleted file mode 100644
index f7eb220b08f..00000000000
--- a/src/test/ui/error-codes/E0260.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-extern crate alloc;
-
-mod alloc {
-//~^ ERROR the name `alloc` is defined multiple times [E0260]
-    pub trait MyTrait {
-        fn do_something();
-    }
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0260.stderr b/src/test/ui/error-codes/E0260.stderr
deleted file mode 100644
index 2d3305bd15b..00000000000
--- a/src/test/ui/error-codes/E0260.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error[E0260]: the name `alloc` is defined multiple times
-  --> $DIR/E0260.rs:3:1
-   |
-LL | extern crate alloc;
-   | ------------------- previous import of the extern crate `alloc` here
-LL |
-LL | mod alloc {
-   | ^^^^^^^^^ `alloc` redefined here
-   |
-   = note: `alloc` must be defined only once in the type namespace of this module
-help: you can use `as` to change the binding name of the import
-   |
-LL | extern crate alloc as other_alloc;
-   |
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0260`.
diff --git a/src/test/ui/error-codes/E0261.rs b/src/test/ui/error-codes/E0261.rs
deleted file mode 100644
index f05e09aa0da..00000000000
--- a/src/test/ui/error-codes/E0261.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-fn foo(x: &'a str) { } //~ ERROR E0261
-                       //~| undeclared lifetime
-
-struct Foo {
-    x: &'a str, //~ ERROR E0261
-                //~| undeclared lifetime
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0261.stderr b/src/test/ui/error-codes/E0261.stderr
deleted file mode 100644
index 0eab2dc0ee0..00000000000
--- a/src/test/ui/error-codes/E0261.stderr
+++ /dev/null
@@ -1,19 +0,0 @@
-error[E0261]: use of undeclared lifetime name `'a`
-  --> $DIR/E0261.rs:1:12
-   |
-LL | fn foo(x: &'a str) { }
-   |       -    ^^ undeclared lifetime
-   |       |
-   |       help: consider introducing lifetime `'a` here: `<'a>`
-
-error[E0261]: use of undeclared lifetime name `'a`
-  --> $DIR/E0261.rs:5:9
-   |
-LL | struct Foo {
-   |           - help: consider introducing lifetime `'a` here: `<'a>`
-LL |     x: &'a str,
-   |         ^^ undeclared lifetime
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0261`.
diff --git a/src/test/ui/error-codes/E0262.rs b/src/test/ui/error-codes/E0262.rs
deleted file mode 100644
index 55264f1387f..00000000000
--- a/src/test/ui/error-codes/E0262.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-fn foo<'static>(x: &'static str) { } //~ ERROR E0262
-                                     //~| 'static is a reserved lifetime name
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0262.stderr b/src/test/ui/error-codes/E0262.stderr
deleted file mode 100644
index ad90b717126..00000000000
--- a/src/test/ui/error-codes/E0262.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0262]: invalid lifetime parameter name: `'static`
-  --> $DIR/E0262.rs:1:8
-   |
-LL | fn foo<'static>(x: &'static str) { }
-   |        ^^^^^^^ 'static is a reserved lifetime name
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0262`.
diff --git a/src/test/ui/error-codes/E0263.rs b/src/test/ui/error-codes/E0263.rs
deleted file mode 100644
index 92917678e4c..00000000000
--- a/src/test/ui/error-codes/E0263.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-fn foo<'a, 'b, 'a>(x: &'a str, y: &'b str) {
-    //~^ ERROR E0403
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0263.stderr b/src/test/ui/error-codes/E0263.stderr
deleted file mode 100644
index e3f9aea296a..00000000000
--- a/src/test/ui/error-codes/E0263.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0403]: the name `'a` is already used for a generic parameter in this item's generic parameters
-  --> $DIR/E0263.rs:1:16
-   |
-LL | fn foo<'a, 'b, 'a>(x: &'a str, y: &'b str) {
-   |        --      ^^ already used
-   |        |
-   |        first use of `'a`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0403`.
diff --git a/src/test/ui/error-codes/E0264.rs b/src/test/ui/error-codes/E0264.rs
deleted file mode 100644
index 6adaf01fb52..00000000000
--- a/src/test/ui/error-codes/E0264.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#![feature(lang_items)]
-
-extern "C" {
-    #[lang = "cake"]
-    fn cake(); //~ ERROR E0264
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0264.stderr b/src/test/ui/error-codes/E0264.stderr
deleted file mode 100644
index e8e35a12cbb..00000000000
--- a/src/test/ui/error-codes/E0264.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0264]: unknown external lang item: `cake`
-  --> $DIR/E0264.rs:5:5
-   |
-LL |     fn cake();
-   |     ^^^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0264`.
diff --git a/src/test/ui/error-codes/E0267.rs b/src/test/ui/error-codes/E0267.rs
deleted file mode 100644
index 45e875a0a3c..00000000000
--- a/src/test/ui/error-codes/E0267.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 1f8657373ef..00000000000
--- a/src/test/ui/error-codes/E0267.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0267]: `break` inside of a closure
-  --> $DIR/E0267.rs:2:18
-   |
-LL |     let w = || { break; };
-   |             --   ^^^^^ cannot `break` inside of a closure
-   |             |
-   |             enclosing closure
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0267`.
diff --git a/src/test/ui/error-codes/E0268.rs b/src/test/ui/error-codes/E0268.rs
deleted file mode 100644
index 742ba5441d6..00000000000
--- a/src/test/ui/error-codes/E0268.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn main() {
-    break; //~ ERROR E0268
-}
diff --git a/src/test/ui/error-codes/E0268.stderr b/src/test/ui/error-codes/E0268.stderr
deleted file mode 100644
index 6422e8a9490..00000000000
--- a/src/test/ui/error-codes/E0268.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0268]: `break` outside of a loop or labeled block
-  --> $DIR/E0268.rs:2:5
-   |
-LL |     break;
-   |     ^^^^^ cannot `break` outside of a loop or labeled block
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0268`.
diff --git a/src/test/ui/error-codes/E0271.rs b/src/test/ui/error-codes/E0271.rs
deleted file mode 100644
index f2719075434..00000000000
--- a/src/test/ui/error-codes/E0271.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-trait Trait { type AssociatedType; }
-
-fn foo<T>(t: T) where T: Trait<AssociatedType=u32> {
-    println!("in foo");
-}
-
-impl Trait for i8 { type AssociatedType = &'static str; }
-
-fn main() {
-    foo(3_i8); //~ ERROR E0271
-}
diff --git a/src/test/ui/error-codes/E0271.stderr b/src/test/ui/error-codes/E0271.stderr
deleted file mode 100644
index 1e2f4383459..00000000000
--- a/src/test/ui/error-codes/E0271.stderr
+++ /dev/null
@@ -1,22 +0,0 @@
-error[E0271]: type mismatch resolving `<i8 as Trait>::AssociatedType == u32`
-  --> $DIR/E0271.rs:10:9
-   |
-LL |     foo(3_i8);
-   |     --- ^^^^ type mismatch resolving `<i8 as Trait>::AssociatedType == u32`
-   |     |
-   |     required by a bound introduced by this call
-   |
-note: expected this to be `u32`
-  --> $DIR/E0271.rs:7:43
-   |
-LL | impl Trait for i8 { type AssociatedType = &'static str; }
-   |                                           ^^^^^^^^^^^^
-note: required by a bound in `foo`
-  --> $DIR/E0271.rs:3:32
-   |
-LL | fn foo<T>(t: T) where T: Trait<AssociatedType=u32> {
-   |                                ^^^^^^^^^^^^^^^^^^ required by this bound in `foo`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0271`.
diff --git a/src/test/ui/error-codes/E0275.rs b/src/test/ui/error-codes/E0275.rs
deleted file mode 100644
index 95d7f85f105..00000000000
--- a/src/test/ui/error-codes/E0275.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// normalize-stderr-test: "long-type-\d+" -> "long-type-hash"
-trait Foo {}
-
-struct Bar<T>(T);
-
-impl<T> Foo for T where Bar<T>: Foo {} //~ ERROR E0275
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0275.stderr b/src/test/ui/error-codes/E0275.stderr
deleted file mode 100644
index 451a683ac8a..00000000000
--- a/src/test/ui/error-codes/E0275.stderr
+++ /dev/null
@@ -1,19 +0,0 @@
-error[E0275]: overflow evaluating the requirement `Bar<Bar<Bar<Bar<Bar<Bar<Bar<...>>>>>>>: Foo`
-  --> $DIR/E0275.rs:6:33
-   |
-LL | impl<T> Foo for T where Bar<T>: Foo {}
-   |                                 ^^^
-   |
-   = help: consider increasing the recursion limit by adding a `#![recursion_limit = "256"]` attribute to your crate (`E0275`)
-note: required for `Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<...>>>>>>>>>>>>>>>>>>>>>` to implement `Foo`
-  --> $DIR/E0275.rs:6:9
-   |
-LL | impl<T> Foo for T where Bar<T>: Foo {}
-   |         ^^^     ^
-   = note: the full type name has been written to '$TEST_BUILD_DIR/error-codes/E0275/E0275.long-type-hash.txt'
-   = note: 127 redundant requirements hidden
-   = note: required for `Bar<T>` to implement `Foo`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0275`.
diff --git a/src/test/ui/error-codes/E0276.rs b/src/test/ui/error-codes/E0276.rs
deleted file mode 100644
index 5e3d9f602ad..00000000000
--- a/src/test/ui/error-codes/E0276.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-trait Foo {
-    fn foo<T>(x: T);
-}
-
-impl Foo for bool {
-    fn foo<T>(x: T) where T: Copy {} //~ ERROR E0276
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0276.stderr b/src/test/ui/error-codes/E0276.stderr
deleted file mode 100644
index 1013f041bbe..00000000000
--- a/src/test/ui/error-codes/E0276.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0276]: impl has stricter requirements than trait
-  --> $DIR/E0276.rs:6:30
-   |
-LL |     fn foo<T>(x: T);
-   |     ---------------- definition of `foo` from trait
-...
-LL |     fn foo<T>(x: T) where T: Copy {}
-   |                              ^^^^ impl has extra requirement `T: Copy`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0276`.
diff --git a/src/test/ui/error-codes/E0277-2.rs b/src/test/ui/error-codes/E0277-2.rs
deleted file mode 100644
index 428518705b8..00000000000
--- a/src/test/ui/error-codes/E0277-2.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-struct Foo {
-    bar: Bar
-}
-
-struct Bar {
-    baz: Baz
-}
-
-struct Baz {
-    x: *const u8
-}
-
-fn is_send<T: Send>() { }
-
-fn main() {
-    is_send::<Foo>();
-    //~^ ERROR `*const u8` cannot be sent between threads safely
-}
diff --git a/src/test/ui/error-codes/E0277-2.stderr b/src/test/ui/error-codes/E0277-2.stderr
deleted file mode 100644
index a2abf37931a..00000000000
--- a/src/test/ui/error-codes/E0277-2.stderr
+++ /dev/null
@@ -1,31 +0,0 @@
-error[E0277]: `*const u8` cannot be sent between threads safely
-  --> $DIR/E0277-2.rs:16:15
-   |
-LL |     is_send::<Foo>();
-   |               ^^^ `*const u8` cannot be sent between threads safely
-   |
-   = help: within `Foo`, the trait `Send` is not implemented for `*const u8`
-note: required because it appears within the type `Baz`
-  --> $DIR/E0277-2.rs:9:8
-   |
-LL | struct Baz {
-   |        ^^^
-note: required because it appears within the type `Bar`
-  --> $DIR/E0277-2.rs:5:8
-   |
-LL | struct Bar {
-   |        ^^^
-note: required because it appears within the type `Foo`
-  --> $DIR/E0277-2.rs:1:8
-   |
-LL | struct Foo {
-   |        ^^^
-note: required by a bound in `is_send`
-  --> $DIR/E0277-2.rs:13:15
-   |
-LL | fn is_send<T: Send>() { }
-   |               ^^^^ required by this bound in `is_send`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/error-codes/E0277-3.rs b/src/test/ui/error-codes/E0277-3.rs
deleted file mode 100644
index 428be79617d..00000000000
--- a/src/test/ui/error-codes/E0277-3.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-fn foo<T: PartialEq>(_: T) {}
-
-struct S;
-
-fn main() {
-    foo(S);
-    //~^ ERROR can't compare `S` with `S`
-}
diff --git a/src/test/ui/error-codes/E0277-3.stderr b/src/test/ui/error-codes/E0277-3.stderr
deleted file mode 100644
index 0127e1ccc81..00000000000
--- a/src/test/ui/error-codes/E0277-3.stderr
+++ /dev/null
@@ -1,22 +0,0 @@
-error[E0277]: can't compare `S` with `S`
-  --> $DIR/E0277-3.rs:6:9
-   |
-LL |     foo(S);
-   |     --- ^ no implementation for `S == S`
-   |     |
-   |     required by a bound introduced by this call
-   |
-   = help: the trait `PartialEq` is not implemented for `S`
-note: required by a bound in `foo`
-  --> $DIR/E0277-3.rs:1:11
-   |
-LL | fn foo<T: PartialEq>(_: T) {}
-   |           ^^^^^^^^^ required by this bound in `foo`
-help: consider annotating `S` with `#[derive(PartialEq)]`
-   |
-LL | #[derive(PartialEq)]
-   |
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/error-codes/E0277.rs b/src/test/ui/error-codes/E0277.rs
deleted file mode 100644
index f0de4e3deb1..00000000000
--- a/src/test/ui/error-codes/E0277.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use std::path::Path;
-
-trait Foo {
-    fn bar(&self);
-}
-
-fn some_func<T: Foo>(foo: T) {
-    foo.bar();
-}
-
-fn f(p: Path) { }
-//~^ ERROR the size for values of type
-
-fn main() {
-    some_func(5i32);
-    //~^ ERROR the trait bound `i32: Foo` is not satisfied
-}
diff --git a/src/test/ui/error-codes/E0277.stderr b/src/test/ui/error-codes/E0277.stderr
deleted file mode 100644
index 2b4784d7ecc..00000000000
--- a/src/test/ui/error-codes/E0277.stderr
+++ /dev/null
@@ -1,31 +0,0 @@
-error[E0277]: the size for values of type `[u8]` cannot be known at compilation time
-  --> $DIR/E0277.rs:11:6
-   |
-LL | fn f(p: Path) { }
-   |      ^ doesn't have a size known at compile-time
-   |
-   = help: within `Path`, the trait `Sized` is not implemented for `[u8]`
-   = note: required because it appears within the type `Path`
-   = help: unsized fn params are gated as an unstable feature
-help: function arguments must have a statically known size, borrowed types always have a known size
-   |
-LL | fn f(p: &Path) { }
-   |         +
-
-error[E0277]: the trait bound `i32: Foo` is not satisfied
-  --> $DIR/E0277.rs:15:15
-   |
-LL |     some_func(5i32);
-   |     --------- ^^^^ the trait `Foo` is not implemented for `i32`
-   |     |
-   |     required by a bound introduced by this call
-   |
-note: required by a bound in `some_func`
-  --> $DIR/E0277.rs:7:17
-   |
-LL | fn some_func<T: Foo>(foo: T) {
-   |                 ^^^ required by this bound in `some_func`
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/error-codes/E0282.rs b/src/test/ui/error-codes/E0282.rs
deleted file mode 100644
index f1f93b3aed6..00000000000
--- a/src/test/ui/error-codes/E0282.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 892d3a81f27..00000000000
--- a/src/test/ui/error-codes/E0282.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error[E0282]: type annotations needed
-  --> $DIR/E0282.rs:2:9
-   |
-LL |     let x = "hello".chars().rev().collect();
-   |         ^
-   |
-help: consider giving `x` an explicit type
-   |
-LL |     let x: Vec<_> = "hello".chars().rev().collect();
-   |          ++++++++
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0282`.
diff --git a/src/test/ui/error-codes/E0283.rs b/src/test/ui/error-codes/E0283.rs
deleted file mode 100644
index 0643af4b7e8..00000000000
--- a/src/test/ui/error-codes/E0283.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-trait Generator {
-    fn create() -> u32;
-}
-
-struct Impl;
-
-impl Generator for Impl {
-    fn create() -> u32 { 1 }
-}
-
-impl Impl {
-    fn new() -> Self {
-        Impl{}
-    }
-}
-
-impl Into<u32> for Impl {
-    fn into(self) -> u32 { 1 }
-}
-
-fn foo(bar: u32) {}
-
-struct AnotherImpl;
-
-impl Generator for AnotherImpl {
-    fn create() -> u32 { 2 }
-}
-
-fn main() {
-    let cont: u32 = Generator::create(); //~ ERROR E0790
-}
-
-fn buzz() {
-    let foo_impl = Impl::new();
-    let bar = foo_impl.into() * 1u32; //~ ERROR E0283
-    foo(bar);
-}
diff --git a/src/test/ui/error-codes/E0283.stderr b/src/test/ui/error-codes/E0283.stderr
deleted file mode 100644
index 90316c6e981..00000000000
--- a/src/test/ui/error-codes/E0283.stderr
+++ /dev/null
@@ -1,37 +0,0 @@
-error[E0790]: cannot call associated function on trait without specifying the corresponding `impl` type
-  --> $DIR/E0283.rs:30:21
-   |
-LL |     fn create() -> u32;
-   |     ------------------- `Generator::create` defined here
-...
-LL |     let cont: u32 = Generator::create();
-   |                     ^^^^^^^^^^^^^^^^^ cannot call associated function of trait
-   |
-help: use a fully-qualified path to a specific available implementation (2 found)
-   |
-LL |     let cont: u32 = <Impl as Generator>::create();
-   |                     ++++++++          +
-
-error[E0283]: type annotations needed
-  --> $DIR/E0283.rs:35:24
-   |
-LL |     let bar = foo_impl.into() * 1u32;
-   |                        ^^^^
-   |
-note: multiple `impl`s satisfying `Impl: Into<_>` found
-  --> $DIR/E0283.rs:17:1
-   |
-LL | impl Into<u32> for Impl {
-   | ^^^^^^^^^^^^^^^^^^^^^^^
-   = note: and another `impl` found in the `core` crate:
-           - impl<T, U> Into<U> for T
-             where U: From<T>;
-help: try using a fully qualified path to specify the expected types
-   |
-LL |     let bar = <Impl as Into<T>>::into(foo_impl) * 1u32;
-   |               ++++++++++++++++++++++++        ~
-
-error: aborting due to 2 previous errors
-
-Some errors have detailed explanations: E0283, E0790.
-For more information about an error, try `rustc --explain E0283`.
diff --git a/src/test/ui/error-codes/E0297.rs b/src/test/ui/error-codes/E0297.rs
deleted file mode 100644
index 27c7960d977..00000000000
--- a/src/test/ui/error-codes/E0297.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-fn main() {
-    let xs : Vec<Option<i32>> = vec![Some(1), None];
-
-    for Some(x) in xs {}
-    //~^ ERROR E0005
-}
diff --git a/src/test/ui/error-codes/E0297.stderr b/src/test/ui/error-codes/E0297.stderr
deleted file mode 100644
index 903422f3b9b..00000000000
--- a/src/test/ui/error-codes/E0297.stderr
+++ /dev/null
@@ -1,16 +0,0 @@
-error[E0005]: refutable pattern in `for` loop binding: `None` not covered
-  --> $DIR/E0297.rs:4:9
-   |
-LL |     for Some(x) in xs {}
-   |         ^^^^^^^ pattern `None` not covered
-   |
-note: `Option<i32>` defined here
-  --> $SRC_DIR/core/src/option.rs:LL:COL
-  ::: $SRC_DIR/core/src/option.rs:LL:COL
-   |
-   = note: not covered
-   = note: the matched value is of type `Option<i32>`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0005`.
diff --git a/src/test/ui/error-codes/E0308-2.rs b/src/test/ui/error-codes/E0308-2.rs
deleted file mode 100644
index 157f992da99..00000000000
--- a/src/test/ui/error-codes/E0308-2.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-trait DynEq {}
-
-impl<'a> PartialEq for &'a (dyn DynEq + 'static) {
-    fn eq(&self, _other: &Self) -> bool {
-        true
-    }
-}
-
-impl Eq for &dyn DynEq {} //~ ERROR E0308
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0308-2.stderr b/src/test/ui/error-codes/E0308-2.stderr
deleted file mode 100644
index de54a417253..00000000000
--- a/src/test/ui/error-codes/E0308-2.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/E0308-2.rs:9:6
-   |
-LL | impl Eq for &dyn DynEq {}
-   |      ^^ lifetime mismatch
-   |
-   = note: expected trait `<&dyn DynEq as PartialEq>`
-              found trait `<&(dyn DynEq + 'static) as PartialEq>`
-note: the anonymous lifetime as defined here...
-  --> $DIR/E0308-2.rs:9:13
-   |
-LL | impl Eq for &dyn DynEq {}
-   |             ^
-   = note: ...does not necessarily outlive the static lifetime
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/error-codes/E0308-4.rs b/src/test/ui/error-codes/E0308-4.rs
deleted file mode 100644
index aaf7ef5bd79..00000000000
--- a/src/test/ui/error-codes/E0308-4.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-fn main() {
-    let x = 1u8;
-    match x {
-        0u8..=3i8 => (), //~ ERROR E0308
-        _ => ()
-    }
-}
diff --git a/src/test/ui/error-codes/E0308-4.stderr b/src/test/ui/error-codes/E0308-4.stderr
deleted file mode 100644
index 39c06763737..00000000000
--- a/src/test/ui/error-codes/E0308-4.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/E0308-4.rs:4:15
-   |
-LL |     match x {
-   |           - this expression has type `u8`
-LL |         0u8..=3i8 => (),
-   |         ---   ^^^ expected `u8`, found `i8`
-   |         |
-   |         this is of type `u8`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/error-codes/E0308.rs b/src/test/ui/error-codes/E0308.rs
deleted file mode 100644
index dd9e0b284ea..00000000000
--- a/src/test/ui/error-codes/E0308.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#![feature(intrinsics)]
-#![feature(rustc_attrs)]
-
-extern "rust-intrinsic" {
-    #[rustc_safe_intrinsic]
-    fn size_of<T>(); //~ ERROR E0308
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0308.stderr b/src/test/ui/error-codes/E0308.stderr
deleted file mode 100644
index 187b775f92d..00000000000
--- a/src/test/ui/error-codes/E0308.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0308]: intrinsic has wrong type
-  --> $DIR/E0308.rs:6:5
-   |
-LL |     fn size_of<T>();
-   |     ^^^^^^^^^^^^^^^^ expected `()`, found `usize`
-   |
-   = note: expected fn pointer `extern "rust-intrinsic" fn()`
-              found fn pointer `extern "rust-intrinsic" fn() -> usize`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/error-codes/E0311.rs b/src/test/ui/error-codes/E0311.rs
deleted file mode 100644
index 566b518b433..00000000000
--- a/src/test/ui/error-codes/E0311.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-fn no_restriction<T>(x: &()) -> &() {
-    with_restriction::<T>(x) //~ ERROR E0311
-}
-
-fn with_restriction<'a, T: 'a>(x: &'a ()) -> &'a () {
-    x
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0311.stderr b/src/test/ui/error-codes/E0311.stderr
deleted file mode 100644
index 9873b5ae6ff..00000000000
--- a/src/test/ui/error-codes/E0311.stderr
+++ /dev/null
@@ -1,24 +0,0 @@
-error[E0311]: the parameter type `T` may not live long enough
-  --> $DIR/E0311.rs:2:5
-   |
-LL |     with_restriction::<T>(x)
-   |     ^^^^^^^^^^^^^^^^^^^^^
-   |
-note: the parameter type `T` must be valid for the anonymous lifetime defined here...
-  --> $DIR/E0311.rs:1:25
-   |
-LL | fn no_restriction<T>(x: &()) -> &() {
-   |                         ^^^
-note: ...so that the type `T` will meet its required lifetime bounds
-  --> $DIR/E0311.rs:2:5
-   |
-LL |     with_restriction::<T>(x)
-   |     ^^^^^^^^^^^^^^^^^^^^^
-help: consider adding an explicit lifetime bound...
-   |
-LL | fn no_restriction<'a, T: 'a>(x: &()) -> &() {
-   |                   +++  ++++
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0311`.
diff --git a/src/test/ui/error-codes/E0328.rs b/src/test/ui/error-codes/E0328.rs
deleted file mode 100644
index ef55f44dd6b..00000000000
--- a/src/test/ui/error-codes/E0328.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#![feature(unsize)]
-
-use std::marker::Unsize;
-
-pub struct MyType;
-
-impl<T> Unsize<T> for MyType {}
-//~^ ERROR explicit impls for the `Unsize` trait are not permitted [E0328]
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0328.stderr b/src/test/ui/error-codes/E0328.stderr
deleted file mode 100644
index 70e6baf69d3..00000000000
--- a/src/test/ui/error-codes/E0328.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0328]: explicit impls for the `Unsize` trait are not permitted
-  --> $DIR/E0328.rs:7:1
-   |
-LL | impl<T> Unsize<T> for MyType {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl of `Unsize` not allowed
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0328`.
diff --git a/src/test/ui/error-codes/E0365.rs b/src/test/ui/error-codes/E0365.rs
deleted file mode 100644
index 464109247c9..00000000000
--- a/src/test/ui/error-codes/E0365.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-mod foo {
-    pub const X: u32 = 1;
-}
-
-pub use foo as foo2;
-//~^ ERROR `foo` is only public within the crate, and cannot be re-exported outside [E0365]
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0365.stderr b/src/test/ui/error-codes/E0365.stderr
deleted file mode 100644
index 5bfcf1394d9..00000000000
--- a/src/test/ui/error-codes/E0365.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0365]: `foo` is only public within the crate, and cannot be re-exported outside
-  --> $DIR/E0365.rs:5:9
-   |
-LL | pub use foo as foo2;
-   |         ^^^^^^^^^^^ re-export of crate public `foo`
-   |
-   = note: consider declaring type or module `foo` with `pub`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0365`.
diff --git a/src/test/ui/error-codes/E0370.rs b/src/test/ui/error-codes/E0370.rs
deleted file mode 100644
index 32a66b63bed..00000000000
--- a/src/test/ui/error-codes/E0370.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#![allow(dead_code)]
-
-#[deny(overflowing_literals)]
-#[repr(i64)]
-enum Foo {
-    X = 0x7fffffffffffffff,
-    Y, //~ ERROR E0370
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0370.stderr b/src/test/ui/error-codes/E0370.stderr
deleted file mode 100644
index 7fb622ee80b..00000000000
--- a/src/test/ui/error-codes/E0370.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0370]: enum discriminant overflowed
-  --> $DIR/E0370.rs:7:5
-   |
-LL |     Y,
-   |     ^ overflowed on value after 9223372036854775807
-   |
-   = note: explicitly set `Y = -9223372036854775808` if that is desired outcome
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0370`.
diff --git a/src/test/ui/error-codes/E0374.rs b/src/test/ui/error-codes/E0374.rs
deleted file mode 100644
index 41fcedc328d..00000000000
--- a/src/test/ui/error-codes/E0374.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#![feature(coerce_unsized)]
-use std::ops::CoerceUnsized;
-
-struct Foo<T: ?Sized> {
-    a: i32,
-}
-
-impl<T, U> CoerceUnsized<Foo<U>> for Foo<T> //~ ERROR E0374
-    where T: CoerceUnsized<U> {}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0374.stderr b/src/test/ui/error-codes/E0374.stderr
deleted file mode 100644
index 68e15e6f8fe..00000000000
--- a/src/test/ui/error-codes/E0374.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0374]: the trait `CoerceUnsized` may only be implemented for a coercion between structures with one field being coerced, none found
-  --> $DIR/E0374.rs:8:1
-   |
-LL | impl<T, U> CoerceUnsized<Foo<U>> for Foo<T>
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0374`.
diff --git a/src/test/ui/error-codes/E0375.rs b/src/test/ui/error-codes/E0375.rs
deleted file mode 100644
index 0c03a8761df..00000000000
--- a/src/test/ui/error-codes/E0375.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-#![feature(coerce_unsized)]
-use std::ops::CoerceUnsized;
-
-struct Foo<T: ?Sized, U: ?Sized> {
-    a: i32,
-    b: T,
-    c: U,
-}
-
-impl<T, U> CoerceUnsized<Foo<U, T>> for Foo<T, U> {}
-//~^ ERROR E0375
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0375.stderr b/src/test/ui/error-codes/E0375.stderr
deleted file mode 100644
index a68b3af5aaf..00000000000
--- a/src/test/ui/error-codes/E0375.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0375]: implementing the trait `CoerceUnsized` requires multiple coercions
-  --> $DIR/E0375.rs:10:12
-   |
-LL | impl<T, U> CoerceUnsized<Foo<U, T>> for Foo<T, U> {}
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^ requires multiple coercions
-   |
-   = note: `CoerceUnsized` may only be implemented for a coercion between structures with one field being coerced
-   = note: currently, 2 fields need coercions: `b` (`T` to `U`), `c` (`U` to `T`)
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0375`.
diff --git a/src/test/ui/error-codes/E0376.rs b/src/test/ui/error-codes/E0376.rs
deleted file mode 100644
index f092eb02c2b..00000000000
--- a/src/test/ui/error-codes/E0376.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#![feature(coerce_unsized)]
-use std::ops::CoerceUnsized;
-
-struct Foo<T: ?Sized> {
-    a: T,
-}
-
-impl<T, U> CoerceUnsized<U> for Foo<T> {} //~ ERROR E0376
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0376.stderr b/src/test/ui/error-codes/E0376.stderr
deleted file mode 100644
index e91efb045c1..00000000000
--- a/src/test/ui/error-codes/E0376.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0376]: the trait `CoerceUnsized` may only be implemented for a coercion between structures
-  --> $DIR/E0376.rs:8:1
-   |
-LL | impl<T, U> CoerceUnsized<U> for Foo<T> {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0376`.
diff --git a/src/test/ui/error-codes/E0377.rs b/src/test/ui/error-codes/E0377.rs
deleted file mode 100644
index 6da2c20956a..00000000000
--- a/src/test/ui/error-codes/E0377.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-#![feature(coerce_unsized)]
-use std::ops::CoerceUnsized;
-
-pub struct Foo<T: ?Sized> {
-    field_with_unsized_type: T,
-}
-
-pub struct Bar<T: ?Sized> {
-    field_with_unsized_type: T,
-}
-
-impl<T, U> CoerceUnsized<Bar<U>> for Foo<T> where T: CoerceUnsized<U> {} //~ ERROR E0377
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0377.stderr b/src/test/ui/error-codes/E0377.stderr
deleted file mode 100644
index bf7d8c8d39d..00000000000
--- a/src/test/ui/error-codes/E0377.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0377]: the trait `CoerceUnsized` may only be implemented for a coercion between structures with the same definition; expected `Foo`, found `Bar`
-  --> $DIR/E0377.rs:12:1
-   |
-LL | impl<T, U> CoerceUnsized<Bar<U>> for Foo<T> where T: CoerceUnsized<U> {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0377`.
diff --git a/src/test/ui/error-codes/E0388.rs b/src/test/ui/error-codes/E0388.rs
deleted file mode 100644
index 6049d95f0d2..00000000000
--- a/src/test/ui/error-codes/E0388.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-static X: i32 = 1;
-const C: i32 = 2;
-
-const CR: &'static mut i32 = &mut C; //~ ERROR mutable references are not allowed
-                                     //~| WARN taking a mutable
-static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR cannot borrow
-                                              //~| ERROR E0658
-                                              //~| ERROR mutable references are not allowed
-
-static CONST_REF: &'static mut i32 = &mut C; //~ ERROR mutable references are not allowed
-                                             //~| WARN taking a mutable
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0388.stderr b/src/test/ui/error-codes/E0388.stderr
deleted file mode 100644
index b51aa263d5e..00000000000
--- a/src/test/ui/error-codes/E0388.stderr
+++ /dev/null
@@ -1,66 +0,0 @@
-warning: taking a mutable reference to a `const` item
-  --> $DIR/E0388.rs:4:30
-   |
-LL | const CR: &'static mut i32 = &mut C;
-   |                              ^^^^^^
-   |
-   = note: each usage of a `const` item creates a new temporary
-   = note: the mutable reference will refer to this temporary, not the original `const` item
-note: `const` item defined here
-  --> $DIR/E0388.rs:2:1
-   |
-LL | const C: i32 = 2;
-   | ^^^^^^^^^^^^
-   = note: `#[warn(const_item_mutation)]` on by default
-
-error[E0764]: mutable references are not allowed in the final value of constants
-  --> $DIR/E0388.rs:4:30
-   |
-LL | const CR: &'static mut i32 = &mut C;
-   |                              ^^^^^^
-
-error[E0658]: mutation through a reference is not allowed in statics
-  --> $DIR/E0388.rs:6:39
-   |
-LL | static STATIC_REF: &'static mut i32 = &mut X;
-   |                                       ^^^^^^
-   |
-   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
-   = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
-
-error[E0764]: mutable references are not allowed in the final value of statics
-  --> $DIR/E0388.rs:6:39
-   |
-LL | static STATIC_REF: &'static mut i32 = &mut X;
-   |                                       ^^^^^^
-
-error[E0596]: cannot borrow immutable static item `X` as mutable
-  --> $DIR/E0388.rs:6:39
-   |
-LL | static STATIC_REF: &'static mut i32 = &mut X;
-   |                                       ^^^^^^ cannot borrow as mutable
-
-warning: taking a mutable reference to a `const` item
-  --> $DIR/E0388.rs:10:38
-   |
-LL | static CONST_REF: &'static mut i32 = &mut C;
-   |                                      ^^^^^^
-   |
-   = note: each usage of a `const` item creates a new temporary
-   = note: the mutable reference will refer to this temporary, not the original `const` item
-note: `const` item defined here
-  --> $DIR/E0388.rs:2:1
-   |
-LL | const C: i32 = 2;
-   | ^^^^^^^^^^^^
-
-error[E0764]: mutable references are not allowed in the final value of statics
-  --> $DIR/E0388.rs:10:38
-   |
-LL | static CONST_REF: &'static mut i32 = &mut C;
-   |                                      ^^^^^^
-
-error: aborting due to 5 previous errors; 2 warnings emitted
-
-Some errors have detailed explanations: E0596, E0658, E0764.
-For more information about an error, try `rustc --explain E0596`.
diff --git a/src/test/ui/error-codes/E0389.rs b/src/test/ui/error-codes/E0389.rs
deleted file mode 100644
index 41172b362f4..00000000000
--- a/src/test/ui/error-codes/E0389.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-struct FancyNum {
-    num: u8,
-}
-
-fn main() {
-    let mut fancy = FancyNum{ num: 5 };
-    let fancy_ref = &(&mut fancy);
-    fancy_ref.num = 6; //~ ERROR cannot assign to `fancy_ref.num`, which is behind a `&` reference
-    println!("{}", fancy_ref.num);
-}
diff --git a/src/test/ui/error-codes/E0389.stderr b/src/test/ui/error-codes/E0389.stderr
deleted file mode 100644
index 51c4c92addf..00000000000
--- a/src/test/ui/error-codes/E0389.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error[E0594]: cannot assign to `fancy_ref.num`, which is behind a `&` reference
-  --> $DIR/E0389.rs:8:5
-   |
-LL |     fancy_ref.num = 6;
-   |     ^^^^^^^^^^^^^^^^^ `fancy_ref` is a `&` reference, so the data it refers to cannot be written
-   |
-help: consider changing this to be a mutable reference
-   |
-LL |     let fancy_ref = &mut (&mut fancy);
-   |                     ~~~~~~~~~~~~~~~~~
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0594`.
diff --git a/src/test/ui/error-codes/E0390.rs b/src/test/ui/error-codes/E0390.rs
deleted file mode 100644
index 507483dec2e..00000000000
--- a/src/test/ui/error-codes/E0390.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-struct Foo {
-    x: i32
-}
-
-impl *mut Foo {} //~ ERROR E0390
-
-impl fn(Foo) {} //~ ERROR E0390
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0390.stderr b/src/test/ui/error-codes/E0390.stderr
deleted file mode 100644
index 0e5a9ca762b..00000000000
--- a/src/test/ui/error-codes/E0390.stderr
+++ /dev/null
@@ -1,19 +0,0 @@
-error[E0390]: cannot define inherent `impl` for primitive types
-  --> $DIR/E0390.rs:5:6
-   |
-LL | impl *mut Foo {}
-   |      ^^^^^^^^
-   |
-   = help: consider using an extension trait instead
-
-error[E0390]: cannot define inherent `impl` for primitive types
-  --> $DIR/E0390.rs:7:6
-   |
-LL | impl fn(Foo) {}
-   |      ^^^^^^^
-   |
-   = help: consider using an extension trait instead
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0390`.
diff --git a/src/test/ui/error-codes/E0392.rs b/src/test/ui/error-codes/E0392.rs
deleted file mode 100644
index c98d900b62a..00000000000
--- a/src/test/ui/error-codes/E0392.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 622402999c3..00000000000
--- a/src/test/ui/error-codes/E0392.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0392]: parameter `T` is never used
-  --> $DIR/E0392.rs:1:10
-   |
-LL | enum Foo<T> { Bar }
-   |          ^ unused parameter
-   |
-   = help: consider removing `T`, referring to it in a field, or using a marker such as `PhantomData`
-   = help: if you intended `T` to be a const parameter, use `const T: usize` instead
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0392`.
diff --git a/src/test/ui/error-codes/E0393.rs b/src/test/ui/error-codes/E0393.rs
deleted file mode 100644
index 0c1a369806d..00000000000
--- a/src/test/ui/error-codes/E0393.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-trait A<T=Self> {}
-
-fn together_we_will_rule_the_galaxy(son: &dyn A) {}
-//~^ ERROR E0393
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0393.stderr b/src/test/ui/error-codes/E0393.stderr
deleted file mode 100644
index d9f70b72930..00000000000
--- a/src/test/ui/error-codes/E0393.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error[E0393]: the type parameter `T` must be explicitly specified
-  --> $DIR/E0393.rs:3:47
-   |
-LL | trait A<T=Self> {}
-   | --------------- type parameter `T` must be specified for this
-LL |
-LL | fn together_we_will_rule_the_galaxy(son: &dyn A) {}
-   |                                               ^ help: set the type parameter to the desired type: `A<T>`
-   |
-   = note: because of the default `Self` reference, type parameters must be specified on object types
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0393`.
diff --git a/src/test/ui/error-codes/E0396-fixed.rs b/src/test/ui/error-codes/E0396-fixed.rs
deleted file mode 100644
index fe20da1a8ea..00000000000
--- a/src/test/ui/error-codes/E0396-fixed.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-#![feature(const_mut_refs)]
-
-const REG_ADDR: *mut u8 = 0x5f3759df as *mut u8;
-
-const VALUE: u8 = unsafe { *REG_ADDR };
-//~^ ERROR evaluation of constant value failed
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0396-fixed.stderr b/src/test/ui/error-codes/E0396-fixed.stderr
deleted file mode 100644
index 2efbd6989ad..00000000000
--- a/src/test/ui/error-codes/E0396-fixed.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0080]: evaluation of constant value failed
-  --> $DIR/E0396-fixed.rs:5:28
-   |
-LL | const VALUE: u8 = unsafe { *REG_ADDR };
-   |                            ^^^^^^^^^ dereferencing pointer failed: 0x5f3759df[noalloc] is a dangling pointer (it has no provenance)
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/error-codes/E0396.rs b/src/test/ui/error-codes/E0396.rs
deleted file mode 100644
index 4415b70e75e..00000000000
--- a/src/test/ui/error-codes/E0396.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-const REG_ADDR: *mut u8 = 0x5f3759df as *mut u8;
-
-const VALUE: u8 = unsafe { *REG_ADDR };
-//~^ ERROR dereferencing raw mutable pointers in constants is unstable
-
-const unsafe fn unreachable() -> ! {
-    use std::convert::Infallible;
-
-    const INFALLIBLE: *mut Infallible = &[] as *const [Infallible] as *const _ as _;
-    match *INFALLIBLE {}
-    //~^ ERROR dereferencing raw mutable pointers in constant functions is unstable
-
-    const BAD: () = unsafe { match *INFALLIBLE {} };
-    //~^ ERROR dereferencing raw mutable pointers in constants is unstable
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0396.stderr b/src/test/ui/error-codes/E0396.stderr
deleted file mode 100644
index 8c87f40674f..00000000000
--- a/src/test/ui/error-codes/E0396.stderr
+++ /dev/null
@@ -1,30 +0,0 @@
-error[E0658]: dereferencing raw mutable pointers in constants is unstable
-  --> $DIR/E0396.rs:3:28
-   |
-LL | const VALUE: u8 = unsafe { *REG_ADDR };
-   |                            ^^^^^^^^^
-   |
-   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
-   = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
-
-error[E0658]: dereferencing raw mutable pointers in constant functions is unstable
-  --> $DIR/E0396.rs:10:11
-   |
-LL |     match *INFALLIBLE {}
-   |           ^^^^^^^^^^^
-   |
-   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
-   = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
-
-error[E0658]: dereferencing raw mutable pointers in constants is unstable
-  --> $DIR/E0396.rs:13:36
-   |
-LL |     const BAD: () = unsafe { match *INFALLIBLE {} };
-   |                                    ^^^^^^^^^^^
-   |
-   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
-   = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
-
-error: aborting due to 3 previous errors
-
-For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/error-codes/E0401.rs b/src/test/ui/error-codes/E0401.rs
deleted file mode 100644
index 8f8d6b87ef2..00000000000
--- a/src/test/ui/error-codes/E0401.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-trait Baz<T> {}
-
-fn foo<T>(x: T) {
-    fn bfnr<U, V: Baz<U>, W: Fn()>(y: T) { //~ ERROR E0401
-    }
-    fn baz<U,
-           V: Baz<U>,
-           W: Fn()>
-           (y: T) { //~ ERROR E0401
-    }
-    bfnr(x);
-    //~^ ERROR type annotations needed
-    //~| ERROR type annotations needed
-}
-
-
-struct A<T> {
-    inner: T,
-}
-
-impl<T> Iterator for A<T> {
-    type Item = u8;
-    fn next(&mut self) -> Option<u8> {
-        fn helper(sel: &Self) -> u8 { //~ ERROR E0401
-            unimplemented!();
-        }
-        Some(helper(self))
-    }
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0401.stderr b/src/test/ui/error-codes/E0401.stderr
deleted file mode 100644
index fa4b91cacef..00000000000
--- a/src/test/ui/error-codes/E0401.stderr
+++ /dev/null
@@ -1,70 +0,0 @@
-error[E0401]: can't use generic parameters from outer function
-  --> $DIR/E0401.rs:4:39
-   |
-LL | fn foo<T>(x: T) {
-   |        - type parameter from outer function
-LL |     fn bfnr<U, V: Baz<U>, W: Fn()>(y: T) {
-   |             -                         ^ use of generic parameter from outer function
-   |             |
-   |             help: try using a local generic parameter instead: `T,`
-
-error[E0401]: can't use generic parameters from outer function
-  --> $DIR/E0401.rs:9:16
-   |
-LL | fn foo<T>(x: T) {
-   |        - type parameter from outer function
-...
-LL |     fn baz<U,
-   |            - help: try using a local generic parameter instead: `T,`
-...
-LL |            (y: T) {
-   |                ^ use of generic parameter from outer function
-
-error[E0401]: can't use generic parameters from outer function
-  --> $DIR/E0401.rs:24:25
-   |
-LL | impl<T> Iterator for A<T> {
-   | ---- `Self` type implicitly declared here, by this `impl`
-...
-LL |         fn helper(sel: &Self) -> u8 {
-   |                         ^^^^
-   |                         |
-   |                         use of generic parameter from outer function
-   |                         use a type here instead
-
-error[E0282]: type annotations needed
-  --> $DIR/E0401.rs:11:5
-   |
-LL |     bfnr(x);
-   |     ^^^^ cannot infer type of the type parameter `U` declared on the function `bfnr`
-   |
-help: consider specifying the generic arguments
-   |
-LL |     bfnr::<U, V, W>(x);
-   |         +++++++++++
-
-error[E0283]: type annotations needed
-  --> $DIR/E0401.rs:11:5
-   |
-LL |     bfnr(x);
-   |     ^^^^ cannot infer type of the type parameter `W` declared on the function `bfnr`
-   |
-   = note: multiple `impl`s satisfying `_: Fn<()>` found in the following crates: `alloc`, `core`:
-           - impl<A, F> Fn<A> for &F
-             where A: Tuple, F: Fn<A>, F: ?Sized;
-           - impl<Args, F, A> Fn<Args> for Box<F, A>
-             where Args: Tuple, F: Fn<Args>, A: Allocator, F: ?Sized;
-note: required by a bound in `bfnr`
-  --> $DIR/E0401.rs:4:30
-   |
-LL |     fn bfnr<U, V: Baz<U>, W: Fn()>(y: T) {
-   |                              ^^^^ required by this bound in `bfnr`
-help: consider specifying the generic arguments
-   |
-LL |     bfnr::<U, V, W>(x);
-   |         +++++++++++
-
-error: aborting due to 5 previous errors
-
-Some errors have detailed explanations: E0282, E0283, E0401.
-For more information about an error, try `rustc --explain E0282`.
diff --git a/src/test/ui/error-codes/E0403.rs b/src/test/ui/error-codes/E0403.rs
deleted file mode 100644
index 8bccb631af4..00000000000
--- a/src/test/ui/error-codes/E0403.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index d76a58a7c80..00000000000
--- a/src/test/ui/error-codes/E0403.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0403]: the name `T` is already used for a generic parameter in this item's generic parameters
-  --> $DIR/E0403.rs:1:11
-   |
-LL | fn foo<T, T>(s: T, u: T) {}
-   |        -  ^ already used
-   |        |
-   |        first use of `T`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0403`.
diff --git a/src/test/ui/error-codes/E0404.rs b/src/test/ui/error-codes/E0404.rs
deleted file mode 100644
index b1733372436..00000000000
--- a/src/test/ui/error-codes/E0404.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-struct Foo;
-struct Bar;
-
-impl Foo for Bar {} //~ ERROR E0404
-
-fn main() {}
-
-fn baz<T: Foo>(_: T) {} //~ ERROR E0404
diff --git a/src/test/ui/error-codes/E0404.stderr b/src/test/ui/error-codes/E0404.stderr
deleted file mode 100644
index 4ccb6c5728e..00000000000
--- a/src/test/ui/error-codes/E0404.stderr
+++ /dev/null
@@ -1,15 +0,0 @@
-error[E0404]: expected trait, found struct `Foo`
-  --> $DIR/E0404.rs:4:6
-   |
-LL | impl Foo for Bar {}
-   |      ^^^ not a trait
-
-error[E0404]: expected trait, found struct `Foo`
-  --> $DIR/E0404.rs:8:11
-   |
-LL | fn baz<T: Foo>(_: T) {}
-   |           ^^^ not a trait
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0404`.
diff --git a/src/test/ui/error-codes/E0405.rs b/src/test/ui/error-codes/E0405.rs
deleted file mode 100644
index f03c4e19b09..00000000000
--- a/src/test/ui/error-codes/E0405.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-struct Foo;
-
-impl SomeTrait for Foo {} //~ ERROR E0405
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0405.stderr b/src/test/ui/error-codes/E0405.stderr
deleted file mode 100644
index a22afe6f3e8..00000000000
--- a/src/test/ui/error-codes/E0405.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0405]: cannot find trait `SomeTrait` in this scope
-  --> $DIR/E0405.rs:3:6
-   |
-LL | impl SomeTrait for Foo {}
-   |      ^^^^^^^^^ not found in this scope
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0405`.
diff --git a/src/test/ui/error-codes/E0407.rs b/src/test/ui/error-codes/E0407.rs
deleted file mode 100644
index 962bd5741e7..00000000000
--- a/src/test/ui/error-codes/E0407.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-trait Foo {
-    fn a();
-}
-
-struct Bar;
-
-impl Foo for Bar {
-    fn a() {}
-    fn b() {}
-    //~^ ERROR E0407
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0407.stderr b/src/test/ui/error-codes/E0407.stderr
deleted file mode 100644
index 6f6d1ff6a8f..00000000000
--- a/src/test/ui/error-codes/E0407.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0407]: method `b` is not a member of trait `Foo`
-  --> $DIR/E0407.rs:9:5
-   |
-LL |     fn b() {}
-   |     ^^^-^^^^^
-   |     |  |
-   |     |  help: there is an associated function with a similar name: `a`
-   |     not a member of trait `Foo`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0407`.
diff --git a/src/test/ui/error-codes/E0408.rs b/src/test/ui/error-codes/E0408.rs
deleted file mode 100644
index e91a98f3857..00000000000
--- a/src/test/ui/error-codes/E0408.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-fn main() {
-    let x = Some(0);
-
-    match x {
-        Some(y) | None => {} //~  ERROR variable `y` is not bound in all patterns
-        _ => ()
-    }
-}
diff --git a/src/test/ui/error-codes/E0408.stderr b/src/test/ui/error-codes/E0408.stderr
deleted file mode 100644
index 132a9432254..00000000000
--- a/src/test/ui/error-codes/E0408.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0408]: variable `y` is not bound in all patterns
-  --> $DIR/E0408.rs:5:19
-   |
-LL |         Some(y) | None => {}
-   |              -    ^^^^ pattern doesn't bind `y`
-   |              |
-   |              variable not in all patterns
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0408`.
diff --git a/src/test/ui/error-codes/E0411.rs b/src/test/ui/error-codes/E0411.rs
deleted file mode 100644
index 872370f2a53..00000000000
--- a/src/test/ui/error-codes/E0411.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn main() {
-    <Self>::foo; //~ ERROR E0411
-}
diff --git a/src/test/ui/error-codes/E0411.stderr b/src/test/ui/error-codes/E0411.stderr
deleted file mode 100644
index 4c99f9fcbf1..00000000000
--- a/src/test/ui/error-codes/E0411.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0411]: cannot find type `Self` in this scope
-  --> $DIR/E0411.rs:2:6
-   |
-LL | fn main() {
-   |    ---- `Self` not allowed in a function
-LL |     <Self>::foo;
-   |      ^^^^ `Self` is only available in impls, traits, and type definitions
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0411`.
diff --git a/src/test/ui/error-codes/E0412.rs b/src/test/ui/error-codes/E0412.rs
deleted file mode 100644
index 5f922a50a68..00000000000
--- a/src/test/ui/error-codes/E0412.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-impl Something {} //~ ERROR E0412
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0412.stderr b/src/test/ui/error-codes/E0412.stderr
deleted file mode 100644
index 7bdaa180730..00000000000
--- a/src/test/ui/error-codes/E0412.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0412]: cannot find type `Something` in this scope
-  --> $DIR/E0412.rs:1:6
-   |
-LL | impl Something {}
-   |      ^^^^^^^^^ not found in this scope
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0412`.
diff --git a/src/test/ui/error-codes/E0415.rs b/src/test/ui/error-codes/E0415.rs
deleted file mode 100644
index 6177ac35be8..00000000000
--- a/src/test/ui/error-codes/E0415.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index c2b8fdc7c55..00000000000
--- a/src/test/ui/error-codes/E0415.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0415]: identifier `f` is bound more than once in this parameter list
-  --> $DIR/E0415.rs:1:16
-   |
-LL | fn foo(f: i32, f: i32) {}
-   |                ^ used as parameter more than once
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0415`.
diff --git a/src/test/ui/error-codes/E0416.rs b/src/test/ui/error-codes/E0416.rs
deleted file mode 100644
index 88eece07acd..00000000000
--- a/src/test/ui/error-codes/E0416.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 78acac5c661..00000000000
--- a/src/test/ui/error-codes/E0416.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0416]: identifier `x` is bound more than once in the same pattern
-  --> $DIR/E0416.rs:3:13
-   |
-LL |         (x, x) => {}
-   |             ^ used in a pattern more than once
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0416`.
diff --git a/src/test/ui/error-codes/E0423.rs b/src/test/ui/error-codes/E0423.rs
deleted file mode 100644
index 5080a5e0599..00000000000
--- a/src/test/ui/error-codes/E0423.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-fn main () {
-    struct Foo { a: bool };
-
-    let f = Foo(); //~ ERROR E0423
-}
-
-fn bar() {
-    struct S { x: i32, y: i32 }
-    #[derive(PartialEq)]
-    struct T {}
-
-    if let S { x: _x, y: 2 } = S { x: 1, y: 2 } { println!("Ok"); }
-    //~^ ERROR struct literals are not allowed here
-    if T {} == T {} { println!("Ok"); }
-    //~^ ERROR E0423
-    //~| ERROR expected expression, found `==`
-}
-
-fn foo() {
-    for _ in std::ops::Range { start: 0, end: 10 } {}
-    //~^ ERROR struct literals are not allowed here
-}
diff --git a/src/test/ui/error-codes/E0423.stderr b/src/test/ui/error-codes/E0423.stderr
deleted file mode 100644
index ac70d905d35..00000000000
--- a/src/test/ui/error-codes/E0423.stderr
+++ /dev/null
@@ -1,63 +0,0 @@
-error: struct literals are not allowed here
-  --> $DIR/E0423.rs:12:32
-   |
-LL |     if let S { x: _x, y: 2 } = S { x: 1, y: 2 } { println!("Ok"); }
-   |                                ^^^^^^^^^^^^^^^^
-   |
-help: surround the struct literal with parentheses
-   |
-LL |     if let S { x: _x, y: 2 } = (S { x: 1, y: 2 }) { println!("Ok"); }
-   |                                +                +
-
-error: expected expression, found `==`
-  --> $DIR/E0423.rs:14:13
-   |
-LL |     if T {} == T {} { println!("Ok"); }
-   |             ^^ expected expression
-
-error: struct literals are not allowed here
-  --> $DIR/E0423.rs:20:14
-   |
-LL |     for _ in std::ops::Range { start: 0, end: 10 } {}
-   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-help: surround the struct literal with parentheses
-   |
-LL |     for _ in (std::ops::Range { start: 0, end: 10 }) {}
-   |              +                                     +
-
-error[E0423]: expected value, found struct `T`
-  --> $DIR/E0423.rs:14:8
-   |
-LL |     if T {} == T {} { println!("Ok"); }
-   |        ^ not a value
-   |
-help: surround the struct literal with parentheses
-   |
-LL |     if (T {}) == T {} { println!("Ok"); }
-   |        +    +
-
-error[E0423]: expected function, tuple struct or tuple variant, found struct `Foo`
-  --> $DIR/E0423.rs:4:13
-   |
-LL |     struct Foo { a: bool };
-   |     ---------------------- `Foo` defined here
-LL |
-LL |     let f = Foo();
-   |             ^^^^^
-...
-LL | fn foo() {
-   | -------- similarly named function `foo` defined here
-   |
-help: use struct literal syntax instead
-   |
-LL |     let f = Foo { a: val };
-   |             ~~~~~~~~~~~~~~
-help: a function with a similar name exists
-   |
-LL |     let f = foo();
-   |             ~~~
-
-error: aborting due to 5 previous errors
-
-For more information about this error, try `rustc --explain E0423`.
diff --git a/src/test/ui/error-codes/E0424.rs b/src/test/ui/error-codes/E0424.rs
deleted file mode 100644
index 6e531942cad..00000000000
--- a/src/test/ui/error-codes/E0424.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-struct Foo;
-
-impl Foo {
-    fn bar(self) {}
-
-    fn foo() {
-        self.bar(); //~ ERROR E0424
-    }
-
-    fn baz(_: i32) {
-        self.bar(); //~ ERROR E0424
-    }
-
-    fn qux() {
-        let _ = || self.bar(); //~ ERROR E0424
-    }
-}
-
-fn main () {
-    let self = "self"; //~ ERROR E0424
-}
diff --git a/src/test/ui/error-codes/E0424.stderr b/src/test/ui/error-codes/E0424.stderr
deleted file mode 100644
index d02da3e4ecb..00000000000
--- a/src/test/ui/error-codes/E0424.stderr
+++ /dev/null
@@ -1,50 +0,0 @@
-error[E0424]: expected value, found module `self`
-  --> $DIR/E0424.rs:7:9
-   |
-LL |     fn foo() {
-   |        --- this function doesn't have a `self` parameter
-LL |         self.bar();
-   |         ^^^^ `self` value is a keyword only available in methods with a `self` parameter
-   |
-help: add a `self` receiver parameter to make the associated `fn` a method
-   |
-LL |     fn foo(&self) {
-   |            +++++
-
-error[E0424]: expected value, found module `self`
-  --> $DIR/E0424.rs:11:9
-   |
-LL |     fn baz(_: i32) {
-   |        --- this function doesn't have a `self` parameter
-LL |         self.bar();
-   |         ^^^^ `self` value is a keyword only available in methods with a `self` parameter
-   |
-help: add a `self` receiver parameter to make the associated `fn` a method
-   |
-LL |     fn baz(&self, _: i32) {
-   |            ++++++
-
-error[E0424]: expected value, found module `self`
-  --> $DIR/E0424.rs:15:20
-   |
-LL |     fn qux() {
-   |        --- this function doesn't have a `self` parameter
-LL |         let _ = || self.bar();
-   |                    ^^^^ `self` value is a keyword only available in methods with a `self` parameter
-   |
-help: add a `self` receiver parameter to make the associated `fn` a method
-   |
-LL |     fn qux(&self) {
-   |            +++++
-
-error[E0424]: expected unit struct, unit variant or constant, found module `self`
-  --> $DIR/E0424.rs:20:9
-   |
-LL | fn main () {
-   |    ---- this function can't have a `self` parameter
-LL |     let self = "self";
-   |         ^^^^ `self` value is a keyword and may not be bound to variables or shadowed
-
-error: aborting due to 4 previous errors
-
-For more information about this error, try `rustc --explain E0424`.
diff --git a/src/test/ui/error-codes/E0425.rs b/src/test/ui/error-codes/E0425.rs
deleted file mode 100644
index ec234ae9906..00000000000
--- a/src/test/ui/error-codes/E0425.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-trait Foo {
-    fn bar() {
-        elf; //~ ERROR E0425
-    }
-}
-
-fn main () {
-}
diff --git a/src/test/ui/error-codes/E0425.stderr b/src/test/ui/error-codes/E0425.stderr
deleted file mode 100644
index 9ef4608da7d..00000000000
--- a/src/test/ui/error-codes/E0425.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0425]: cannot find value `elf` in this scope
-  --> $DIR/E0425.rs:3:9
-   |
-LL |         elf;
-   |         ^^^ not found in this scope
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0425`.
diff --git a/src/test/ui/error-codes/E0426.rs b/src/test/ui/error-codes/E0426.rs
deleted file mode 100644
index 7a1dcde49b6..00000000000
--- a/src/test/ui/error-codes/E0426.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-fn main () {
-    loop {
-        break 'a;
-        //~^ ERROR E0426
-    }
-}
diff --git a/src/test/ui/error-codes/E0426.stderr b/src/test/ui/error-codes/E0426.stderr
deleted file mode 100644
index 035f2eb86b9..00000000000
--- a/src/test/ui/error-codes/E0426.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0426]: use of undeclared label `'a`
-  --> $DIR/E0426.rs:3:15
-   |
-LL |         break 'a;
-   |               ^^ undeclared label `'a`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0426`.
diff --git a/src/test/ui/error-codes/E0428.rs b/src/test/ui/error-codes/E0428.rs
deleted file mode 100644
index eb9594fb8b6..00000000000
--- a/src/test/ui/error-codes/E0428.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-struct Bar; //~ previous definition of the type `Bar` here
-struct Bar; //~ ERROR E0428
-
-fn main () {
-}
diff --git a/src/test/ui/error-codes/E0428.stderr b/src/test/ui/error-codes/E0428.stderr
deleted file mode 100644
index 205bcf342f1..00000000000
--- a/src/test/ui/error-codes/E0428.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-error[E0428]: the name `Bar` is defined multiple times
-  --> $DIR/E0428.rs:2:1
-   |
-LL | struct Bar;
-   | ----------- previous definition of the type `Bar` here
-LL | struct Bar;
-   | ^^^^^^^^^^^ `Bar` redefined here
-   |
-   = note: `Bar` must be defined only once in the type namespace of this module
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0428`.
diff --git a/src/test/ui/error-codes/E0429.rs b/src/test/ui/error-codes/E0429.rs
deleted file mode 100644
index e74b27a78b6..00000000000
--- a/src/test/ui/error-codes/E0429.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 08b99232ee2..00000000000
--- a/src/test/ui/error-codes/E0429.stderr
+++ /dev/null
@@ -1,19 +0,0 @@
-error[E0429]: `self` imports are only allowed within a { } list
-  --> $DIR/E0429.rs:1:13
-   |
-LL | use std::fmt::self;
-   |             ^^^^^^
-   |
-help: consider importing the module directly
-   |
-LL - use std::fmt::self;
-LL + use std::fmt;
-   |
-help: alternatively, use the multi-path `use` syntax to import `self`
-   |
-LL | use std::fmt::{self};
-   |               +    +
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0429`.
diff --git a/src/test/ui/error-codes/E0430.rs b/src/test/ui/error-codes/E0430.rs
deleted file mode 100644
index ba2f671d66c..00000000000
--- a/src/test/ui/error-codes/E0430.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-use std::fmt::{self, self}; //~ ERROR E0430
-                            //~^ ERROR E0252
-
-fn main () {
-}
diff --git a/src/test/ui/error-codes/E0430.stderr b/src/test/ui/error-codes/E0430.stderr
deleted file mode 100644
index 69a0d6e11b2..00000000000
--- a/src/test/ui/error-codes/E0430.stderr
+++ /dev/null
@@ -1,22 +0,0 @@
-error[E0430]: `self` import can only appear once in an import list
-  --> $DIR/E0430.rs:1:16
-   |
-LL | use std::fmt::{self, self};
-   |                ^^^^  ---- another `self` import appears here
-   |                |
-   |                can only appear once in an import list
-
-error[E0252]: the name `fmt` is defined multiple times
-  --> $DIR/E0430.rs:1:22
-   |
-LL | use std::fmt::{self, self};
-   |                ----  ^^^^ `fmt` reimported here
-   |                |
-   |                previous import of the module `fmt` here
-   |
-   = note: `fmt` must be defined only once in the type namespace of this module
-
-error: aborting due to 2 previous errors
-
-Some errors have detailed explanations: E0252, E0430.
-For more information about an error, try `rustc --explain E0252`.
diff --git a/src/test/ui/error-codes/E0431.rs b/src/test/ui/error-codes/E0431.rs
deleted file mode 100644
index 2e2ccba1715..00000000000
--- a/src/test/ui/error-codes/E0431.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-use {self}; //~ ERROR E0431
-
-fn main () {
-}
diff --git a/src/test/ui/error-codes/E0431.stderr b/src/test/ui/error-codes/E0431.stderr
deleted file mode 100644
index adfd2d923c7..00000000000
--- a/src/test/ui/error-codes/E0431.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0431]: `self` import can only appear in an import list with a non-empty prefix
-  --> $DIR/E0431.rs:1:6
-   |
-LL | use {self};
-   |      ^^^^ can only appear in an import list with a non-empty prefix
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0431`.
diff --git a/src/test/ui/error-codes/E0432.rs b/src/test/ui/error-codes/E0432.rs
deleted file mode 100644
index 1fc95f94566..00000000000
--- a/src/test/ui/error-codes/E0432.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index ed9536f164e..00000000000
--- a/src/test/ui/error-codes/E0432.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0432]: unresolved import `something`
-  --> $DIR/E0432.rs:1:5
-   |
-LL | use something::Foo;
-   |     ^^^^^^^^^ maybe a missing crate `something`?
-   |
-   = help: consider adding `extern crate something` to use the `something` crate
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0432`.
diff --git a/src/test/ui/error-codes/E0433.rs b/src/test/ui/error-codes/E0433.rs
deleted file mode 100644
index d555e654263..00000000000
--- a/src/test/ui/error-codes/E0433.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn main () {
-    let map = NonExistingMap::new(); //~ ERROR E0433
-}
diff --git a/src/test/ui/error-codes/E0433.stderr b/src/test/ui/error-codes/E0433.stderr
deleted file mode 100644
index 265d8885c8d..00000000000
--- a/src/test/ui/error-codes/E0433.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0433]: failed to resolve: use of undeclared type `NonExistingMap`
-  --> $DIR/E0433.rs:2:15
-   |
-LL |     let map = NonExistingMap::new();
-   |               ^^^^^^^^^^^^^^ use of undeclared type `NonExistingMap`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0433`.
diff --git a/src/test/ui/error-codes/E0434.rs b/src/test/ui/error-codes/E0434.rs
deleted file mode 100644
index db7037ee115..00000000000
--- a/src/test/ui/error-codes/E0434.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-fn foo() {
-    let y = 5;
-    fn bar() -> u32 {
-        y //~ ERROR E0434
-    }
-}
-
-fn main () {
-}
diff --git a/src/test/ui/error-codes/E0434.stderr b/src/test/ui/error-codes/E0434.stderr
deleted file mode 100644
index 14508ccbc9a..00000000000
--- a/src/test/ui/error-codes/E0434.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0434]: can't capture dynamic environment in a fn item
-  --> $DIR/E0434.rs:4:9
-   |
-LL |         y
-   |         ^
-   |
-   = help: use the `|| { ... }` closure form instead
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0434`.
diff --git a/src/test/ui/error-codes/E0435.fixed b/src/test/ui/error-codes/E0435.fixed
deleted file mode 100644
index fdf896d2dbb..00000000000
--- a/src/test/ui/error-codes/E0435.fixed
+++ /dev/null
@@ -1,6 +0,0 @@
-// run-rustfix
-fn main () {
-    #[allow(non_upper_case_globals)]
-    const foo: usize = 42;
-    let _: [u8; foo]; //~ ERROR E0435
-}
diff --git a/src/test/ui/error-codes/E0435.rs b/src/test/ui/error-codes/E0435.rs
deleted file mode 100644
index d9354efb8fd..00000000000
--- a/src/test/ui/error-codes/E0435.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// run-rustfix
-fn main () {
-    #[allow(non_upper_case_globals)]
-    let foo: usize = 42;
-    let _: [u8; foo]; //~ ERROR E0435
-}
diff --git a/src/test/ui/error-codes/E0435.stderr b/src/test/ui/error-codes/E0435.stderr
deleted file mode 100644
index fc08fade91c..00000000000
--- a/src/test/ui/error-codes/E0435.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0435]: attempt to use a non-constant value in a constant
-  --> $DIR/E0435.rs:5:17
-   |
-LL |     let foo: usize = 42;
-   |     ------- help: consider using `const` instead of `let`: `const foo`
-LL |     let _: [u8; foo];
-   |                 ^^^ non-constant value
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0435`.
diff --git a/src/test/ui/error-codes/E0437.rs b/src/test/ui/error-codes/E0437.rs
deleted file mode 100644
index f8c15007d4e..00000000000
--- a/src/test/ui/error-codes/E0437.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-trait Foo {}
-
-impl Foo for i32 {
-    type Bar = bool; //~ ERROR E0437
-}
-
-fn main () {
-}
diff --git a/src/test/ui/error-codes/E0437.stderr b/src/test/ui/error-codes/E0437.stderr
deleted file mode 100644
index 217b164036f..00000000000
--- a/src/test/ui/error-codes/E0437.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0437]: type `Bar` is not a member of trait `Foo`
-  --> $DIR/E0437.rs:4:5
-   |
-LL |     type Bar = bool;
-   |     ^^^^^^^^^^^^^^^^ not a member of trait `Foo`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0437`.
diff --git a/src/test/ui/error-codes/E0438.rs b/src/test/ui/error-codes/E0438.rs
deleted file mode 100644
index 02898b886c8..00000000000
--- a/src/test/ui/error-codes/E0438.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-trait Bar {}
-
-impl Bar for i32 {
-    const BAR: bool = true; //~ ERROR E0438
-}
-
-fn main () {
-}
diff --git a/src/test/ui/error-codes/E0438.stderr b/src/test/ui/error-codes/E0438.stderr
deleted file mode 100644
index 853f0c3c239..00000000000
--- a/src/test/ui/error-codes/E0438.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0438]: const `BAR` is not a member of trait `Bar`
-  --> $DIR/E0438.rs:4:5
-   |
-LL |     const BAR: bool = true;
-   |     ^^^^^^^^^^^^^^^^^^^^^^^ not a member of trait `Bar`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0438`.
diff --git a/src/test/ui/error-codes/E0445.rs b/src/test/ui/error-codes/E0445.rs
deleted file mode 100644
index a9a3aee2500..00000000000
--- a/src/test/ui/error-codes/E0445.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-trait Foo {
-    fn dummy(&self) { }
-}
-
-pub trait Bar : Foo {}
-//~^ ERROR private trait `Foo` in public interface [E0445]
-pub struct Bar2<T: Foo>(pub T);
-//~^ ERROR private trait `Foo` in public interface [E0445]
-pub fn foo<T: Foo> (t: T) {}
-//~^ ERROR private trait `Foo` in public interface [E0445]
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0445.stderr b/src/test/ui/error-codes/E0445.stderr
deleted file mode 100644
index 23b7a335047..00000000000
--- a/src/test/ui/error-codes/E0445.stderr
+++ /dev/null
@@ -1,30 +0,0 @@
-error[E0445]: private trait `Foo` in public interface
-  --> $DIR/E0445.rs:5:1
-   |
-LL | trait Foo {
-   | --------- `Foo` declared as private
-...
-LL | pub trait Bar : Foo {}
-   | ^^^^^^^^^^^^^^^^^^^ can't leak private trait
-
-error[E0445]: private trait `Foo` in public interface
-  --> $DIR/E0445.rs:7:1
-   |
-LL | trait Foo {
-   | --------- `Foo` declared as private
-...
-LL | pub struct Bar2<T: Foo>(pub T);
-   | ^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait
-
-error[E0445]: private trait `Foo` in public interface
-  --> $DIR/E0445.rs:9:1
-   |
-LL | trait Foo {
-   | --------- `Foo` declared as private
-...
-LL | pub fn foo<T: Foo> (t: T) {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait
-
-error: aborting due to 3 previous errors
-
-For more information about this error, try `rustc --explain E0445`.
diff --git a/src/test/ui/error-codes/E0446.rs b/src/test/ui/error-codes/E0446.rs
deleted file mode 100644
index f61c7e54616..00000000000
--- a/src/test/ui/error-codes/E0446.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-mod foo {
-    struct Bar(u32);
-
-    pub fn bar() -> Bar { //~ ERROR E0446
-        Bar(0)
-    }
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0446.stderr b/src/test/ui/error-codes/E0446.stderr
deleted file mode 100644
index b6a195c40a9..00000000000
--- a/src/test/ui/error-codes/E0446.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0446]: private type `Bar` in public interface
-  --> $DIR/E0446.rs:4:5
-   |
-LL |     struct Bar(u32);
-   |     ---------- `Bar` declared as private
-LL |
-LL |     pub fn bar() -> Bar {
-   |     ^^^^^^^^^^^^^^^^^^^ can't leak private type
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0446`.
diff --git a/src/test/ui/error-codes/E0449.rs b/src/test/ui/error-codes/E0449.rs
deleted file mode 100644
index eba0d479e97..00000000000
--- a/src/test/ui/error-codes/E0449.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-struct Bar;
-
-trait Foo {
-    fn foo();
-}
-
-pub impl Bar {} //~ ERROR E0449
-
-pub impl Foo for Bar { //~ ERROR E0449
-    pub fn foo() {} //~ ERROR E0449
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0449.stderr b/src/test/ui/error-codes/E0449.stderr
deleted file mode 100644
index 8221a5e0ad6..00000000000
--- a/src/test/ui/error-codes/E0449.stderr
+++ /dev/null
@@ -1,23 +0,0 @@
-error[E0449]: unnecessary visibility qualifier
-  --> $DIR/E0449.rs:7:1
-   |
-LL | pub impl Bar {}
-   | ^^^ `pub` not permitted here because it's implied
-   |
-   = note: place qualifiers on individual impl items instead
-
-error[E0449]: unnecessary visibility qualifier
-  --> $DIR/E0449.rs:9:1
-   |
-LL | pub impl Foo for Bar {
-   | ^^^ `pub` not permitted here because it's implied
-
-error[E0449]: unnecessary visibility qualifier
-  --> $DIR/E0449.rs:10:5
-   |
-LL |     pub fn foo() {}
-   |     ^^^ `pub` not permitted here because it's implied
-
-error: aborting due to 3 previous errors
-
-For more information about this error, try `rustc --explain E0449`.
diff --git a/src/test/ui/error-codes/E0451.rs b/src/test/ui/error-codes/E0451.rs
deleted file mode 100644
index aa8f051afa7..00000000000
--- a/src/test/ui/error-codes/E0451.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-mod bar {
-    pub struct Foo {
-        pub a: isize,
-        b: isize,
-    }
-
-    pub struct FooTuple (
-        pub isize,
-        isize,
-    );
-}
-
-fn pat_match(foo: bar::Foo) {
-    let bar::Foo{a, b} = foo; //~ ERROR E0451
-}
-
-fn main() {
-    let f = bar::Foo{ a: 0, b: 0 }; //~ ERROR E0451
-}
diff --git a/src/test/ui/error-codes/E0451.stderr b/src/test/ui/error-codes/E0451.stderr
deleted file mode 100644
index 419cf117efe..00000000000
--- a/src/test/ui/error-codes/E0451.stderr
+++ /dev/null
@@ -1,15 +0,0 @@
-error[E0451]: field `b` of struct `Foo` is private
-  --> $DIR/E0451.rs:14:21
-   |
-LL |     let bar::Foo{a, b} = foo;
-   |                     ^ private field
-
-error[E0451]: field `b` of struct `Foo` is private
-  --> $DIR/E0451.rs:18:29
-   |
-LL |     let f = bar::Foo{ a: 0, b: 0 };
-   |                             ^^^^ private field
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0451`.
diff --git a/src/test/ui/error-codes/E0452.rs b/src/test/ui/error-codes/E0452.rs
deleted file mode 100644
index 5066cd99be9..00000000000
--- a/src/test/ui/error-codes/E0452.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#![allow(foo = "")] //~ ERROR E0452
-                    //~| ERROR E0452
-                    //~| ERROR E0452
-                    //~| ERROR E0452
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0452.stderr b/src/test/ui/error-codes/E0452.stderr
deleted file mode 100644
index f67b740ffe2..00000000000
--- a/src/test/ui/error-codes/E0452.stderr
+++ /dev/null
@@ -1,27 +0,0 @@
-error[E0452]: malformed lint attribute input
-  --> $DIR/E0452.rs:1:10
-   |
-LL | #![allow(foo = "")]
-   |          ^^^^^^^^ bad attribute argument
-
-error[E0452]: malformed lint attribute input
-  --> $DIR/E0452.rs:1:10
-   |
-LL | #![allow(foo = "")]
-   |          ^^^^^^^^ bad attribute argument
-
-error[E0452]: malformed lint attribute input
-  --> $DIR/E0452.rs:1:10
-   |
-LL | #![allow(foo = "")]
-   |          ^^^^^^^^ bad attribute argument
-
-error[E0452]: malformed lint attribute input
-  --> $DIR/E0452.rs:1:10
-   |
-LL | #![allow(foo = "")]
-   |          ^^^^^^^^ bad attribute argument
-
-error: aborting due to 4 previous errors
-
-For more information about this error, try `rustc --explain E0452`.
diff --git a/src/test/ui/error-codes/E0453.rs b/src/test/ui/error-codes/E0453.rs
deleted file mode 100644
index ca9573c5b46..00000000000
--- a/src/test/ui/error-codes/E0453.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#![forbid(non_snake_case)]
-
-#[allow(non_snake_case)]
-//~^ ERROR allow(non_snake_case) incompatible
-//~| ERROR allow(non_snake_case) incompatible
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0453.stderr b/src/test/ui/error-codes/E0453.stderr
deleted file mode 100644
index f982ed26f5c..00000000000
--- a/src/test/ui/error-codes/E0453.stderr
+++ /dev/null
@@ -1,21 +0,0 @@
-error[E0453]: allow(non_snake_case) incompatible with previous forbid
-  --> $DIR/E0453.rs:3:9
-   |
-LL | #![forbid(non_snake_case)]
-   |           -------------- `forbid` level set here
-LL |
-LL | #[allow(non_snake_case)]
-   |         ^^^^^^^^^^^^^^ overruled by previous forbid
-
-error[E0453]: allow(non_snake_case) incompatible with previous forbid
-  --> $DIR/E0453.rs:3:9
-   |
-LL | #![forbid(non_snake_case)]
-   |           -------------- `forbid` level set here
-LL |
-LL | #[allow(non_snake_case)]
-   |         ^^^^^^^^^^^^^^ overruled by previous forbid
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0453`.
diff --git a/src/test/ui/error-codes/E0454.rs b/src/test/ui/error-codes/E0454.rs
deleted file mode 100644
index ff5478382cc..00000000000
--- a/src/test/ui/error-codes/E0454.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#[link(name = "")] extern "C" {}
-//~^ ERROR E0454
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0454.stderr b/src/test/ui/error-codes/E0454.stderr
deleted file mode 100644
index b9a506fee83..00000000000
--- a/src/test/ui/error-codes/E0454.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0454]: link name must not be empty
-  --> $DIR/E0454.rs:1:15
-   |
-LL | #[link(name = "")] extern "C" {}
-   |               ^^ empty link name
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0454`.
diff --git a/src/test/ui/error-codes/E0458.rs b/src/test/ui/error-codes/E0458.rs
deleted file mode 100644
index 35e7e84d479..00000000000
--- a/src/test/ui/error-codes/E0458.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#[link(kind = "wonderful_unicorn")] extern "C" {} //~ ERROR E0458
-                                                  //~| ERROR E0459
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0458.stderr b/src/test/ui/error-codes/E0458.stderr
deleted file mode 100644
index e641bba541e..00000000000
--- a/src/test/ui/error-codes/E0458.stderr
+++ /dev/null
@@ -1,16 +0,0 @@
-error[E0458]: unknown link kind `wonderful_unicorn`, expected one of: static, dylib, framework, raw-dylib
-  --> $DIR/E0458.rs:1:15
-   |
-LL | #[link(kind = "wonderful_unicorn")] extern "C" {}
-   |               ^^^^^^^^^^^^^^^^^^^ unknown link kind
-
-error[E0459]: `#[link]` attribute requires a `name = "string"` argument
-  --> $DIR/E0458.rs:1:1
-   |
-LL | #[link(kind = "wonderful_unicorn")] extern "C" {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `name` argument
-
-error: aborting due to 2 previous errors
-
-Some errors have detailed explanations: E0458, E0459.
-For more information about an error, try `rustc --explain E0458`.
diff --git a/src/test/ui/error-codes/E0459.rs b/src/test/ui/error-codes/E0459.rs
deleted file mode 100644
index c56d8f0a8a8..00000000000
--- a/src/test/ui/error-codes/E0459.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-#[link(kind = "dylib")] extern "C" {} //~ ERROR E0459
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0459.stderr b/src/test/ui/error-codes/E0459.stderr
deleted file mode 100644
index 8f0dd25e030..00000000000
--- a/src/test/ui/error-codes/E0459.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0459]: `#[link]` attribute requires a `name = "string"` argument
-  --> $DIR/E0459.rs:1:1
-   |
-LL | #[link(kind = "dylib")] extern "C" {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^ missing `name` argument
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0459`.
diff --git a/src/test/ui/error-codes/E0462.rs b/src/test/ui/error-codes/E0462.rs
deleted file mode 100644
index f839ee783b5..00000000000
--- a/src/test/ui/error-codes/E0462.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// aux-build:found-staticlib.rs
-
-// normalize-stderr-test: "\.nll/" -> "/"
-// normalize-stderr-test: "\\\?\\" -> ""
-// normalize-stderr-test: "(lib)?found_staticlib\.[a-z]+" -> "libfound_staticlib.somelib"
-
-extern crate found_staticlib; //~ ERROR E0462
-
-fn main() {
-    found_staticlib::foo();
-}
diff --git a/src/test/ui/error-codes/E0462.stderr b/src/test/ui/error-codes/E0462.stderr
deleted file mode 100644
index 43e27965ffc..00000000000
--- a/src/test/ui/error-codes/E0462.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-error[E0462]: found staticlib `found_staticlib` instead of rlib or dylib
-  --> $DIR/E0462.rs:7:1
-   |
-LL | extern crate found_staticlib;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: the following crate versions were found:
-           crate `found_staticlib`: $TEST_BUILD_DIR/error-codes/E0462/auxiliary/libfound_staticlib.somelib
-   = help: please recompile that crate using --crate-type lib
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0462`.
diff --git a/src/test/ui/error-codes/E0463.rs b/src/test/ui/error-codes/E0463.rs
deleted file mode 100644
index 683565281cf..00000000000
--- a/src/test/ui/error-codes/E0463.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#![feature(plugin)]
-#![plugin(cookie_monster)]
-//~^ ERROR E0463
-extern crate cake_is_a_lie;
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0463.stderr b/src/test/ui/error-codes/E0463.stderr
deleted file mode 100644
index 1aa66e1ec88..00000000000
--- a/src/test/ui/error-codes/E0463.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0463]: can't find crate for `cookie_monster`
-  --> $DIR/E0463.rs:2:11
-   |
-LL | #![plugin(cookie_monster)]
-   |           ^^^^^^^^^^^^^^ can't find crate
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0463`.
diff --git a/src/test/ui/error-codes/E0464.rs b/src/test/ui/error-codes/E0464.rs
deleted file mode 100644
index 554f1ce72d9..00000000000
--- a/src/test/ui/error-codes/E0464.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// aux-build:crateresolve1-1.rs
-// aux-build:crateresolve1-2.rs
-// aux-build:crateresolve1-3.rs
-
-// normalize-stderr-test: "\.nll/" -> "/"
-// normalize-stderr-test: "\\\?\\" -> ""
-// normalize-stderr-test: "(lib)?crateresolve1-([123])\.[a-z]+" -> "libcrateresolve1-$2.somelib"
-
-// NOTE: This test is duplicated from `src/test/ui/crate-loading/crateresolve1.rs`.
-
-extern crate crateresolve1;
-//~^ ERROR multiple candidates for `rlib` dependency `crateresolve1` found
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0464.stderr b/src/test/ui/error-codes/E0464.stderr
deleted file mode 100644
index 574270f94a6..00000000000
--- a/src/test/ui/error-codes/E0464.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-error[E0464]: multiple candidates for `rlib` dependency `crateresolve1` found
-  --> $DIR/E0464.rs:11:1
-   |
-LL | extern crate crateresolve1;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: candidate #1: $TEST_BUILD_DIR/error-codes/E0464/auxiliary/libcrateresolve1-1.somelib
-   = note: candidate #2: $TEST_BUILD_DIR/error-codes/E0464/auxiliary/libcrateresolve1-2.somelib
-   = note: candidate #3: $TEST_BUILD_DIR/error-codes/E0464/auxiliary/libcrateresolve1-3.somelib
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0464`.
diff --git a/src/test/ui/error-codes/E0478.rs b/src/test/ui/error-codes/E0478.rs
deleted file mode 100644
index b1562dc0a8b..00000000000
--- a/src/test/ui/error-codes/E0478.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-trait Wedding<'t>: 't { }
-
-struct Prince<'kiss, 'SnowWhite> {
-    child: Box<dyn Wedding<'kiss> + 'SnowWhite>, //~ ERROR E0478
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0478.stderr b/src/test/ui/error-codes/E0478.stderr
deleted file mode 100644
index ec650085a2b..00000000000
--- a/src/test/ui/error-codes/E0478.stderr
+++ /dev/null
@@ -1,20 +0,0 @@
-error[E0478]: lifetime bound not satisfied
-  --> $DIR/E0478.rs:4:12
-   |
-LL |     child: Box<dyn Wedding<'kiss> + 'SnowWhite>,
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-note: lifetime parameter instantiated with the lifetime `'SnowWhite` as defined here
-  --> $DIR/E0478.rs:3:22
-   |
-LL | struct Prince<'kiss, 'SnowWhite> {
-   |                      ^^^^^^^^^^
-note: but lifetime parameter must outlive the lifetime `'kiss` as defined here
-  --> $DIR/E0478.rs:3:15
-   |
-LL | struct Prince<'kiss, 'SnowWhite> {
-   |               ^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0478`.
diff --git a/src/test/ui/error-codes/E0492.rs b/src/test/ui/error-codes/E0492.rs
deleted file mode 100644
index 2c735fcc9f9..00000000000
--- a/src/test/ui/error-codes/E0492.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use std::sync::atomic::AtomicUsize;
-
-const A: AtomicUsize = AtomicUsize::new(0);
-const B: &'static AtomicUsize = &A; //~ ERROR E0492
-static C: &'static AtomicUsize = &A; //~ ERROR E0492
-
-const NONE: &'static Option<AtomicUsize> = &None;
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0492.stderr b/src/test/ui/error-codes/E0492.stderr
deleted file mode 100644
index 557c977e87d..00000000000
--- a/src/test/ui/error-codes/E0492.stderr
+++ /dev/null
@@ -1,17 +0,0 @@
-error[E0492]: constants cannot refer to interior mutable data
-  --> $DIR/E0492.rs:4:33
-   |
-LL | const B: &'static AtomicUsize = &A;
-   |                                 ^^ this borrow of an interior mutable value may end up in the final value
-
-error[E0492]: statics cannot refer to interior mutable data
-  --> $DIR/E0492.rs:5:34
-   |
-LL | static C: &'static AtomicUsize = &A;
-   |                                  ^^ this borrow of an interior mutable value may end up in the final value
-   |
-   = help: to fix this, the value can be extracted to a separate `static` item and then referenced
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0492`.
diff --git a/src/test/ui/error-codes/E0496.rs b/src/test/ui/error-codes/E0496.rs
deleted file mode 100644
index b57c9c79eaa..00000000000
--- a/src/test/ui/error-codes/E0496.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-struct Foo<'a> {
-    a: &'a i32,
-}
-
-impl<'a> Foo<'a> {
-    fn f<'a>(x: &'a i32) { //~ ERROR E0496
-    }
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0496.stderr b/src/test/ui/error-codes/E0496.stderr
deleted file mode 100644
index 80ca2b1fbdb..00000000000
--- a/src/test/ui/error-codes/E0496.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0496]: lifetime name `'a` shadows a lifetime name that is already in scope
-  --> $DIR/E0496.rs:6:10
-   |
-LL | impl<'a> Foo<'a> {
-   |      -- first declared here
-LL |     fn f<'a>(x: &'a i32) {
-   |          ^^ lifetime `'a` already in scope
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0496`.
diff --git a/src/test/ui/error-codes/E0499.rs b/src/test/ui/error-codes/E0499.rs
deleted file mode 100644
index 919f97c8a5c..00000000000
--- a/src/test/ui/error-codes/E0499.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-fn main() {
-    let mut i = 0;
-    let mut x = &mut i;
-    let mut a = &mut i; //~ ERROR E0499
-    a.use_mut();
-    x.use_mut();
-}
-
-trait Fake { fn use_mut(&mut self) { } fn use_ref(&self) { }  }
-impl<T> Fake for T { }
diff --git a/src/test/ui/error-codes/E0499.stderr b/src/test/ui/error-codes/E0499.stderr
deleted file mode 100644
index af5a1e18633..00000000000
--- a/src/test/ui/error-codes/E0499.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error[E0499]: cannot borrow `i` as mutable more than once at a time
-  --> $DIR/E0499.rs:4:17
-   |
-LL |     let mut x = &mut i;
-   |                 ------ first mutable borrow occurs here
-LL |     let mut a = &mut i;
-   |                 ^^^^^^ second mutable borrow occurs here
-LL |     a.use_mut();
-LL |     x.use_mut();
-   |     ----------- first borrow later used here
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0499`.
diff --git a/src/test/ui/error-codes/E0501.rs b/src/test/ui/error-codes/E0501.rs
deleted file mode 100644
index 3e39d9a63c5..00000000000
--- a/src/test/ui/error-codes/E0501.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-fn inside_closure(x: &mut i32) {
-}
-
-fn outside_closure_1(x: &mut i32) {
-}
-
-fn outside_closure_2(x: &i32) {
-}
-
-fn foo(a: &mut i32) {
-    let bar = || {
-        inside_closure(a)
-    };
-    outside_closure_1(a);
-    //~^ ERROR cannot borrow `*a` as mutable because previous closure requires unique access
-
-    outside_closure_2(a);
-    //~^ ERROR cannot borrow `*a` as immutable because previous closure requires unique access
-
-    drop(bar);
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0501.stderr b/src/test/ui/error-codes/E0501.stderr
deleted file mode 100644
index 53d98d7e13f..00000000000
--- a/src/test/ui/error-codes/E0501.stderr
+++ /dev/null
@@ -1,31 +0,0 @@
-error[E0501]: cannot borrow `*a` as mutable because previous closure requires unique access
-  --> $DIR/E0501.rs:14:23
-   |
-LL |     let bar = || {
-   |               -- closure construction occurs here
-LL |         inside_closure(a)
-   |                        - first borrow occurs due to use of `a` in closure
-LL |     };
-LL |     outside_closure_1(a);
-   |                       ^ second borrow occurs here
-...
-LL |     drop(bar);
-   |          --- first borrow later used here
-
-error[E0501]: cannot borrow `*a` as immutable because previous closure requires unique access
-  --> $DIR/E0501.rs:17:23
-   |
-LL |     let bar = || {
-   |               -- closure construction occurs here
-LL |         inside_closure(a)
-   |                        - first borrow occurs due to use of `a` in closure
-...
-LL |     outside_closure_2(a);
-   |                       ^ second borrow occurs here
-...
-LL |     drop(bar);
-   |          --- first borrow later used here
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0501`.
diff --git a/src/test/ui/error-codes/E0502.rs b/src/test/ui/error-codes/E0502.rs
deleted file mode 100644
index 958380ece45..00000000000
--- a/src/test/ui/error-codes/E0502.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-fn bar(x: &mut i32) {}
-fn foo(a: &mut i32) {
-    let ref y = a;
-    bar(a); //~ ERROR E0502
-    y.use_ref();
-}
-
-fn main() {
-}
-
-trait Fake { fn use_mut(&mut self) { } fn use_ref(&self) { }  }
-impl<T> Fake for T { }
diff --git a/src/test/ui/error-codes/E0502.stderr b/src/test/ui/error-codes/E0502.stderr
deleted file mode 100644
index 94cc89754db..00000000000
--- a/src/test/ui/error-codes/E0502.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-error[E0502]: cannot borrow `*a` as mutable because it is also borrowed as immutable
-  --> $DIR/E0502.rs:4:5
-   |
-LL |     let ref y = a;
-   |         ----- immutable borrow occurs here
-LL |     bar(a);
-   |     ^^^^^^ mutable borrow occurs here
-LL |     y.use_ref();
-   |     ----------- immutable borrow later used here
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0502`.
diff --git a/src/test/ui/error-codes/E0503.rs b/src/test/ui/error-codes/E0503.rs
deleted file mode 100644
index 88f5fc1bbcb..00000000000
--- a/src/test/ui/error-codes/E0503.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-fn main() {
-    let mut value = 3;
-    let _borrow = &mut value;
-    let _sum = value + 1; //~ ERROR E0503
-    _borrow.use_mut();
-}
-
-trait Fake { fn use_mut(&mut self) { } fn use_ref(&self) { }  }
-impl<T> Fake for T { }
diff --git a/src/test/ui/error-codes/E0503.stderr b/src/test/ui/error-codes/E0503.stderr
deleted file mode 100644
index fafe363eb47..00000000000
--- a/src/test/ui/error-codes/E0503.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-error[E0503]: cannot use `value` because it was mutably borrowed
-  --> $DIR/E0503.rs:4:16
-   |
-LL |     let _borrow = &mut value;
-   |                   ---------- borrow of `value` occurs here
-LL |     let _sum = value + 1;
-   |                ^^^^^ use of borrowed `value`
-LL |     _borrow.use_mut();
-   |     ----------------- borrow later used here
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0503`.
diff --git a/src/test/ui/error-codes/E0504.rs b/src/test/ui/error-codes/E0504.rs
deleted file mode 100644
index c2658bef619..00000000000
--- a/src/test/ui/error-codes/E0504.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-struct FancyNum {
-    num: u8,
-}
-
-fn main() {
-    let fancy_num = FancyNum { num: 5 };
-    let fancy_ref = &fancy_num;
-
-    let x = move || { //~ ERROR E0505
-        println!("child function: {}", fancy_num.num);
-    };
-
-    x();
-    println!("main function: {}", fancy_ref.num);
-}
diff --git a/src/test/ui/error-codes/E0504.stderr b/src/test/ui/error-codes/E0504.stderr
deleted file mode 100644
index e677e891615..00000000000
--- a/src/test/ui/error-codes/E0504.stderr
+++ /dev/null
@@ -1,17 +0,0 @@
-error[E0505]: cannot move out of `fancy_num` because it is borrowed
-  --> $DIR/E0504.rs:9:13
-   |
-LL |     let fancy_ref = &fancy_num;
-   |                     ---------- borrow of `fancy_num` occurs here
-LL |
-LL |     let x = move || {
-   |             ^^^^^^^ move out of `fancy_num` occurs here
-LL |         println!("child function: {}", fancy_num.num);
-   |                                        ------------- move occurs due to use in closure
-...
-LL |     println!("main function: {}", fancy_ref.num);
-   |                                   ------------- borrow later used here
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0505`.
diff --git a/src/test/ui/error-codes/E0505.rs b/src/test/ui/error-codes/E0505.rs
deleted file mode 100644
index 941f5f2199d..00000000000
--- a/src/test/ui/error-codes/E0505.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-struct Value {}
-
-fn eat(val: Value) {}
-
-fn main() {
-    let x = Value{};
-    {
-        let _ref_to_val: &Value = &x;
-        eat(x); //~ ERROR E0505
-        _ref_to_val.use_ref();
-    }
-}
-
-trait Fake { fn use_mut(&mut self) { } fn use_ref(&self) { }  }
-impl<T> Fake for T { }
diff --git a/src/test/ui/error-codes/E0505.stderr b/src/test/ui/error-codes/E0505.stderr
deleted file mode 100644
index bd3f37f54e0..00000000000
--- a/src/test/ui/error-codes/E0505.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-error[E0505]: cannot move out of `x` because it is borrowed
-  --> $DIR/E0505.rs:9:13
-   |
-LL |         let _ref_to_val: &Value = &x;
-   |                                   -- borrow of `x` occurs here
-LL |         eat(x);
-   |             ^ move out of `x` occurs here
-LL |         _ref_to_val.use_ref();
-   |         --------------------- borrow later used here
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0505`.
diff --git a/src/test/ui/error-codes/E0506.rs b/src/test/ui/error-codes/E0506.rs
deleted file mode 100644
index 062a44a52bb..00000000000
--- a/src/test/ui/error-codes/E0506.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-struct FancyNum {
-    num: u8,
-}
-
-fn main() {
-    let mut fancy_num = FancyNum { num: 5 };
-    let fancy_ref = &fancy_num;
-    fancy_num = FancyNum { num: 6 }; //~ ERROR [E0506]
-
-    println!("Num: {}, Ref: {}", fancy_num.num, fancy_ref.num);
-}
diff --git a/src/test/ui/error-codes/E0506.stderr b/src/test/ui/error-codes/E0506.stderr
deleted file mode 100644
index d70406b750a..00000000000
--- a/src/test/ui/error-codes/E0506.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error[E0506]: cannot assign to `fancy_num` because it is borrowed
-  --> $DIR/E0506.rs:8:5
-   |
-LL |     let fancy_ref = &fancy_num;
-   |                     ---------- borrow of `fancy_num` occurs here
-LL |     fancy_num = FancyNum { num: 6 };
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `fancy_num` occurs here
-LL |
-LL |     println!("Num: {}, Ref: {}", fancy_num.num, fancy_ref.num);
-   |                                                 ------------- borrow later used here
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0506`.
diff --git a/src/test/ui/error-codes/E0507.rs b/src/test/ui/error-codes/E0507.rs
deleted file mode 100644
index bae90a44ce0..00000000000
--- a/src/test/ui/error-codes/E0507.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-use std::cell::RefCell;
-
-struct TheDarkKnight;
-
-impl TheDarkKnight {
-    fn nothing_is_true(self) {}
-}
-
-fn main() {
-    let x = RefCell::new(TheDarkKnight);
-
-    x.borrow().nothing_is_true(); //~ ERROR E0507
-}
diff --git a/src/test/ui/error-codes/E0507.stderr b/src/test/ui/error-codes/E0507.stderr
deleted file mode 100644
index 03630f38987..00000000000
--- a/src/test/ui/error-codes/E0507.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error[E0507]: cannot move out of dereference of `Ref<'_, TheDarkKnight>`
-  --> $DIR/E0507.rs:12:5
-   |
-LL |     x.borrow().nothing_is_true();
-   |     ^^^^^^^^^^^-----------------
-   |     |          |
-   |     |          value moved due to this method call
-   |     move occurs because value has type `TheDarkKnight`, which does not implement the `Copy` trait
-   |
-note: `TheDarkKnight::nothing_is_true` takes ownership of the receiver `self`, which moves value
-  --> $DIR/E0507.rs:6:24
-   |
-LL |     fn nothing_is_true(self) {}
-   |                        ^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/error-codes/E0508-fail.rs b/src/test/ui/error-codes/E0508-fail.rs
deleted file mode 100644
index 072c3d66183..00000000000
--- a/src/test/ui/error-codes/E0508-fail.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-struct NonCopy;
-
-fn main() {
-    let array = [NonCopy; 1];
-    let _value = array[0];  //~ ERROR [E0508]
-}
diff --git a/src/test/ui/error-codes/E0508-fail.stderr b/src/test/ui/error-codes/E0508-fail.stderr
deleted file mode 100644
index 208ba30729f..00000000000
--- a/src/test/ui/error-codes/E0508-fail.stderr
+++ /dev/null
@@ -1,17 +0,0 @@
-error[E0508]: cannot move out of type `[NonCopy; 1]`, a non-copy array
-  --> $DIR/E0508-fail.rs:5:18
-   |
-LL |     let _value = array[0];
-   |                  ^^^^^^^^
-   |                  |
-   |                  cannot move out of here
-   |                  move occurs because `array[_]` has type `NonCopy`, which does not implement the `Copy` trait
-   |
-help: consider borrowing here
-   |
-LL |     let _value = &array[0];
-   |                  +
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0508`.
diff --git a/src/test/ui/error-codes/E0508.rs b/src/test/ui/error-codes/E0508.rs
deleted file mode 100644
index 072c3d66183..00000000000
--- a/src/test/ui/error-codes/E0508.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-struct NonCopy;
-
-fn main() {
-    let array = [NonCopy; 1];
-    let _value = array[0];  //~ ERROR [E0508]
-}
diff --git a/src/test/ui/error-codes/E0508.stderr b/src/test/ui/error-codes/E0508.stderr
deleted file mode 100644
index df2d3b0d311..00000000000
--- a/src/test/ui/error-codes/E0508.stderr
+++ /dev/null
@@ -1,17 +0,0 @@
-error[E0508]: cannot move out of type `[NonCopy; 1]`, a non-copy array
-  --> $DIR/E0508.rs:5:18
-   |
-LL |     let _value = array[0];
-   |                  ^^^^^^^^
-   |                  |
-   |                  cannot move out of here
-   |                  move occurs because `array[_]` has type `NonCopy`, which does not implement the `Copy` trait
-   |
-help: consider borrowing here
-   |
-LL |     let _value = &array[0];
-   |                  +
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0508`.
diff --git a/src/test/ui/error-codes/E0509.rs b/src/test/ui/error-codes/E0509.rs
deleted file mode 100644
index b2665c4cc92..00000000000
--- a/src/test/ui/error-codes/E0509.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-struct FancyNum {
-    num: usize
-}
-
-struct DropStruct {
-    fancy: FancyNum
-}
-
-impl Drop for DropStruct {
-    fn drop(&mut self) {
-    }
-}
-
-fn main() {
-    let drop_struct = DropStruct{fancy: FancyNum{num: 5}};
-    let fancy_field = drop_struct.fancy; //~ ERROR E0509
-    println!("Fancy: {}", fancy_field.num);
-}
diff --git a/src/test/ui/error-codes/E0509.stderr b/src/test/ui/error-codes/E0509.stderr
deleted file mode 100644
index c00d9142e75..00000000000
--- a/src/test/ui/error-codes/E0509.stderr
+++ /dev/null
@@ -1,17 +0,0 @@
-error[E0509]: cannot move out of type `DropStruct`, which implements the `Drop` trait
-  --> $DIR/E0509.rs:16:23
-   |
-LL |     let fancy_field = drop_struct.fancy;
-   |                       ^^^^^^^^^^^^^^^^^
-   |                       |
-   |                       cannot move out of here
-   |                       move occurs because `drop_struct.fancy` has type `FancyNum`, which does not implement the `Copy` trait
-   |
-help: consider borrowing here
-   |
-LL |     let fancy_field = &drop_struct.fancy;
-   |                       +
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0509`.
diff --git a/src/test/ui/error-codes/E0511.rs b/src/test/ui/error-codes/E0511.rs
deleted file mode 100644
index a52f81a6c5d..00000000000
--- a/src/test/ui/error-codes/E0511.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// build-fail
-
-#![feature(platform_intrinsics)]
-
-extern "platform-intrinsic" {
-    fn simd_add<T>(a: T, b: T) -> T;
-}
-
-fn main() {
-    unsafe { simd_add(0, 1); } //~ ERROR E0511
-}
diff --git a/src/test/ui/error-codes/E0511.stderr b/src/test/ui/error-codes/E0511.stderr
deleted file mode 100644
index d797b10d5a6..00000000000
--- a/src/test/ui/error-codes/E0511.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0511]: invalid monomorphization of `simd_add` intrinsic: expected SIMD input type, found non-SIMD `i32`
-  --> $DIR/E0511.rs:10:14
-   |
-LL |     unsafe { simd_add(0, 1); }
-   |              ^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0511`.
diff --git a/src/test/ui/error-codes/E0512.rs b/src/test/ui/error-codes/E0512.rs
deleted file mode 100644
index e70992aee23..00000000000
--- a/src/test/ui/error-codes/E0512.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-fn takes_u8(_: u8) {}
-
-fn main() {
-    unsafe { takes_u8(::std::mem::transmute(0u16)); } //~ ERROR E0512
-}
diff --git a/src/test/ui/error-codes/E0512.stderr b/src/test/ui/error-codes/E0512.stderr
deleted file mode 100644
index 3fecce542ce..00000000000
--- a/src/test/ui/error-codes/E0512.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
-  --> $DIR/E0512.rs:4:23
-   |
-LL |     unsafe { takes_u8(::std::mem::transmute(0u16)); }
-   |                       ^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: source type: `u16` (16 bits)
-   = note: target type: `u8` (8 bits)
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0512`.
diff --git a/src/test/ui/error-codes/E0516.rs b/src/test/ui/error-codes/E0516.rs
deleted file mode 100644
index 834bb630989..00000000000
--- a/src/test/ui/error-codes/E0516.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 5243b7caf22..00000000000
--- a/src/test/ui/error-codes/E0516.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error[E0516]: `typeof` is a reserved keyword but unimplemented
-  --> $DIR/E0516.rs:2:12
-   |
-LL |     let x: typeof(92) = 92;
-   |            ^^^^^^^^^^ reserved keyword
-   |
-help: consider replacing `typeof(...)` with an actual type
-   |
-LL |     let x: i32 = 92;
-   |            ~~~
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0516`.
diff --git a/src/test/ui/error-codes/E0517.rs b/src/test/ui/error-codes/E0517.rs
deleted file mode 100644
index 1dcaa2d741f..00000000000
--- a/src/test/ui/error-codes/E0517.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-#[repr(C)] //~ ERROR: E0517
-type Foo = u8;
-
-#[repr(packed)] //~ ERROR: E0517
-enum Foo2 {Bar, Baz}
-
-#[repr(u8)] //~ ERROR: E0517
-struct Foo3 {bar: bool, baz: bool}
-
-#[repr(C)] //~ ERROR: E0517
-impl Foo3 {
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0517.stderr b/src/test/ui/error-codes/E0517.stderr
deleted file mode 100644
index 2f90d4d0baa..00000000000
--- a/src/test/ui/error-codes/E0517.stderr
+++ /dev/null
@@ -1,36 +0,0 @@
-error[E0517]: attribute should be applied to a struct, enum, or union
-  --> $DIR/E0517.rs:1:8
-   |
-LL | #[repr(C)]
-   |        ^
-LL | type Foo = u8;
-   | -------------- not a struct, enum, or union
-
-error[E0517]: attribute should be applied to a struct or union
-  --> $DIR/E0517.rs:4:8
-   |
-LL | #[repr(packed)]
-   |        ^^^^^^
-LL | enum Foo2 {Bar, Baz}
-   | -------------------- not a struct or union
-
-error[E0517]: attribute should be applied to an enum
-  --> $DIR/E0517.rs:7:8
-   |
-LL | #[repr(u8)]
-   |        ^^
-LL | struct Foo3 {bar: bool, baz: bool}
-   | ---------------------------------- not an enum
-
-error[E0517]: attribute should be applied to a struct, enum, or union
-  --> $DIR/E0517.rs:10:8
-   |
-LL |   #[repr(C)]
-   |          ^
-LL | / impl Foo3 {
-LL | | }
-   | |_- not a struct, enum, or union
-
-error: aborting due to 4 previous errors
-
-For more information about this error, try `rustc --explain E0517`.
diff --git a/src/test/ui/error-codes/E0518.rs b/src/test/ui/error-codes/E0518.rs
deleted file mode 100644
index 9c99702ada8..00000000000
--- a/src/test/ui/error-codes/E0518.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-#[inline(always)] //~ ERROR: E0518
-struct Foo;
-
-#[inline(never)] //~ ERROR: E0518
-impl Foo {
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0518.stderr b/src/test/ui/error-codes/E0518.stderr
deleted file mode 100644
index 561446f8175..00000000000
--- a/src/test/ui/error-codes/E0518.stderr
+++ /dev/null
@@ -1,20 +0,0 @@
-error[E0518]: attribute should be applied to function or closure
-  --> $DIR/E0518.rs:1:1
-   |
-LL | #[inline(always)]
-   | ^^^^^^^^^^^^^^^^^
-LL | struct Foo;
-   | ----------- not a function or closure
-
-error[E0518]: attribute should be applied to function or closure
-  --> $DIR/E0518.rs:4:1
-   |
-LL |   #[inline(never)]
-   |   ^^^^^^^^^^^^^^^^
-LL | / impl Foo {
-LL | | }
-   | |_- not a function or closure
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0518`.
diff --git a/src/test/ui/error-codes/E0519.rs b/src/test/ui/error-codes/E0519.rs
deleted file mode 100644
index 269ffd6320d..00000000000
--- a/src/test/ui/error-codes/E0519.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// no need to create a new aux file, we can use an existing.
-// aux-build: crateresolve1-1.rs
-
-// set same metadata as `crateresolve1`
-#![crate_name = "crateresolve1"]
-#![crate_type = "lib"]
-
-extern crate crateresolve1; //~ ERROR E0519
diff --git a/src/test/ui/error-codes/E0519.stderr b/src/test/ui/error-codes/E0519.stderr
deleted file mode 100644
index e24fc4aaa70..00000000000
--- a/src/test/ui/error-codes/E0519.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0519]: the current crate is indistinguishable from one of its dependencies: it has the same crate-name `crateresolve1` and was compiled with the same `-C metadata` arguments. This will result in symbol conflicts between the two.
-  --> $DIR/E0519.rs:8:1
-   |
-LL | extern crate crateresolve1;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0519`.
diff --git a/src/test/ui/error-codes/E0520.rs b/src/test/ui/error-codes/E0520.rs
deleted file mode 100644
index ead78b7ffa2..00000000000
--- a/src/test/ui/error-codes/E0520.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-#![feature(specialization)]
-//~^ WARN the feature `specialization` is incomplete
-
-trait SpaceLlama {
-    fn fly(&self);
-}
-
-impl<T> SpaceLlama for T {
-    default fn fly(&self) {}
-}
-
-impl<T: Clone> SpaceLlama for T {
-    fn fly(&self) {}
-}
-
-impl SpaceLlama for i32 {
-    default fn fly(&self) {}
-    //~^ ERROR E0520
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0520.stderr b/src/test/ui/error-codes/E0520.stderr
deleted file mode 100644
index 12ecead13de..00000000000
--- a/src/test/ui/error-codes/E0520.stderr
+++ /dev/null
@@ -1,24 +0,0 @@
-warning: the feature `specialization` is incomplete and may not be safe to use and/or cause compiler crashes
-  --> $DIR/E0520.rs:1:12
-   |
-LL | #![feature(specialization)]
-   |            ^^^^^^^^^^^^^^
-   |
-   = note: see issue #31844 <https://github.com/rust-lang/rust/issues/31844> for more information
-   = help: consider using `min_specialization` instead, which is more stable and complete
-   = note: `#[warn(incomplete_features)]` on by default
-
-error[E0520]: `fly` specializes an item from a parent `impl`, but that item is not marked `default`
-  --> $DIR/E0520.rs:17:5
-   |
-LL | impl<T: Clone> SpaceLlama for T {
-   | ------------------------------- parent `impl` is here
-...
-LL |     default fn fly(&self) {}
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^ cannot specialize default item `fly`
-   |
-   = note: to specialize, `fly` in the parent `impl` must be marked `default`
-
-error: aborting due to previous error; 1 warning emitted
-
-For more information about this error, try `rustc --explain E0520`.
diff --git a/src/test/ui/error-codes/E0522.rs b/src/test/ui/error-codes/E0522.rs
deleted file mode 100644
index 1414e82408c..00000000000
--- a/src/test/ui/error-codes/E0522.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-#![feature(lang_items)]
-
-#[lang = "cookie"]
-fn cookie() -> ! {
-//~^^ ERROR definition of an unknown language item: `cookie` [E0522]
-    loop {}
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0522.stderr b/src/test/ui/error-codes/E0522.stderr
deleted file mode 100644
index 0a8a41598da..00000000000
--- a/src/test/ui/error-codes/E0522.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0522]: definition of an unknown language item: `cookie`
-  --> $DIR/E0522.rs:3:1
-   |
-LL | #[lang = "cookie"]
-   | ^^^^^^^^^^^^^^^^^^ definition of unknown language item `cookie`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0522`.
diff --git a/src/test/ui/error-codes/E0527.rs b/src/test/ui/error-codes/E0527.rs
deleted file mode 100644
index af055ff269e..00000000000
--- a/src/test/ui/error-codes/E0527.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-fn main() {
-    let r = &[1, 2, 3, 4];
-    match r {
-        &[a, b] => {
-            //~^ ERROR E0527
-            println!("a={}, b={}", a, b);
-        }
-    }
-}
diff --git a/src/test/ui/error-codes/E0527.stderr b/src/test/ui/error-codes/E0527.stderr
deleted file mode 100644
index a2e6288b21b..00000000000
--- a/src/test/ui/error-codes/E0527.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0527]: pattern requires 2 elements but array has 4
-  --> $DIR/E0527.rs:4:10
-   |
-LL |         &[a, b] => {
-   |          ^^^^^^ expected 4 elements
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0527`.
diff --git a/src/test/ui/error-codes/E0528.rs b/src/test/ui/error-codes/E0528.rs
deleted file mode 100644
index 0a337c9611c..00000000000
--- a/src/test/ui/error-codes/E0528.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-fn main() {
-    let r = &[1, 2];
-    match r {
-        &[a, b, c, rest @ ..] => {
-        //~^ ERROR E0528
-        }
-    }
-}
diff --git a/src/test/ui/error-codes/E0528.stderr b/src/test/ui/error-codes/E0528.stderr
deleted file mode 100644
index 21615f954c3..00000000000
--- a/src/test/ui/error-codes/E0528.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0528]: pattern requires at least 3 elements but array has 2
-  --> $DIR/E0528.rs:4:10
-   |
-LL |         &[a, b, c, rest @ ..] => {
-   |          ^^^^^^^^^^^^^^^^^^^^ pattern cannot match array of 2 elements
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0528`.
diff --git a/src/test/ui/error-codes/E0529.rs b/src/test/ui/error-codes/E0529.rs
deleted file mode 100644
index a82bc9ebcf4..00000000000
--- a/src/test/ui/error-codes/E0529.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-fn main() {
-    let r: f32 = 1.0;
-    match r {
-        [a, b] => {
-        //~^ ERROR E0529
-        }
-    }
-}
diff --git a/src/test/ui/error-codes/E0529.stderr b/src/test/ui/error-codes/E0529.stderr
deleted file mode 100644
index 96b22bb2263..00000000000
--- a/src/test/ui/error-codes/E0529.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0529]: expected an array or slice, found `f32`
-  --> $DIR/E0529.rs:4:9
-   |
-LL |         [a, b] => {
-   |         ^^^^^^ pattern cannot match with input type `f32`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0529`.
diff --git a/src/test/ui/error-codes/E0530.rs b/src/test/ui/error-codes/E0530.rs
deleted file mode 100644
index 5bc40964f64..00000000000
--- a/src/test/ui/error-codes/E0530.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-fn main() {
-    static TEST: i32 = 0;
-
-    let r: (i32, i32) = (0, 0);
-    match r {
-        TEST => {} //~ ERROR E0530
-    }
-}
diff --git a/src/test/ui/error-codes/E0530.stderr b/src/test/ui/error-codes/E0530.stderr
deleted file mode 100644
index c312144132d..00000000000
--- a/src/test/ui/error-codes/E0530.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0530]: match bindings cannot shadow statics
-  --> $DIR/E0530.rs:6:9
-   |
-LL |     static TEST: i32 = 0;
-   |     --------------------- the static `TEST` is defined here
-...
-LL |         TEST => {}
-   |         ^^^^ cannot be named the same as a static
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0530`.
diff --git a/src/test/ui/error-codes/E0532.rs b/src/test/ui/error-codes/E0532.rs
deleted file mode 100644
index 486da0e029e..00000000000
--- a/src/test/ui/error-codes/E0532.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-fn main() {
-    let value = 1;
-
-    match SomeStruct(value) {
-        StructConst1(_) => { },
-        //~^ ERROR expected tuple struct or tuple variant, found constant `StructConst1`
-        _ => { },
-    }
-
-    struct SomeStruct(u8);
-
-    const StructConst1 : SomeStruct = SomeStruct(1);
-    const StructConst2 : SomeStruct = SomeStruct(2);
-}
diff --git a/src/test/ui/error-codes/E0532.stderr b/src/test/ui/error-codes/E0532.stderr
deleted file mode 100644
index eeccadccc63..00000000000
--- a/src/test/ui/error-codes/E0532.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0532]: expected tuple struct or tuple variant, found constant `StructConst1`
-  --> $DIR/E0532.rs:5:9
-   |
-LL |         StructConst1(_) => { },
-   |         ^^^^^^^^^^^^ not a tuple struct or tuple variant
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0532`.
diff --git a/src/test/ui/error-codes/E0534.rs b/src/test/ui/error-codes/E0534.rs
deleted file mode 100644
index a4242499419..00000000000
--- a/src/test/ui/error-codes/E0534.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#[inline()] //~ ERROR E0534
-pub fn something() {}
-
-fn main() {
-    something();
-}
diff --git a/src/test/ui/error-codes/E0534.stderr b/src/test/ui/error-codes/E0534.stderr
deleted file mode 100644
index 23f9cd7ce2d..00000000000
--- a/src/test/ui/error-codes/E0534.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0534]: expected one argument
-  --> $DIR/E0534.rs:1:1
-   |
-LL | #[inline()]
-   | ^^^^^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0534`.
diff --git a/src/test/ui/error-codes/E0559.rs b/src/test/ui/error-codes/E0559.rs
deleted file mode 100644
index c6d04ff148a..00000000000
--- a/src/test/ui/error-codes/E0559.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-enum Field {
-    Fool { x: u32 },
-}
-
-fn main() {
-    let s = Field::Fool { joke: 0 };
-    //~^ ERROR E0559
-}
diff --git a/src/test/ui/error-codes/E0559.stderr b/src/test/ui/error-codes/E0559.stderr
deleted file mode 100644
index 63ee1cd7820..00000000000
--- a/src/test/ui/error-codes/E0559.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0559]: variant `Field::Fool` has no field named `joke`
-  --> $DIR/E0559.rs:6:27
-   |
-LL |     let s = Field::Fool { joke: 0 };
-   |                           ^^^^ `Field::Fool` does not have this field
-   |
-   = note: available fields are: `x`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0559`.
diff --git a/src/test/ui/error-codes/E0560.rs b/src/test/ui/error-codes/E0560.rs
deleted file mode 100644
index 1d60f8948ab..00000000000
--- a/src/test/ui/error-codes/E0560.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-struct Simba {
-    mother: u32,
-}
-
-fn main() {
-    let s = Simba { mother: 1, father: 0 };
-    //~^ ERROR E0560
-}
diff --git a/src/test/ui/error-codes/E0560.stderr b/src/test/ui/error-codes/E0560.stderr
deleted file mode 100644
index 6b634f1855d..00000000000
--- a/src/test/ui/error-codes/E0560.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0560]: struct `Simba` has no field named `father`
-  --> $DIR/E0560.rs:6:32
-   |
-LL |     let s = Simba { mother: 1, father: 0 };
-   |                                ^^^^^^ `Simba` does not have this field
-   |
-   = note: available fields are: `mother`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0560`.
diff --git a/src/test/ui/error-codes/E0565-1.rs b/src/test/ui/error-codes/E0565-1.rs
deleted file mode 100644
index 30fba019199..00000000000
--- a/src/test/ui/error-codes/E0565-1.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-// deprecated doesn't currently support literals
-#[deprecated("since")] //~ ERROR E0565
-fn f() {  }
-
-fn main() {  }
diff --git a/src/test/ui/error-codes/E0565-1.stderr b/src/test/ui/error-codes/E0565-1.stderr
deleted file mode 100644
index 1283a9c5ef6..00000000000
--- a/src/test/ui/error-codes/E0565-1.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0565]: item in `deprecated` must be a key/value pair
-  --> $DIR/E0565-1.rs:2:14
-   |
-LL | #[deprecated("since")]
-   |              ^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0565`.
diff --git a/src/test/ui/error-codes/E0565-2.rs b/src/test/ui/error-codes/E0565-2.rs
deleted file mode 100644
index 0319ecb11f9..00000000000
--- a/src/test/ui/error-codes/E0565-2.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-// repr currently doesn't support literals
-#[deprecated(since = b"1.29", note = "hi")] //~ ERROR E0565
-struct A {  }
-
-fn main() {  }
diff --git a/src/test/ui/error-codes/E0565-2.stderr b/src/test/ui/error-codes/E0565-2.stderr
deleted file mode 100644
index 097871bd319..00000000000
--- a/src/test/ui/error-codes/E0565-2.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0565]: literal in `deprecated` value must be a string
-  --> $DIR/E0565-2.rs:2:22
-   |
-LL | #[deprecated(since = b"1.29", note = "hi")]
-   |                      -^^^^^^
-   |                      |
-   |                      help: consider removing the prefix
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0565`.
diff --git a/src/test/ui/error-codes/E0565.rs b/src/test/ui/error-codes/E0565.rs
deleted file mode 100644
index df76f6b13af..00000000000
--- a/src/test/ui/error-codes/E0565.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-// repr currently doesn't support literals
-#[repr("C")] //~ ERROR E0565
-struct A {}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0565.stderr b/src/test/ui/error-codes/E0565.stderr
deleted file mode 100644
index 6ed90c0ae4f..00000000000
--- a/src/test/ui/error-codes/E0565.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0565]: meta item in `repr` must be an identifier
-  --> $DIR/E0565.rs:2:8
-   |
-LL | #[repr("C")]
-   |        ^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0565`.
diff --git a/src/test/ui/error-codes/E0572.rs b/src/test/ui/error-codes/E0572.rs
deleted file mode 100644
index cb842c9334d..00000000000
--- a/src/test/ui/error-codes/E0572.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 36619f8dee4..00000000000
--- a/src/test/ui/error-codes/E0572.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0572]: return statement outside of function body
-  --> $DIR/E0572.rs:1:18
-   |
-LL | const FOO: u32 = return 0;
-   |                  ^^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0572`.
diff --git a/src/test/ui/error-codes/E0582.rs b/src/test/ui/error-codes/E0582.rs
deleted file mode 100644
index ff25012d0f9..00000000000
--- a/src/test/ui/error-codes/E0582.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-// This test was derived from the wasm and parsell crates.  They
-// stopped compiling when #32330 is fixed.
-
-#![allow(dead_code, unused_variables)]
-
-use std::str::Chars;
-
-pub trait HasOutput<Ch, Str> {
-    type Output;
-}
-
-#[derive(Clone, PartialEq, Eq, Hash, Ord, PartialOrd, Debug)]
-pub enum Token<'a> {
-    Begin(&'a str)
-}
-
-fn mk_unexpected_char_err<'a>() -> Option<&'a i32> {
-    unimplemented!()
-}
-
-fn foo<'a>(data: &mut Chars<'a>) {
-    bar(mk_unexpected_char_err)
-}
-
-fn bar<F>(t: F)
-    // No type can satisfy this requirement, since `'a` does not
-    // appear in any of the input types:
-    where F: for<'a> Fn() -> Option<&'a i32>
-    //~^ ERROR E0582
-{
-}
-
-fn baz<F>(t: F)
-    // No type can satisfy this requirement, since `'a` does not
-    // appear in any of the input types:
-    where F: for<'a> Iterator<Item=&'a i32>
-    //~^ ERROR E0582
-{
-}
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0582.stderr b/src/test/ui/error-codes/E0582.stderr
deleted file mode 100644
index 81a2f004653..00000000000
--- a/src/test/ui/error-codes/E0582.stderr
+++ /dev/null
@@ -1,15 +0,0 @@
-error[E0582]: binding for associated type `Output` references lifetime `'a`, which does not appear in the trait input types
-  --> $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:36:31
-   |
-LL |     where F: for<'a> Iterator<Item=&'a i32>
-   |                               ^^^^^^^^^^^^
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0582`.
diff --git a/src/test/ui/error-codes/E0583.rs b/src/test/ui/error-codes/E0583.rs
deleted file mode 100644
index 969de79c058..00000000000
--- a/src/test/ui/error-codes/E0583.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-mod module_that_doesnt_exist; //~ ERROR E0583
-
-fn main() {
-}
diff --git a/src/test/ui/error-codes/E0583.stderr b/src/test/ui/error-codes/E0583.stderr
deleted file mode 100644
index c7bbbf11499..00000000000
--- a/src/test/ui/error-codes/E0583.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0583]: file not found for module `module_that_doesnt_exist`
-  --> $DIR/E0583.rs:1:1
-   |
-LL | mod module_that_doesnt_exist;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = help: to create the module `module_that_doesnt_exist`, create file "$DIR/module_that_doesnt_exist.rs" or "$DIR/module_that_doesnt_exist/mod.rs"
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0583`.
diff --git a/src/test/ui/error-codes/E0585.rs b/src/test/ui/error-codes/E0585.rs
deleted file mode 100644
index 890b77b533a..00000000000
--- a/src/test/ui/error-codes/E0585.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 53c82fb416b..00000000000
--- a/src/test/ui/error-codes/E0585.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0585]: found a documentation comment that doesn't document anything
-  --> $DIR/E0585.rs:2:5
-   |
-LL |     /// Hello! I'm useless...
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = help: doc comments must come before what they document, if a comment was intended use `//`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0585`.
diff --git a/src/test/ui/error-codes/E0586.rs b/src/test/ui/error-codes/E0586.rs
deleted file mode 100644
index 2ab8a2959e3..00000000000
--- a/src/test/ui/error-codes/E0586.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 0bbf9a60803..00000000000
--- a/src/test/ui/error-codes/E0586.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0586]: inclusive range with no end
-  --> $DIR/E0586.rs:3:19
-   |
-LL |     let x = &tmp[1..=];
-   |                   ^^^ help: use `..` instead
-   |
-   = note: inclusive ranges must be bounded at the end (`..=b` or `a..=b`)
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0586`.
diff --git a/src/test/ui/error-codes/E0594.rs b/src/test/ui/error-codes/E0594.rs
deleted file mode 100644
index 8b0cae7e17b..00000000000
--- a/src/test/ui/error-codes/E0594.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-static NUM: i32 = 18;
-
-fn main() {
-    NUM = 20; //~ ERROR cannot assign to immutable static item `NUM`
-}
diff --git a/src/test/ui/error-codes/E0594.stderr b/src/test/ui/error-codes/E0594.stderr
deleted file mode 100644
index f4d96f4e45a..00000000000
--- a/src/test/ui/error-codes/E0594.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0594]: cannot assign to immutable static item `NUM`
-  --> $DIR/E0594.rs:4:5
-   |
-LL |     NUM = 20;
-   |     ^^^^^^^^ cannot assign
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0594`.
diff --git a/src/test/ui/error-codes/E0596.rs b/src/test/ui/error-codes/E0596.rs
deleted file mode 100644
index 9e2f5ee7636..00000000000
--- a/src/test/ui/error-codes/E0596.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-fn main() {
-    let x = 1;
-    let y = &mut x; //~ ERROR [E0596]
-}
diff --git a/src/test/ui/error-codes/E0596.stderr b/src/test/ui/error-codes/E0596.stderr
deleted file mode 100644
index 3f9aebcc8ae..00000000000
--- a/src/test/ui/error-codes/E0596.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
-  --> $DIR/E0596.rs:3:13
-   |
-LL |     let y = &mut x;
-   |             ^^^^^^ cannot borrow as mutable
-   |
-help: consider changing this to be mutable
-   |
-LL |     let mut x = 1;
-   |         +++
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/error-codes/E0597.rs b/src/test/ui/error-codes/E0597.rs
deleted file mode 100644
index 7217e351281..00000000000
--- a/src/test/ui/error-codes/E0597.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-struct Foo<'a> {
-    x: Option<&'a u32>,
-}
-
-fn main() {
-    let mut x = Foo { x: None };
-    let y = 0;
-    x.x = Some(&y);
-    //~^ `y` does not live long enough [E0597]
-}
-
-impl<'a> Drop for Foo<'a> { fn drop(&mut self) { } }
diff --git a/src/test/ui/error-codes/E0597.stderr b/src/test/ui/error-codes/E0597.stderr
deleted file mode 100644
index b4a1180ad54..00000000000
--- a/src/test/ui/error-codes/E0597.stderr
+++ /dev/null
@@ -1,17 +0,0 @@
-error[E0597]: `y` does not live long enough
-  --> $DIR/E0597.rs:8:16
-   |
-LL |     x.x = Some(&y);
-   |                ^^ borrowed value does not live long enough
-LL |
-LL | }
-   | -
-   | |
-   | `y` dropped here while still borrowed
-   | borrow might be used here, when `x` is dropped and runs the `Drop` code for type `Foo`
-   |
-   = note: values in a scope are dropped in the opposite order they are defined
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/error-codes/E0599.rs b/src/test/ui/error-codes/E0599.rs
deleted file mode 100644
index a2d7bb2dcbe..00000000000
--- a/src/test/ui/error-codes/E0599.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-struct Foo;
-
-fn main() {
-    || if let Foo::NotEvenReal() = Foo {}; //~ ERROR E0599
-}
diff --git a/src/test/ui/error-codes/E0599.stderr b/src/test/ui/error-codes/E0599.stderr
deleted file mode 100644
index a1fb58f483f..00000000000
--- a/src/test/ui/error-codes/E0599.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0599]: no associated item named `NotEvenReal` found for struct `Foo` in the current scope
-  --> $DIR/E0599.rs:4:20
-   |
-LL | struct Foo;
-   | ---------- associated item `NotEvenReal` not found for this struct
-...
-LL |     || if let Foo::NotEvenReal() = Foo {};
-   |                    ^^^^^^^^^^^ associated item not found in `Foo`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/error-codes/E0600.rs b/src/test/ui/error-codes/E0600.rs
deleted file mode 100644
index 7731d861935..00000000000
--- a/src/test/ui/error-codes/E0600.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn main() {
-    !"a"; //~ ERROR E0600
-}
diff --git a/src/test/ui/error-codes/E0600.stderr b/src/test/ui/error-codes/E0600.stderr
deleted file mode 100644
index 95ac4510ca8..00000000000
--- a/src/test/ui/error-codes/E0600.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0600]: cannot apply unary operator `!` to type `&'static str`
-  --> $DIR/E0600.rs:2:5
-   |
-LL |     !"a";
-   |     ^^^^ cannot apply unary operator `!`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0600`.
diff --git a/src/test/ui/error-codes/E0601.rs b/src/test/ui/error-codes/E0601.rs
deleted file mode 100644
index 4380ddeac0a..00000000000
--- a/src/test/ui/error-codes/E0601.rs
+++ /dev/null
@@ -1 +0,0 @@
-//~ ERROR `main` function not found
diff --git a/src/test/ui/error-codes/E0601.stderr b/src/test/ui/error-codes/E0601.stderr
deleted file mode 100644
index a687f575615..00000000000
--- a/src/test/ui/error-codes/E0601.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0601]: `main` function not found in crate `E0601`
-  --> $DIR/E0601.rs:1:37
-   |
-LL |
-   |                                     ^ consider adding a `main` function to `$DIR/E0601.rs`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0601`.
diff --git a/src/test/ui/error-codes/E0602.rs b/src/test/ui/error-codes/E0602.rs
deleted file mode 100644
index 8fadce526d9..00000000000
--- a/src/test/ui/error-codes/E0602.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// compile-flags:-D bogus
-
-// error-pattern:E0602
-// error-pattern:requested on the command line with `-D bogus`
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0602.stderr b/src/test/ui/error-codes/E0602.stderr
deleted file mode 100644
index 2b372263345..00000000000
--- a/src/test/ui/error-codes/E0602.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0602]: unknown lint: `bogus`
-   |
-   = note: requested on the command line with `-D bogus`
-
-error[E0602]: unknown lint: `bogus`
-   |
-   = note: requested on the command line with `-D bogus`
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0602`.
diff --git a/src/test/ui/error-codes/E0603.rs b/src/test/ui/error-codes/E0603.rs
deleted file mode 100644
index 24a9ba88763..00000000000
--- a/src/test/ui/error-codes/E0603.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-mod SomeModule {
-    const PRIVATE: u32 = 0x_a_bad_1dea_u32;
-}
-
-fn main() {
-    SomeModule::PRIVATE; //~ ERROR E0603
-}
diff --git a/src/test/ui/error-codes/E0603.stderr b/src/test/ui/error-codes/E0603.stderr
deleted file mode 100644
index ee902584f56..00000000000
--- a/src/test/ui/error-codes/E0603.stderr
+++ /dev/null
@@ -1,15 +0,0 @@
-error[E0603]: constant `PRIVATE` is private
-  --> $DIR/E0603.rs:6:17
-   |
-LL |     SomeModule::PRIVATE;
-   |                 ^^^^^^^ private constant
-   |
-note: the constant `PRIVATE` is defined here
-  --> $DIR/E0603.rs:2:5
-   |
-LL |     const PRIVATE: u32 = 0x_a_bad_1dea_u32;
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0603`.
diff --git a/src/test/ui/error-codes/E0604.rs b/src/test/ui/error-codes/E0604.rs
deleted file mode 100644
index b9c0d1f924d..00000000000
--- a/src/test/ui/error-codes/E0604.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 68da03928b7..00000000000
--- a/src/test/ui/error-codes/E0604.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0604]: only `u8` can be cast as `char`, not `u32`
-  --> $DIR/E0604.rs:2:5
-   |
-LL |     1u32 as char;
-   |     ^^^^^^^^^^^^
-   |     |
-   |     invalid cast
-   |     help: try `char::from_u32` instead: `char::from_u32(1u32)`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0604`.
diff --git a/src/test/ui/error-codes/E0605.rs b/src/test/ui/error-codes/E0605.rs
deleted file mode 100644
index cfbf1aa2bd7..00000000000
--- a/src/test/ui/error-codes/E0605.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-fn main() {
-    let x = 0u8;
-    x as Vec<u8>; //~ ERROR E0605
-
-    let v = std::ptr::null::<u8>();
-    v as &u8; //~ ERROR E0605
-}
diff --git a/src/test/ui/error-codes/E0605.stderr b/src/test/ui/error-codes/E0605.stderr
deleted file mode 100644
index e385b339402..00000000000
--- a/src/test/ui/error-codes/E0605.stderr
+++ /dev/null
@@ -1,21 +0,0 @@
-error[E0605]: non-primitive cast: `u8` as `Vec<u8>`
-  --> $DIR/E0605.rs:3:5
-   |
-LL |     x as Vec<u8>;
-   |     ^^^^^^^^^^^^ an `as` expression can only be used to convert between primitive types or to coerce to a specific trait object
-
-error[E0605]: non-primitive cast: `*const u8` as `&u8`
-  --> $DIR/E0605.rs:6:5
-   |
-LL |     v as &u8;
-   |     ^^^^^^^^ invalid cast
-   |
-help: consider borrowing the value
-   |
-LL -     v as &u8;
-LL +     &*v;
-   |
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0605`.
diff --git a/src/test/ui/error-codes/E0606.rs b/src/test/ui/error-codes/E0606.rs
deleted file mode 100644
index cb0d8cfc31e..00000000000
--- a/src/test/ui/error-codes/E0606.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index fce24886eb0..00000000000
--- a/src/test/ui/error-codes/E0606.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0606]: casting `&u8` as `u8` is invalid
-  --> $DIR/E0606.rs:2:5
-   |
-LL |     &0u8 as u8;
-   |     ----^^^^^^
-   |     |
-   |     cannot cast `&u8` as `u8`
-   |     help: dereference the expression: `*&0u8`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0606`.
diff --git a/src/test/ui/error-codes/E0607.rs b/src/test/ui/error-codes/E0607.rs
deleted file mode 100644
index 65001c471cb..00000000000
--- a/src/test/ui/error-codes/E0607.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-fn main() {
-    let v = core::ptr::null::<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
deleted file mode 100644
index a0fe02c1c4d..00000000000
--- a/src/test/ui/error-codes/E0607.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0607]: cannot cast thin pointer `*const u8` to fat pointer `*const [u8]`
-  --> $DIR/E0607.rs:3:5
-   |
-LL |     v as *const [u8];
-   |     ^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0607`.
diff --git a/src/test/ui/error-codes/E0608.rs b/src/test/ui/error-codes/E0608.rs
deleted file mode 100644
index 1e342d6685f..00000000000
--- a/src/test/ui/error-codes/E0608.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn main() {
-    0u8[2]; //~ ERROR E0608
-}
diff --git a/src/test/ui/error-codes/E0608.stderr b/src/test/ui/error-codes/E0608.stderr
deleted file mode 100644
index 3aec509934b..00000000000
--- a/src/test/ui/error-codes/E0608.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0608]: cannot index into a value of type `u8`
-  --> $DIR/E0608.rs:2:5
-   |
-LL |     0u8[2];
-   |     ^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0608`.
diff --git a/src/test/ui/error-codes/E0609.rs b/src/test/ui/error-codes/E0609.rs
deleted file mode 100644
index e3a97f2fb26..00000000000
--- a/src/test/ui/error-codes/E0609.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-struct Foo {
-    x: u32,
-}
-struct Bar;
-
-fn main() {
-    let x = Foo { x: 0 };
-    let _ = x.foo; //~ ERROR E0609
-
-    let y = Bar;
-    y.1; //~ ERROR E0609
-}
diff --git a/src/test/ui/error-codes/E0609.stderr b/src/test/ui/error-codes/E0609.stderr
deleted file mode 100644
index 797e95d02dd..00000000000
--- a/src/test/ui/error-codes/E0609.stderr
+++ /dev/null
@@ -1,17 +0,0 @@
-error[E0609]: no field `foo` on type `Foo`
-  --> $DIR/E0609.rs:8:15
-   |
-LL |     let _ = x.foo;
-   |               ^^^ unknown field
-   |
-   = note: available fields are: `x`
-
-error[E0609]: no field `1` on type `Bar`
-  --> $DIR/E0609.rs:11:7
-   |
-LL |     y.1;
-   |       ^ unknown field
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0609`.
diff --git a/src/test/ui/error-codes/E0610.rs b/src/test/ui/error-codes/E0610.rs
deleted file mode 100644
index de246f3712e..00000000000
--- a/src/test/ui/error-codes/E0610.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index a2966eea44c..00000000000
--- a/src/test/ui/error-codes/E0610.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
-  --> $DIR/E0610.rs:3:15
-   |
-LL |     let _ = x.foo;
-   |               ^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0610`.
diff --git a/src/test/ui/error-codes/E0614.rs b/src/test/ui/error-codes/E0614.rs
deleted file mode 100644
index 6b4817b692e..00000000000
--- a/src/test/ui/error-codes/E0614.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 598117c2b60..00000000000
--- a/src/test/ui/error-codes/E0614.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0614]: type `u32` cannot be dereferenced
-  --> $DIR/E0614.rs:3:5
-   |
-LL |     *y;
-   |     ^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0614`.
diff --git a/src/test/ui/error-codes/E0615.rs b/src/test/ui/error-codes/E0615.rs
deleted file mode 100644
index d04e4d5f7e1..00000000000
--- a/src/test/ui/error-codes/E0615.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-struct Foo {
-    x: u32,
-}
-
-impl Foo {
-    fn method(&self) {}
-}
-
-fn main() {
-    let f = Foo { x: 0 };
-    f.method; //~ ERROR E0615
-}
diff --git a/src/test/ui/error-codes/E0615.stderr b/src/test/ui/error-codes/E0615.stderr
deleted file mode 100644
index c12e1a3a643..00000000000
--- a/src/test/ui/error-codes/E0615.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error[E0615]: attempted to take value of method `method` on type `Foo`
-  --> $DIR/E0615.rs:11:7
-   |
-LL |     f.method;
-   |       ^^^^^^ method, not a field
-   |
-help: use parentheses to call the method
-   |
-LL |     f.method();
-   |             ++
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0615`.
diff --git a/src/test/ui/error-codes/E0616.rs b/src/test/ui/error-codes/E0616.rs
deleted file mode 100644
index 98f87a83bc5..00000000000
--- a/src/test/ui/error-codes/E0616.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-mod a {
-    pub struct Foo {
-        x: u32,
-    }
-
-    impl Foo {
-        pub fn new() -> Foo { Foo { x: 0 } }
-    }
-}
-
-fn main() {
-    let f = a::Foo::new();
-    f.x; //~ ERROR E0616
-}
diff --git a/src/test/ui/error-codes/E0616.stderr b/src/test/ui/error-codes/E0616.stderr
deleted file mode 100644
index da349ed2fde..00000000000
--- a/src/test/ui/error-codes/E0616.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0616]: field `x` of struct `Foo` is private
-  --> $DIR/E0616.rs:13:7
-   |
-LL |     f.x;
-   |       ^ private field
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0616`.
diff --git a/src/test/ui/error-codes/E0617.rs b/src/test/ui/error-codes/E0617.rs
deleted file mode 100644
index b71ba0ed88b..00000000000
--- a/src/test/ui/error-codes/E0617.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-extern "C" {
-    fn printf(c: *const i8, ...);
-}
-
-fn main() {
-    unsafe {
-        printf(::std::ptr::null(), 0f32);
-        //~^ ERROR can't pass `f32` to variadic function
-        //~| HELP cast the value to `c_double`
-        printf(::std::ptr::null(), 0i8);
-        //~^ ERROR can't pass `i8` to variadic function
-        //~| HELP cast the value to `c_int`
-        printf(::std::ptr::null(), 0i16);
-        //~^ ERROR can't pass `i16` to variadic function
-        //~| HELP cast the value to `c_int`
-        printf(::std::ptr::null(), 0u8);
-        //~^ ERROR can't pass `u8` to variadic function
-        //~| HELP cast the value to `c_uint`
-        printf(::std::ptr::null(), 0u16);
-        //~^ ERROR can't pass `u16` to variadic function
-        //~| HELP cast the value to `c_uint`
-        printf(::std::ptr::null(), printf);
-        //~^ ERROR can't pass `unsafe extern "C" fn(*const i8, ...) {printf}` to variadic function
-        //~| HELP cast the value to `unsafe extern "C" fn(*const i8, ...)`
-    }
-}
diff --git a/src/test/ui/error-codes/E0617.stderr b/src/test/ui/error-codes/E0617.stderr
deleted file mode 100644
index ea91ad08292..00000000000
--- a/src/test/ui/error-codes/E0617.stderr
+++ /dev/null
@@ -1,44 +0,0 @@
-error[E0617]: can't pass `f32` to variadic function
-  --> $DIR/E0617.rs:7: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:10: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:13: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:16: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:19: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:22:36
-   |
-LL |         printf(::std::ptr::null(), printf);
-   |                                    ^^^^^^
-   |
-help: cast the value to `unsafe extern "C" fn(*const i8, ...)`
-   |
-LL |         printf(::std::ptr::null(), printf as unsafe extern "C" fn(*const i8, ...));
-   |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-error: aborting due to 6 previous errors
-
-For more information about this error, try `rustc --explain E0617`.
diff --git a/src/test/ui/error-codes/E0618.rs b/src/test/ui/error-codes/E0618.rs
deleted file mode 100644
index 2616e7134c5..00000000000
--- a/src/test/ui/error-codes/E0618.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-enum X {
-    Entry,
-}
-
-fn main() {
-    X::Entry();
-    //~^ ERROR expected function, found enum variant `X::Entry` [E0618]
-    let x = 0i32;
-    x();
-    //~^ ERROR expected function, found `i32` [E0618]
-}
diff --git a/src/test/ui/error-codes/E0618.stderr b/src/test/ui/error-codes/E0618.stderr
deleted file mode 100644
index 793ec02a86f..00000000000
--- a/src/test/ui/error-codes/E0618.stderr
+++ /dev/null
@@ -1,30 +0,0 @@
-error[E0618]: expected function, found enum variant `X::Entry`
-  --> $DIR/E0618.rs:6:5
-   |
-LL |     Entry,
-   |     ----- enum variant `X::Entry` defined here
-...
-LL |     X::Entry();
-   |     ^^^^^^^^--
-   |     |
-   |     call expression requires function
-   |
-help: `X::Entry` is a unit enum variant, and does not take parentheses to be constructed
-   |
-LL -     X::Entry();
-LL +     X::Entry;
-   |
-
-error[E0618]: expected function, found `i32`
-  --> $DIR/E0618.rs:9:5
-   |
-LL |     let x = 0i32;
-   |         - `x` has type `i32`
-LL |     x();
-   |     ^--
-   |     |
-   |     call expression requires function
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0618`.
diff --git a/src/test/ui/error-codes/E0620.rs b/src/test/ui/error-codes/E0620.rs
deleted file mode 100644
index 2831413eab0..00000000000
--- a/src/test/ui/error-codes/E0620.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 65152b2b74d..00000000000
--- a/src/test/ui/error-codes/E0620.stderr
+++ /dev/null
@@ -1,15 +0,0 @@
-error[E0620]: cast to unsized type: `&[usize; 2]` as `[usize]`
-  --> $DIR/E0620.rs:2:16
-   |
-LL |     let _foo = &[1_usize, 2] as [usize];
-   |                ^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-help: consider using an implicit coercion to `&[usize]` instead
-  --> $DIR/E0620.rs:2:16
-   |
-LL |     let _foo = &[1_usize, 2] as [usize];
-   |                ^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain 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
deleted file mode 100644
index 44f174c0fb7..00000000000
--- a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Test that we give the generic error 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`).
-
-fn invoke<'a, F>(x: &'a i32, f: F) -> &'a i32
-where F: FnOnce(&'a i32, &i32) -> &'a i32
-{
-    let y = 22;
-    f(x, &y)
-}
-
-fn foo<'a>(x: &'a i32) {
-    invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR lifetime may not live long enough
-}
-
-fn main() {}
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
deleted file mode 100644
index b9edeb8346b..00000000000
--- a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error: lifetime may not live long enough
-  --> $DIR/E0621-does-not-trigger-for-closures.rs:13:45
-   |
-LL |     invoke(&x, |a, b| if a > b { a } else { b });
-   |                    --                       ^ returning this value requires that `'1` must outlive `'2`
-   |                    ||
-   |                    |return type of closure is &'2 i32
-   |                    has type `&'1 i32`
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/error-codes/E0622.rs b/src/test/ui/error-codes/E0622.rs
deleted file mode 100644
index ae7378a707e..00000000000
--- a/src/test/ui/error-codes/E0622.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#![feature(intrinsics)]
-extern "rust-intrinsic" {
-    pub static breakpoint : unsafe extern "rust-intrinsic" fn();
-    //~^ ERROR intrinsic must be a function [E0622]
-}
-fn main() { unsafe { breakpoint(); } }
diff --git a/src/test/ui/error-codes/E0622.stderr b/src/test/ui/error-codes/E0622.stderr
deleted file mode 100644
index 8466dfe3848..00000000000
--- a/src/test/ui/error-codes/E0622.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0622]: intrinsic must be a function
-  --> $DIR/E0622.rs:3:5
-   |
-LL |     pub static breakpoint : unsafe extern "rust-intrinsic" fn();
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected a function
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0622`.
diff --git a/src/test/ui/error-codes/E0624.rs b/src/test/ui/error-codes/E0624.rs
deleted file mode 100644
index 4c68b70fb16..00000000000
--- a/src/test/ui/error-codes/E0624.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-mod inner {
-    pub struct Foo;
-
-    impl Foo {
-        fn method(&self) {}
-    }
-}
-
-fn main() {
-    let foo = inner::Foo;
-    foo.method(); //~ ERROR associated function `method` is private [E0624]
-}
diff --git a/src/test/ui/error-codes/E0624.stderr b/src/test/ui/error-codes/E0624.stderr
deleted file mode 100644
index e59b8a8ae35..00000000000
--- a/src/test/ui/error-codes/E0624.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0624]: associated function `method` is private
-  --> $DIR/E0624.rs:11:9
-   |
-LL |         fn method(&self) {}
-   |         ---------------- private associated function defined here
-...
-LL |     foo.method();
-   |         ^^^^^^ private associated function
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0624`.
diff --git a/src/test/ui/error-codes/E0637.rs b/src/test/ui/error-codes/E0637.rs
deleted file mode 100644
index 382ce3ed01f..00000000000
--- a/src/test/ui/error-codes/E0637.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-fn underscore_lifetime<'_>(str1: &'_ str, str2: &'_ str) -> &'_ str {
-    //~^ ERROR: `'_` cannot be used here [E0637]
-    //~| ERROR: missing lifetime specifier
-    if str1.len() > str2.len() {
-        str1
-    } else {
-        str2
-    }
-}
-
-fn and_without_explicit_lifetime<T>()
-where
-    T: Into<&u32>, //~ ERROR: `&` without an explicit lifetime name cannot be used here [E0637]
-{
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0637.stderr b/src/test/ui/error-codes/E0637.stderr
deleted file mode 100644
index 78341735e19..00000000000
--- a/src/test/ui/error-codes/E0637.stderr
+++ /dev/null
@@ -1,34 +0,0 @@
-error[E0637]: `'_` cannot be used here
-  --> $DIR/E0637.rs:1:24
-   |
-LL | fn underscore_lifetime<'_>(str1: &'_ str, str2: &'_ str) -> &'_ str {
-   |                        ^^ `'_` is a reserved lifetime name
-
-error[E0106]: missing lifetime specifier
-  --> $DIR/E0637.rs:1:62
-   |
-LL | fn underscore_lifetime<'_>(str1: &'_ str, str2: &'_ str) -> &'_ str {
-   |                                  -------        -------      ^^ expected named lifetime parameter
-   |
-   = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from `str1` or `str2`
-help: consider introducing a named lifetime parameter
-   |
-LL | fn underscore_lifetime<'a, '_>(str1: &'a str, str2: &'a str) -> &'a str {
-   |                        +++            ~~             ~~          ~~
-
-error[E0637]: `&` without an explicit lifetime name cannot be used here
-  --> $DIR/E0637.rs:13:13
-   |
-LL |     T: Into<&u32>,
-   |             ^ explicit lifetime name needed here
-   |
-help: consider introducing a higher-ranked lifetime here with `for<'a>`
-  --> $DIR/E0637.rs:13:8
-   |
-LL |     T: Into<&u32>,
-   |        ^
-
-error: aborting due to 3 previous errors
-
-Some errors have detailed explanations: E0106, E0637.
-For more information about an error, try `rustc --explain E0106`.
diff --git a/src/test/ui/error-codes/E0642.fixed b/src/test/ui/error-codes/E0642.fixed
deleted file mode 100644
index fc6255e0274..00000000000
--- a/src/test/ui/error-codes/E0642.fixed
+++ /dev/null
@@ -1,20 +0,0 @@
-// run-rustfix
-
-#![allow(unused)] // for rustfix
-
-#[derive(Clone, Copy)]
-struct S;
-
-trait T {
-    fn foo(_: (i32, i32)); //~ ERROR patterns aren't allowed in methods without bodies
-
-    fn bar(_: (i32, i32)) {} //~ ERROR patterns aren't allowed in methods without bodies
-
-    fn method(_: S) {} //~ ERROR patterns aren't allowed in methods without bodies
-
-    fn f(&ident: &S) {} // ok
-    fn g(&&ident: &&S) {} // ok
-    fn h(mut ident: S) {} // ok
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0642.rs b/src/test/ui/error-codes/E0642.rs
deleted file mode 100644
index 5f85f3935e1..00000000000
--- a/src/test/ui/error-codes/E0642.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// run-rustfix
-
-#![allow(unused)] // for rustfix
-
-#[derive(Clone, Copy)]
-struct S;
-
-trait T {
-    fn foo((x, y): (i32, i32)); //~ ERROR patterns aren't allowed in methods without bodies
-
-    fn bar((x, y): (i32, i32)) {} //~ ERROR patterns aren't allowed in methods without bodies
-
-    fn method(S { .. }: S) {} //~ ERROR patterns aren't allowed in methods without bodies
-
-    fn f(&ident: &S) {} // ok
-    fn g(&&ident: &&S) {} // ok
-    fn h(mut ident: S) {} // ok
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0642.stderr b/src/test/ui/error-codes/E0642.stderr
deleted file mode 100644
index dd9e28ad492..00000000000
--- a/src/test/ui/error-codes/E0642.stderr
+++ /dev/null
@@ -1,36 +0,0 @@
-error[E0642]: patterns aren't allowed in methods without bodies
-  --> $DIR/E0642.rs:9:12
-   |
-LL |     fn foo((x, y): (i32, i32));
-   |            ^^^^^^
-   |
-help: give this argument a name or use an underscore to ignore it
-   |
-LL |     fn foo(_: (i32, i32));
-   |            ~
-
-error[E0642]: patterns aren't allowed in methods without bodies
-  --> $DIR/E0642.rs:11:12
-   |
-LL |     fn bar((x, y): (i32, i32)) {}
-   |            ^^^^^^
-   |
-help: give this argument a name or use an underscore to ignore it
-   |
-LL |     fn bar(_: (i32, i32)) {}
-   |            ~
-
-error[E0642]: patterns aren't allowed in methods without bodies
-  --> $DIR/E0642.rs:13:15
-   |
-LL |     fn method(S { .. }: S) {}
-   |               ^^^^^^^^
-   |
-help: give this argument a name or use an underscore to ignore it
-   |
-LL |     fn method(_: S) {}
-   |               ~
-
-error: aborting due to 3 previous errors
-
-For more information about this error, try `rustc --explain E0642`.
diff --git a/src/test/ui/error-codes/E0646.rs b/src/test/ui/error-codes/E0646.rs
deleted file mode 100644
index bb62428f53f..00000000000
--- a/src/test/ui/error-codes/E0646.rs
+++ /dev/null
@@ -1 +0,0 @@
-fn main() where (): Copy {} //~ ERROR [E0646]
diff --git a/src/test/ui/error-codes/E0646.stderr b/src/test/ui/error-codes/E0646.stderr
deleted file mode 100644
index 069401b3f18..00000000000
--- a/src/test/ui/error-codes/E0646.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0646]: `main` function is not allowed to have a `where` clause
-  --> $DIR/E0646.rs:1:11
-   |
-LL | fn main() where (): Copy {}
-   |           ^^^^^^^^^^^^^^ `main` cannot have a `where` clause
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0646`.
diff --git a/src/test/ui/error-codes/E0647.rs b/src/test/ui/error-codes/E0647.rs
deleted file mode 100644
index fc085511cbc..00000000000
--- a/src/test/ui/error-codes/E0647.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-#![no_std]
-#![feature(start)]
-
-extern crate std;
-
-#[start]
-fn start(_: isize, _: *const *const u8) -> isize where (): Copy { //~ ERROR [E0647]
-    0
-}
diff --git a/src/test/ui/error-codes/E0647.stderr b/src/test/ui/error-codes/E0647.stderr
deleted file mode 100644
index 08cedfaef04..00000000000
--- a/src/test/ui/error-codes/E0647.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0647]: start function is not allowed to have a `where` clause
-  --> $DIR/E0647.rs:7:50
-   |
-LL | fn start(_: isize, _: *const *const u8) -> isize where (): Copy {
-   |                                                  ^^^^^^^^^^^^^^ start function cannot have a `where` clause
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0647`.
diff --git a/src/test/ui/error-codes/E0648.rs b/src/test/ui/error-codes/E0648.rs
deleted file mode 100644
index 8408a78c7a6..00000000000
--- a/src/test/ui/error-codes/E0648.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-#[export_name="\0foo"] //~ ERROR E0648
-pub fn bar() {}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0648.stderr b/src/test/ui/error-codes/E0648.stderr
deleted file mode 100644
index 1a65825c7b6..00000000000
--- a/src/test/ui/error-codes/E0648.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0648]: `export_name` may not contain null characters
-  --> $DIR/E0648.rs:1:1
-   |
-LL | #[export_name="\0foo"]
-   | ^^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0648`.
diff --git a/src/test/ui/error-codes/E0657.rs b/src/test/ui/error-codes/E0657.rs
deleted file mode 100644
index cb11de13f73..00000000000
--- a/src/test/ui/error-codes/E0657.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-#![allow(warnings)]
-
-trait Id<T> {}
-trait Lt<'a> {}
-
-impl<'a> Lt<'a> for () {}
-impl<T> Id<T> for T {}
-
-fn free_fn_capture_hrtb_in_impl_trait()
-    -> Box<for<'a> Id<impl Lt<'a>>>
-        //~^ ERROR `impl Trait` can only capture lifetimes bound at the fn or impl level [E0657]
-{
-    Box::new(())
-}
-
-struct Foo;
-impl Foo {
-    fn impl_fn_capture_hrtb_in_impl_trait()
-        -> Box<for<'a> Id<impl Lt<'a>>>
-            //~^ ERROR `impl Trait` can only capture lifetimes bound at the fn or impl level
-    {
-        Box::new(())
-    }
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0657.stderr b/src/test/ui/error-codes/E0657.stderr
deleted file mode 100644
index df76b45a589..00000000000
--- a/src/test/ui/error-codes/E0657.stderr
+++ /dev/null
@@ -1,15 +0,0 @@
-error[E0657]: `impl Trait` can only capture lifetimes bound at the fn or impl level
-  --> $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:19:35
-   |
-LL |         -> Box<for<'a> Id<impl Lt<'a>>>
-   |                                   ^^
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0657`.
diff --git a/src/test/ui/error-codes/E0658.rs b/src/test/ui/error-codes/E0658.rs
deleted file mode 100644
index 9c9b95d70a7..00000000000
--- a/src/test/ui/error-codes/E0658.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#[repr(u128)]
-enum Foo { //~ ERROR E0658
-    Bar(u64),
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0658.stderr b/src/test/ui/error-codes/E0658.stderr
deleted file mode 100644
index 8d423484528..00000000000
--- a/src/test/ui/error-codes/E0658.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0658]: repr with 128-bit type is unstable
-  --> $DIR/E0658.rs:2:1
-   |
-LL | enum Foo {
-   | ^^^^^^^^
-   |
-   = note: see issue #56071 <https://github.com/rust-lang/rust/issues/56071> for more information
-   = help: add `#![feature(repr128)]` to the crate attributes to enable
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/error-codes/E0659.rs b/src/test/ui/error-codes/E0659.rs
deleted file mode 100644
index c00026bb7a7..00000000000
--- a/src/test/ui/error-codes/E0659.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-mod moon {
-    pub fn foo() {}
-}
-
-mod earth {
-    pub fn foo() {}
-}
-
-mod collider {
-    pub use moon::*;
-    pub use earth::*;
-}
-
-fn main() {
-    collider::foo(); //~ ERROR E0659
-}
diff --git a/src/test/ui/error-codes/E0659.stderr b/src/test/ui/error-codes/E0659.stderr
deleted file mode 100644
index b0c73c636c6..00000000000
--- a/src/test/ui/error-codes/E0659.stderr
+++ /dev/null
@@ -1,23 +0,0 @@
-error[E0659]: `foo` is ambiguous
-  --> $DIR/E0659.rs:15:15
-   |
-LL |     collider::foo();
-   |               ^^^ ambiguous name
-   |
-   = note: ambiguous because of multiple glob imports of a name in the same module
-note: `foo` could refer to the function imported here
-  --> $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:11:13
-   |
-LL |     pub use earth::*;
-   |             ^^^^^^^^
-   = help: consider adding an explicit import of `foo` to disambiguate
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0659`.
diff --git a/src/test/ui/error-codes/E0705.rs b/src/test/ui/error-codes/E0705.rs
deleted file mode 100644
index 05abcb629b1..00000000000
--- a/src/test/ui/error-codes/E0705.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// check-pass
-
-// This is a stub feature that doesn't control anything, so to make tidy happy,
-// gate-test-test_2018_feature
-
-#![feature(test_2018_feature)]
-//~^ WARN the feature `test_2018_feature` is included in the Rust 2018 edition
-#![feature(rust_2018_preview)]
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0705.stderr b/src/test/ui/error-codes/E0705.stderr
deleted file mode 100644
index 6fa843158bb..00000000000
--- a/src/test/ui/error-codes/E0705.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-warning[E0705]: the feature `test_2018_feature` is included in the Rust 2018 edition
-  --> $DIR/E0705.rs:6:12
-   |
-LL | #![feature(test_2018_feature)]
-   |            ^^^^^^^^^^^^^^^^^
-
-warning: 1 warning emitted
-
-For more information about this error, try `rustc --explain E0705`.
diff --git a/src/test/ui/error-codes/E0711.rs b/src/test/ui/error-codes/E0711.rs
deleted file mode 100644
index 7d2044a7da2..00000000000
--- a/src/test/ui/error-codes/E0711.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// copied from: src/test/ui/feature-gates/stability-attribute-consistency.rs
-
-#![feature(staged_api)]
-
-#![stable(feature = "stable_test_feature", since = "1.0.0")]
-
-#[stable(feature = "foo", since = "1.0.0")]
-fn foo_stable_1_0_0() {}
-
-#[stable(feature = "foo", since = "1.29.0")]
-//~^ ERROR feature `foo` is declared stable since 1.29.0
-fn foo_stable_1_29_0() {}
-
-#[unstable(feature = "foo", issue = "none")]
-//~^ ERROR feature `foo` is declared unstable
-fn foo_unstable() {}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0711.stderr b/src/test/ui/error-codes/E0711.stderr
deleted file mode 100644
index f39cb4ecd4b..00000000000
--- a/src/test/ui/error-codes/E0711.stderr
+++ /dev/null
@@ -1,15 +0,0 @@
-error[E0711]: feature `foo` is declared stable since 1.29.0, but was previously declared stable since 1.0.0
-  --> $DIR/E0711.rs:10:1
-   |
-LL | #[stable(feature = "foo", since = "1.29.0")]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0711]: feature `foo` is declared unstable, but was previously declared stable
-  --> $DIR/E0711.rs:14:1
-   |
-LL | #[unstable(feature = "foo", issue = "none")]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0711`.
diff --git a/src/test/ui/error-codes/E0718.rs b/src/test/ui/error-codes/E0718.rs
deleted file mode 100644
index 909cae0ba25..00000000000
--- a/src/test/ui/error-codes/E0718.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#![feature(lang_items)]
-
-// Box is expected to be a struct, so this will error.
-#[lang = "owned_box"] //~ ERROR language item must be applied to a struct
-static X: u32 = 42;
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0718.stderr b/src/test/ui/error-codes/E0718.stderr
deleted file mode 100644
index 30378dd1674..00000000000
--- a/src/test/ui/error-codes/E0718.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0718]: `owned_box` language item must be applied to a struct
-  --> $DIR/E0718.rs:4:1
-   |
-LL | #[lang = "owned_box"]
-   | ^^^^^^^^^^^^^^^^^^^^^ attribute should be applied to a struct, not a static item
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0718`.
diff --git a/src/test/ui/error-codes/E0719.rs b/src/test/ui/error-codes/E0719.rs
deleted file mode 100644
index 3311e190937..00000000000
--- a/src/test/ui/error-codes/E0719.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-trait Foo: Iterator<Item = i32, Item = i32> {}
-//~^ ERROR is already specified
-
-type Unit = ();
-
-fn test() -> Box<dyn Iterator<Item = (), Item = Unit>> {
-//~^ ERROR is already specified
-    Box::new(None.into_iter())
-}
-
-fn main() {
-    let _: &dyn Iterator<Item = i32, Item = i32>;
-    test();
-}
diff --git a/src/test/ui/error-codes/E0719.stderr b/src/test/ui/error-codes/E0719.stderr
deleted file mode 100644
index b342d634334..00000000000
--- a/src/test/ui/error-codes/E0719.stderr
+++ /dev/null
@@ -1,19 +0,0 @@
-error[E0719]: the value of the associated type `Item` (from trait `Iterator`) is already specified
-  --> $DIR/E0719.rs:1:33
-   |
-LL | trait Foo: Iterator<Item = i32, Item = i32> {}
-   |                     ----------  ^^^^^^^^^^ re-bound here
-   |                     |
-   |                     `Item` bound here first
-
-error[E0719]: the value of the associated type `Item` (from trait `Iterator`) is already specified
-  --> $DIR/E0719.rs:6:42
-   |
-LL | fn test() -> Box<dyn Iterator<Item = (), Item = Unit>> {
-   |                               ---------  ^^^^^^^^^^^ re-bound here
-   |                               |
-   |                               `Item` bound here first
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0719`.
diff --git a/src/test/ui/error-codes/E0730.rs b/src/test/ui/error-codes/E0730.rs
deleted file mode 100644
index 04f5e5d4257..00000000000
--- a/src/test/ui/error-codes/E0730.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-fn is_123<const N: usize>(x: [u32; N]) -> bool {
-    match x {
-        [1, 2, ..] => true, //~ ERROR cannot pattern-match on an array without a fixed length
-        _ => false
-    }
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0730.stderr b/src/test/ui/error-codes/E0730.stderr
deleted file mode 100644
index 067e8c57cd6..00000000000
--- a/src/test/ui/error-codes/E0730.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0730]: cannot pattern-match on an array without a fixed length
-  --> $DIR/E0730.rs:3:9
-   |
-LL |         [1, 2, ..] => true,
-   |         ^^^^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0730`.
diff --git a/src/test/ui/error-codes/E0746.fixed b/src/test/ui/error-codes/E0746.fixed
deleted file mode 100644
index ca8319aa020..00000000000
--- a/src/test/ui/error-codes/E0746.fixed
+++ /dev/null
@@ -1,18 +0,0 @@
-// run-rustfix
-#![allow(dead_code)]
-struct Struct;
-trait Trait {}
-impl Trait for Struct {}
-impl Trait for u32 {}
-
-fn foo() -> impl Trait { Struct }
-//~^ ERROR E0746
-
-fn bar() -> impl Trait { //~ ERROR E0746
-    if true {
-        return 0;
-    }
-    42
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0746.rs b/src/test/ui/error-codes/E0746.rs
deleted file mode 100644
index bf5ba8fff56..00000000000
--- a/src/test/ui/error-codes/E0746.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// run-rustfix
-#![allow(dead_code)]
-struct Struct;
-trait Trait {}
-impl Trait for Struct {}
-impl Trait for u32 {}
-
-fn foo() -> dyn Trait { Struct }
-//~^ ERROR E0746
-
-fn bar() -> dyn Trait { //~ ERROR E0746
-    if true {
-        return 0;
-    }
-    42
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0746.stderr b/src/test/ui/error-codes/E0746.stderr
deleted file mode 100644
index 2153b59ad18..00000000000
--- a/src/test/ui/error-codes/E0746.stderr
+++ /dev/null
@@ -1,27 +0,0 @@
-error[E0746]: return type cannot have an unboxed trait object
-  --> $DIR/E0746.rs:8:13
-   |
-LL | fn foo() -> dyn Trait { Struct }
-   |             ^^^^^^^^^ doesn't have a size known at compile-time
-   |
-   = note: for information on `impl Trait`, see <https://doc.rust-lang.org/book/ch10-02-traits.html#returning-types-that-implement-traits>
-help: use `impl Trait` as the return type, as all return paths are of type `Struct`, which implements `Trait`
-   |
-LL | fn foo() -> impl Trait { Struct }
-   |             ~~~~~~~~~~
-
-error[E0746]: return type cannot have an unboxed trait object
-  --> $DIR/E0746.rs:11:13
-   |
-LL | fn bar() -> dyn Trait {
-   |             ^^^^^^^^^ doesn't have a size known at compile-time
-   |
-   = note: for information on `impl Trait`, see <https://doc.rust-lang.org/book/ch10-02-traits.html#returning-types-that-implement-traits>
-help: use `impl Trait` as the return type, as all return paths are of type `{integer}`, which implements `Trait`
-   |
-LL | fn bar() -> impl Trait {
-   |             ~~~~~~~~~~
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0746`.
diff --git a/src/test/ui/error-codes/E0767.rs b/src/test/ui/error-codes/E0767.rs
deleted file mode 100644
index 14215d36a38..00000000000
--- a/src/test/ui/error-codes/E0767.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-fn main() {
-    'a: loop {
-        || {
-            //~^ ERROR mismatched types
-            loop { break 'a; } //~ ERROR E0767
-        }
-    }
-}
diff --git a/src/test/ui/error-codes/E0767.stderr b/src/test/ui/error-codes/E0767.stderr
deleted file mode 100644
index ee85247301c..00000000000
--- a/src/test/ui/error-codes/E0767.stderr
+++ /dev/null
@@ -1,27 +0,0 @@
-error[E0767]: use of unreachable label `'a`
-  --> $DIR/E0767.rs:5:26
-   |
-LL |     'a: loop {
-   |     -- unreachable label defined here
-...
-LL |             loop { break 'a; }
-   |                          ^^ unreachable label `'a`
-   |
-   = note: labels are unreachable through functions, closures, async blocks and modules
-
-error[E0308]: mismatched types
-  --> $DIR/E0767.rs:3:9
-   |
-LL | /         || {
-LL | |
-LL | |             loop { break 'a; }
-LL | |         }
-   | |_________^ expected `()`, found closure
-   |
-   = note: expected unit type `()`
-                found closure `[closure@$DIR/E0767.rs:3:9: 3:11]`
-
-error: aborting due to 2 previous errors
-
-Some errors have detailed explanations: E0308, E0767.
-For more information about an error, try `rustc --explain E0308`.
diff --git a/src/test/ui/error-codes/E0771.rs b/src/test/ui/error-codes/E0771.rs
deleted file mode 100644
index 67e7d106a1f..00000000000
--- a/src/test/ui/error-codes/E0771.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#![feature(adt_const_params)]
-//~^ WARN the feature `adt_const_params` is incomplete
-
-fn function_with_str<'a, const STRING: &'a str>() {} //~ ERROR E0771
-
-fn main() {
-    function_with_str::<"Hello, world!">()
-}
diff --git a/src/test/ui/error-codes/E0771.stderr b/src/test/ui/error-codes/E0771.stderr
deleted file mode 100644
index b759399a940..00000000000
--- a/src/test/ui/error-codes/E0771.stderr
+++ /dev/null
@@ -1,20 +0,0 @@
-error[E0771]: use of non-static lifetime `'a` in const generic
-  --> $DIR/E0771.rs:4:41
-   |
-LL | fn function_with_str<'a, const STRING: &'a str>() {}
-   |                                         ^^
-   |
-   = note: for more information, see issue #74052 <https://github.com/rust-lang/rust/issues/74052>
-
-warning: the feature `adt_const_params` is incomplete and may not be safe to use and/or cause compiler crashes
-  --> $DIR/E0771.rs:1:12
-   |
-LL | #![feature(adt_const_params)]
-   |            ^^^^^^^^^^^^^^^^
-   |
-   = note: see issue #95174 <https://github.com/rust-lang/rust/issues/95174> for more information
-   = note: `#[warn(incomplete_features)]` on by default
-
-error: aborting due to previous error; 1 warning emitted
-
-For more information about this error, try `rustc --explain E0771`.
diff --git a/src/test/ui/error-codes/E0777.rs b/src/test/ui/error-codes/E0777.rs
deleted file mode 100644
index ff70f736866..00000000000
--- a/src/test/ui/error-codes/E0777.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#[derive("Clone")] //~ ERROR E0777
-#[derive("Clone
-")]
-//~^^ ERROR E0777
-struct Foo;
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0777.stderr b/src/test/ui/error-codes/E0777.stderr
deleted file mode 100644
index 14697d89e82..00000000000
--- a/src/test/ui/error-codes/E0777.stderr
+++ /dev/null
@@ -1,21 +0,0 @@
-error[E0777]: expected path to a trait, found literal
-  --> $DIR/E0777.rs:1:10
-   |
-LL | #[derive("Clone")]
-   |          ^^^^^^^ not a trait
-   |
-   = help: try using `#[derive(Clone)]`
-
-error[E0777]: expected path to a trait, found literal
-  --> $DIR/E0777.rs:2:10
-   |
-LL |   #[derive("Clone
-   |  __________^
-LL | | ")]
-   | |_^ not a trait
-   |
-   = help: for example, write `#[derive(Debug)]` for `Debug`
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0777`.
diff --git a/src/test/ui/error-codes/E0778.rs b/src/test/ui/error-codes/E0778.rs
deleted file mode 100644
index 74653886d41..00000000000
--- a/src/test/ui/error-codes/E0778.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-#[instruction_set()] //~ ERROR
-fn no_isa_defined() {}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0778.stderr b/src/test/ui/error-codes/E0778.stderr
deleted file mode 100644
index 42647e5c6a1..00000000000
--- a/src/test/ui/error-codes/E0778.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0778]: `#[instruction_set]` requires an argument
-  --> $DIR/E0778.rs:1:1
-   |
-LL | #[instruction_set()]
-   | ^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0778`.
diff --git a/src/test/ui/error-codes/E0779.rs b/src/test/ui/error-codes/E0779.rs
deleted file mode 100644
index c32dae12c9c..00000000000
--- a/src/test/ui/error-codes/E0779.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-#[instruction_set(arm::magic)] //~ ERROR
-fn main() {}
diff --git a/src/test/ui/error-codes/E0779.stderr b/src/test/ui/error-codes/E0779.stderr
deleted file mode 100644
index 7c6a119a096..00000000000
--- a/src/test/ui/error-codes/E0779.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0779]: invalid instruction set specified
-  --> $DIR/E0779.rs:1:1
-   |
-LL | #[instruction_set(arm::magic)]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0779`.
diff --git a/src/test/ui/error-codes/E0790.rs b/src/test/ui/error-codes/E0790.rs
deleted file mode 100644
index d99006d2df7..00000000000
--- a/src/test/ui/error-codes/E0790.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-mod inner {
-    pub trait MyTrait {
-        const MY_ASSOC_CONST: ();
-
-        fn my_fn();
-    }
-
-    pub struct MyStruct;
-
-    impl MyTrait for MyStruct {
-        const MY_ASSOC_CONST: () = ();
-
-        fn my_fn() {}
-    }
-
-    fn call() {
-        MyTrait::my_fn(); //~ ERROR E0790
-    }
-
-    fn use_const() {
-        let _ = MyTrait::MY_ASSOC_CONST; //~ ERROR E0790
-    }
-}
-
-fn call_inner() {
-    inner::MyTrait::my_fn(); //~ ERROR E0790
-}
-
-fn use_const_inner() {
-    let _ = inner::MyTrait::MY_ASSOC_CONST; //~ ERROR E0790
-}
-
-trait MyTrait2 {
-    fn my_fn();
-}
-
-struct Impl1;
-
-impl MyTrait2 for Impl1 {
-    fn my_fn() {}
-}
-
-struct Impl2;
-
-impl MyTrait2 for Impl2 {
-    fn my_fn() {}
-}
-
-fn call_multiple_impls() {
-    MyTrait2::my_fn(); //~ ERROR E0790
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/E0790.stderr b/src/test/ui/error-codes/E0790.stderr
deleted file mode 100644
index fc025a3fca2..00000000000
--- a/src/test/ui/error-codes/E0790.stderr
+++ /dev/null
@@ -1,73 +0,0 @@
-error[E0790]: cannot call associated function on trait without specifying the corresponding `impl` type
-  --> $DIR/E0790.rs:17:9
-   |
-LL |         fn my_fn();
-   |         ----------- `MyTrait::my_fn` defined here
-...
-LL |         MyTrait::my_fn();
-   |         ^^^^^^^^^^^^^^ cannot call associated function of trait
-   |
-help: use the fully-qualified path to the only available implementation
-   |
-LL |         <MyStruct as MyTrait>::my_fn();
-   |         ++++++++++++        +
-
-error[E0790]: cannot refer to the associated constant on trait without specifying the corresponding `impl` type
-  --> $DIR/E0790.rs:21:17
-   |
-LL |         const MY_ASSOC_CONST: ();
-   |         ------------------------- `MyTrait::MY_ASSOC_CONST` defined here
-...
-LL |         let _ = MyTrait::MY_ASSOC_CONST;
-   |                 ^^^^^^^^^^^^^^^^^^^^^^^ cannot refer to the associated constant of trait
-   |
-help: use the fully-qualified path to the only available implementation
-   |
-LL |         let _ = <MyStruct as MyTrait>::MY_ASSOC_CONST;
-   |                 ++++++++++++        +
-
-error[E0790]: cannot call associated function on trait without specifying the corresponding `impl` type
-  --> $DIR/E0790.rs:26:5
-   |
-LL |         fn my_fn();
-   |         ----------- `MyTrait::my_fn` defined here
-...
-LL |     inner::MyTrait::my_fn();
-   |     ^^^^^^^^^^^^^^^^^^^^^ cannot call associated function of trait
-   |
-help: use the fully-qualified path to the only available implementation
-   |
-LL |     <MyStruct as inner::MyTrait>::my_fn();
-   |     ++++++++++++               +
-
-error[E0790]: cannot refer to the associated constant on trait without specifying the corresponding `impl` type
-  --> $DIR/E0790.rs:30:13
-   |
-LL |         const MY_ASSOC_CONST: ();
-   |         ------------------------- `MyTrait::MY_ASSOC_CONST` defined here
-...
-LL |     let _ = inner::MyTrait::MY_ASSOC_CONST;
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot refer to the associated constant of trait
-   |
-help: use the fully-qualified path to the only available implementation
-   |
-LL |     let _ = <MyStruct as inner::MyTrait>::MY_ASSOC_CONST;
-   |             ++++++++++++               +
-
-error[E0790]: cannot call associated function on trait without specifying the corresponding `impl` type
-  --> $DIR/E0790.rs:50:5
-   |
-LL |     fn my_fn();
-   |     ----------- `MyTrait2::my_fn` defined here
-...
-LL |     MyTrait2::my_fn();
-   |     ^^^^^^^^^^^^^^^ cannot call associated function of trait
-   |
-help: use a fully-qualified path to a specific available implementation (2 found)
-   |
-LL |     <Impl1 as MyTrait2>::my_fn();
-   |     +++++++++         +
-
-error: aborting due to 5 previous errors
-
-For more information about this error, try `rustc --explain E0790`.
diff --git a/src/test/ui/error-codes/auxiliary/crateresolve1-1.rs b/src/test/ui/error-codes/auxiliary/crateresolve1-1.rs
deleted file mode 100644
index bd9c8483ec2..00000000000
--- a/src/test/ui/error-codes/auxiliary/crateresolve1-1.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// compile-flags:-C extra-filename=-1
-// no-prefer-dynamic
-#![crate_name = "crateresolve1"]
-#![crate_type = "lib"]
-
-pub fn f() -> isize { 10 }
diff --git a/src/test/ui/error-codes/auxiliary/crateresolve1-2.rs b/src/test/ui/error-codes/auxiliary/crateresolve1-2.rs
deleted file mode 100644
index bd0f08f45b6..00000000000
--- a/src/test/ui/error-codes/auxiliary/crateresolve1-2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// compile-flags:-C extra-filename=-2
-// no-prefer-dynamic
-#![crate_name = "crateresolve1"]
-#![crate_type = "lib"]
-
-pub fn f() -> isize { 20 }
diff --git a/src/test/ui/error-codes/auxiliary/crateresolve1-3.rs b/src/test/ui/error-codes/auxiliary/crateresolve1-3.rs
deleted file mode 100644
index 1226c2fbb46..00000000000
--- a/src/test/ui/error-codes/auxiliary/crateresolve1-3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// compile-flags:-C extra-filename=-3
-// no-prefer-dynamic
-#![crate_name = "crateresolve1"]
-#![crate_type = "lib"]
-
-pub fn f() -> isize { 30 }
diff --git a/src/test/ui/error-codes/auxiliary/found-staticlib.rs b/src/test/ui/error-codes/auxiliary/found-staticlib.rs
deleted file mode 100644
index 04e2c59789d..00000000000
--- a/src/test/ui/error-codes/auxiliary/found-staticlib.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-// no-prefer-dynamic
-#![crate_type = "staticlib"]
-
-pub fn foo() {}
diff --git a/src/test/ui/error-codes/e0119/auxiliary/complex_impl_support.rs b/src/test/ui/error-codes/e0119/auxiliary/complex_impl_support.rs
deleted file mode 100644
index ad5bb107fc6..00000000000
--- a/src/test/ui/error-codes/e0119/auxiliary/complex_impl_support.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-use std::marker::PhantomData;
-
-pub trait External {}
-
-pub struct M<'a, 'b, 'c, T, U, V> {
-    a: PhantomData<&'a ()>,
-    b: PhantomData<&'b ()>,
-    c: PhantomData<&'c ()>,
-    d: PhantomData<T>,
-    e: PhantomData<U>,
-    f: PhantomData<V>,
-}
-
-impl<'a, 'b, 'c, T, U, V, W> External for (T, M<'a, 'b, 'c, Box<U>, V, W>)
-where
-    'b: 'a,
-    T: 'a,
-    U: (FnOnce(T) -> V) + 'static,
-    V: Iterator<Item=T> + Clone,
-    W: std::ops::Add,
-    W::Output: Copy,
-{}
diff --git a/src/test/ui/error-codes/e0119/auxiliary/issue-23563-a.rs b/src/test/ui/error-codes/e0119/auxiliary/issue-23563-a.rs
deleted file mode 100644
index 141f363694a..00000000000
--- a/src/test/ui/error-codes/e0119/auxiliary/issue-23563-a.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Ref: https://github.com/rust-lang/rust/issues/23563#issuecomment-260751672
-
-pub trait LolTo<T> {
-    fn convert_to(&self) -> T;
-}
-
-pub trait LolInto<T>: Sized {
-    fn convert_into(self) -> T;
-}
-
-pub trait LolFrom<T> {
-    fn from(_: T) -> Self;
-}
-
-impl<'a, T: ?Sized, U> LolInto<U> for &'a T where T: LolTo<U> {
-    fn convert_into(self) -> U {
-        self.convert_to()
-    }
-}
-
-impl<T, U> LolFrom<T> for U where T: LolInto<U> {
-    fn from(t: T) -> U {
-        t.convert_into()
-    }
-}
diff --git a/src/test/ui/error-codes/e0119/complex-impl.rs b/src/test/ui/error-codes/e0119/complex-impl.rs
deleted file mode 100644
index 9149e4ce58e..00000000000
--- a/src/test/ui/error-codes/e0119/complex-impl.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// aux-build:complex_impl_support.rs
-
-extern crate complex_impl_support;
-
-use complex_impl_support::{External, M};
-
-struct Q;
-
-impl<R> External for (Q, R) {} //~ ERROR only traits defined
-
-fn main() {}
diff --git a/src/test/ui/error-codes/e0119/complex-impl.stderr b/src/test/ui/error-codes/e0119/complex-impl.stderr
deleted file mode 100644
index 654073eec26..00000000000
--- a/src/test/ui/error-codes/e0119/complex-impl.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error[E0117]: only traits defined in the current crate can be implemented for arbitrary types
-  --> $DIR/complex-impl.rs:9:1
-   |
-LL | impl<R> External for (Q, R) {}
-   | ^^^^^^^^^^^^^^^^^^^^^------
-   | |                    |
-   | |                    this is not defined in the current crate because tuples are always foreign
-   | impl doesn't use only types from inside the current crate
-   |
-   = note: define and implement a trait or new type instead
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0117`.
diff --git a/src/test/ui/error-codes/e0119/conflict-with-std.rs b/src/test/ui/error-codes/e0119/conflict-with-std.rs
deleted file mode 100644
index c9db2bab183..00000000000
--- a/src/test/ui/error-codes/e0119/conflict-with-std.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-use std::marker::PhantomData;
-use std::convert::{TryFrom, AsRef};
-
-struct Q;
-impl AsRef<Q> for Box<Q> { //~ ERROR conflicting implementations
-    fn as_ref(&self) -> &Q {
-        &**self
-    }
-}
-
-struct S;
-impl From<S> for S { //~ ERROR conflicting implementations
-    fn from(s: S) -> S {
-        s
-    }
-}
-
-struct X;
-impl TryFrom<X> for X { //~ ERROR conflicting implementations
-    type Error = ();
-    fn try_from(u: X) -> Result<X, ()> {
-        Ok(u)
-    }
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/e0119/conflict-with-std.stderr b/src/test/ui/error-codes/e0119/conflict-with-std.stderr
deleted file mode 100644
index ef888a1c287..00000000000
--- a/src/test/ui/error-codes/e0119/conflict-with-std.stderr
+++ /dev/null
@@ -1,32 +0,0 @@
-error[E0119]: conflicting implementations of trait `AsRef<Q>` for type `Box<Q>`
-  --> $DIR/conflict-with-std.rs:5:1
-   |
-LL | impl AsRef<Q> for Box<Q> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: conflicting implementation in crate `alloc`:
-           - impl<T, A> AsRef<T> for Box<T, A>
-             where A: Allocator, T: ?Sized;
-
-error[E0119]: conflicting implementations of trait `From<S>` for type `S`
-  --> $DIR/conflict-with-std.rs:12:1
-   |
-LL | impl From<S> for S {
-   | ^^^^^^^^^^^^^^^^^^
-   |
-   = note: conflicting implementation in crate `core`:
-           - impl<T> From<T> for T;
-
-error[E0119]: conflicting implementations of trait `TryFrom<X>` for type `X`
-  --> $DIR/conflict-with-std.rs:19:1
-   |
-LL | impl TryFrom<X> for X {
-   | ^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: conflicting implementation in crate `core`:
-           - impl<T, U> TryFrom<U> for T
-             where U: Into<T>;
-
-error: aborting due to 3 previous errors
-
-For more information about this error, try `rustc --explain E0119`.
diff --git a/src/test/ui/error-codes/e0119/issue-23563.rs b/src/test/ui/error-codes/e0119/issue-23563.rs
deleted file mode 100644
index f578560c552..00000000000
--- a/src/test/ui/error-codes/e0119/issue-23563.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-// aux-build:issue-23563-a.rs
-
-// Ref: https://github.com/rust-lang/rust/issues/23563#issuecomment-260751672
-
-extern crate issue_23563_a as a;
-
-use a::LolFrom;
-use a::LolInto;
-use a::LolTo;
-
-struct LocalType<T>(Option<T>);
-
-impl<'a, T> LolFrom<&'a [T]> for LocalType<T> { //~ ERROR conflicting implementations of trait
-    fn from(_: &'a [T]) -> LocalType<T> { LocalType(None) }
-}
-
-impl<T> LolInto<LocalType<T>> for LocalType<T> {
-    fn convert_into(self) -> LocalType<T> {
-        self
-    }
-}
-
-impl LolTo<LocalType<u8>> for [u8] {
-    fn convert_to(&self) -> LocalType<u8> {
-        LocalType(None)
-    }
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/e0119/issue-23563.stderr b/src/test/ui/error-codes/e0119/issue-23563.stderr
deleted file mode 100644
index 1b2d64282e1..00000000000
--- a/src/test/ui/error-codes/e0119/issue-23563.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-error[E0119]: conflicting implementations of trait `LolFrom<&[_]>` for type `LocalType<_>`
-  --> $DIR/issue-23563.rs:13:1
-   |
-LL | impl<'a, T> LolFrom<&'a [T]> for LocalType<T> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: conflicting implementation in crate `issue_23563_a`:
-           - impl<T, U> LolFrom<T> for U
-             where T: LolInto<U>;
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0119`.
diff --git a/src/test/ui/error-codes/e0119/issue-27403.rs b/src/test/ui/error-codes/e0119/issue-27403.rs
deleted file mode 100644
index b03a564ffd4..00000000000
--- a/src/test/ui/error-codes/e0119/issue-27403.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-pub struct GenX<S> {
-    inner: S,
-}
-
-impl<S> Into<S> for GenX<S> { //~ ERROR conflicting implementations
-    fn into(self) -> S {
-        self.inner
-    }
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/e0119/issue-27403.stderr b/src/test/ui/error-codes/e0119/issue-27403.stderr
deleted file mode 100644
index 9b3345c23bb..00000000000
--- a/src/test/ui/error-codes/e0119/issue-27403.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-error[E0119]: conflicting implementations of trait `Into<_>` for type `GenX<_>`
-  --> $DIR/issue-27403.rs:5:1
-   |
-LL | impl<S> Into<S> for GenX<S> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: conflicting implementation in crate `core`:
-           - impl<T, U> Into<U> for T
-             where U: From<T>;
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0119`.
diff --git a/src/test/ui/error-codes/e0119/issue-28981.rs b/src/test/ui/error-codes/e0119/issue-28981.rs
deleted file mode 100644
index 5fb7e9a9913..00000000000
--- a/src/test/ui/error-codes/e0119/issue-28981.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-use std::ops::Deref;
-
-struct Foo;
-
-impl<Foo> Deref for Foo { } //~ ERROR must be used
-
-fn main() {}
diff --git a/src/test/ui/error-codes/e0119/issue-28981.stderr b/src/test/ui/error-codes/e0119/issue-28981.stderr
deleted file mode 100644
index 97b570bc7ac..00000000000
--- a/src/test/ui/error-codes/e0119/issue-28981.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0210]: type parameter `Foo` must be used as the type parameter for some local type (e.g., `MyStruct<Foo>`)
-  --> $DIR/issue-28981.rs:5:6
-   |
-LL | impl<Foo> Deref for Foo { }
-   |      ^^^ type parameter `Foo` must be used as the type parameter for some local type
-   |
-   = note: implementing a foreign trait is only possible if at least one of the types for which it is implemented is local
-   = note: only traits defined in the current crate can be implemented for a type parameter
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0210`.
diff --git a/src/test/ui/error-codes/e0119/so-37347311.rs b/src/test/ui/error-codes/e0119/so-37347311.rs
deleted file mode 100644
index d5f624bc4d9..00000000000
--- a/src/test/ui/error-codes/e0119/so-37347311.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Ref: https://stackoverflow.com/q/37347311
-
-trait Storage {
-    type Error;
-}
-
-enum MyError<S: Storage> {
-    StorageProblem(S::Error),
-}
-
-impl<S: Storage> From<S::Error> for MyError<S> { //~ ERROR conflicting implementations
-    fn from(error: S::Error) -> MyError<S> {
-        MyError::StorageProblem(error)
-    }
-}
-
-fn main() {}
diff --git a/src/test/ui/error-codes/e0119/so-37347311.stderr b/src/test/ui/error-codes/e0119/so-37347311.stderr
deleted file mode 100644
index 99367e80841..00000000000
--- a/src/test/ui/error-codes/e0119/so-37347311.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0119]: conflicting implementations of trait `From<MyError<_>>` for type `MyError<_>`
-  --> $DIR/so-37347311.rs:11:1
-   |
-LL | impl<S: Storage> From<S::Error> for MyError<S> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: conflicting implementation in crate `core`:
-           - impl<T> From<T> for T;
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0119`.
diff --git a/src/test/ui/error-codes/ex-E0611.rs b/src/test/ui/error-codes/ex-E0611.rs
deleted file mode 100644
index f18a3619f31..00000000000
--- a/src/test/ui/error-codes/ex-E0611.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-mod a {
-    pub struct Foo(u32);
-
-    impl Foo {
-        pub fn new() -> Foo { Foo(0) }
-    }
-}
-
-fn main() {
-   let y = a::Foo::new();
-   y.0; //~ ERROR field `0` of struct `Foo` is private
-}
diff --git a/src/test/ui/error-codes/ex-E0611.stderr b/src/test/ui/error-codes/ex-E0611.stderr
deleted file mode 100644
index 1da7b33be9d..00000000000
--- a/src/test/ui/error-codes/ex-E0611.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0616]: field `0` of struct `Foo` is private
-  --> $DIR/ex-E0611.rs:11:6
-   |
-LL |    y.0;
-   |      ^ private field
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0616`.
diff --git a/src/test/ui/error-codes/ex-E0612.rs b/src/test/ui/error-codes/ex-E0612.rs
deleted file mode 100644
index c8ea53ae9d8..00000000000
--- a/src/test/ui/error-codes/ex-E0612.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-struct Foo(u32);
-
-fn main() {
-   let y = Foo(0);
-   y.1; //~ ERROR no field `1` on type `Foo`
-}
diff --git a/src/test/ui/error-codes/ex-E0612.stderr b/src/test/ui/error-codes/ex-E0612.stderr
deleted file mode 100644
index b21b6fdfcf1..00000000000
--- a/src/test/ui/error-codes/ex-E0612.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0609]: no field `1` on type `Foo`
-  --> $DIR/ex-E0612.rs:5:6
-   |
-LL |    y.1;
-   |      ^ help: a field with a similar name exists: `0`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0609`.