From 1b22befd36ab1337dacfe74666909922230e7834 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sun, 30 Sep 2018 14:27:26 +0200
Subject: [PATCH 1/2] make run-pass tests with empty main just compile-pass
 tests

---
 src/test/{run-pass => ui}/issues/issue-10396.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-10456.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-10763.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-10902.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-11384.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-11592.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-11612.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-11869.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-12729.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-13105.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-13167.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-13214.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-13405.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-13703.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-13775.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-13837.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-14082.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-14254.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-14330.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-14837.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-14933.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-14959.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-15108.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-15261.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-15689-2.rs               | 2 +-
 src/test/{run-pass => ui}/issues/issue-15735.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-16596.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-16668.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-17121.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-17336.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-17450.rs                 | 2 +-
 .../{run-pass => ui}/issues/issue-17718-const-destructors.rs    | 2 +-
 src/test/{run-pass => ui}/issues/issue-17732.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-17746.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-17904.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-18083.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-18088.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-18188.rs                 | 2 +-
 .../issues/issue-18446.rs => ui/issues/issue-18446-2.rs}        | 2 +-
 src/test/{run-pass => ui}/issues/issue-18738.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-18809.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-18906.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-19037.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-19081.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-19097.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-19098.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-19102.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-19129-1.rs               | 2 +-
 src/test/{run-pass => ui}/issues/issue-19129-2.rs               | 2 +-
 src/test/{run-pass => ui}/issues/issue-19398.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-19404.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-19479.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-19631.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-19632.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-19850.rs                 | 2 +-
 .../issues/issue-19982.rs => ui/issues/issue-19982-2.rs}        | 2 +-
 src/test/{run-pass => ui}/issues/issue-20009.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-20091.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-20186.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-20396.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-20414.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-20454.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-2063-resource.rs         | 2 +-
 src/test/{run-pass => ui}/issues/issue-20644.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-20763-1.rs               | 2 +-
 src/test/{run-pass => ui}/issues/issue-20763-2.rs               | 2 +-
 src/test/{run-pass => ui}/issues/issue-20797.rs                 | 2 +-
 .../issues/issue-20825.rs => ui/issues/issue-20825-2.rs}        | 2 +-
 src/test/{run-pass => ui}/issues/issue-21140.rs                 | 2 +-
 .../issues/issue-21174.rs => ui/issues/issue-21174-2.rs}        | 2 +-
 src/test/{run-pass => ui}/issues/issue-21245.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-21363.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-21402.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-21520.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-21562.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-21622.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-21634.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-21726.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-21891.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-22066.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-22356.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-22375.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-22471.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-22781.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-22814.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-22894.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-23406.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-23442.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-23477.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-23550.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-23649-3.rs               | 2 +-
 src/test/{run-pass => ui}/issues/issue-24085.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-24227.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-24389.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-24434.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-25180.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-25394.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-26095.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-26205.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-26646.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-26997.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-27105.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-27281.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-27583.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-27889.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-28279.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-28561.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-28600.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-28822.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-28871.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-28936.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-28999.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-29030.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-29037.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-29048.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-29071.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-29276.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-29516.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-29540.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-29710.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-29740.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-31260.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-31597.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-32324.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-33264.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-33287.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-33903.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-34194.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-34751.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-34780.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-35376.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-35546.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-36075.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-36744-without-calls.rs   | 2 +-
 src/test/{run-pass => ui}/issues/issue-37598.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-37655.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-37725.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-38727.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-39089.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-39467.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-39984.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-40136.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-40962.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-41272.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-41298.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-41628.rs                 | 2 +-
 .../issues/issue-41936-variance-coerce-unsized-cycle.rs         | 2 +-
 src/test/{run-pass => ui}/issues/issue-42467.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-42956.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-43057.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-43357.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-43483.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-44005.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-44056.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-44247.rs                 | 2 +-
 .../issues/issue-44373.rs => ui/issues/issue-44373-2.rs}        | 2 +-
 src/test/{run-pass => ui}/issues/issue-44402.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-44730.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-44851.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-45425.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-46959.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-46964.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-47673.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-47703-1.rs               | 2 +-
 src/test/{run-pass => ui}/issues/issue-47703-tuple.rs           | 2 +-
 src/test/{run-pass => ui}/issues/issue-47703.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-47722.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-47789.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-48551.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-51655.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-6991.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-7268.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-8521.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-9243.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-9249.rs                  | 2 +-
 175 files changed, 175 insertions(+), 175 deletions(-)
 rename src/test/{run-pass => ui}/issues/issue-10396.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-10456.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-10763.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-10902.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-11384.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-11592.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-11612.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-11869.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-12729.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-13105.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-13167.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-13214.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-13405.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-13703.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-13775.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-13837.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-14082.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-14254.rs (99%)
 rename src/test/{run-pass => ui}/issues/issue-14330.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-14837.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-14933.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-14959.rs (99%)
 rename src/test/{run-pass => ui}/issues/issue-15108.rs (96%)
 rename src/test/{run-pass => ui}/issues/issue-15261.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-15689-2.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-15735.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-16596.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-16668.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-17121.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-17336.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-17450.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-17718-const-destructors.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-17732.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-17746.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-17904.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-18083.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-18088.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-18188.rs (98%)
 rename src/test/{run-pass/issues/issue-18446.rs => ui/issues/issue-18446-2.rs} (97%)
 rename src/test/{run-pass => ui}/issues/issue-18738.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-18809.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-18906.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-19037.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-19081.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-19097.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-19098.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-19102.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-19129-1.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-19129-2.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-19398.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-19404.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-19479.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-19631.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-19632.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-19850.rs (98%)
 rename src/test/{run-pass/issues/issue-19982.rs => ui/issues/issue-19982-2.rs} (98%)
 rename src/test/{run-pass => ui}/issues/issue-20009.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-20091.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-20186.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-20396.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-20414.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-20454.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-2063-resource.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-20644.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-20763-1.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-20763-2.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-20797.rs (99%)
 rename src/test/{run-pass/issues/issue-20825.rs => ui/issues/issue-20825-2.rs} (97%)
 rename src/test/{run-pass => ui}/issues/issue-21140.rs (97%)
 rename src/test/{run-pass/issues/issue-21174.rs => ui/issues/issue-21174-2.rs} (97%)
 rename src/test/{run-pass => ui}/issues/issue-21245.rs (99%)
 rename src/test/{run-pass => ui}/issues/issue-21363.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-21402.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-21520.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-21562.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-21622.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-21634.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-21726.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-21891.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-22066.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-22356.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-22375.rs (96%)
 rename src/test/{run-pass => ui}/issues/issue-22471.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-22781.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-22814.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-22894.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-23406.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-23442.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-23477.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-23550.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-23649-3.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-24085.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-24227.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-24389.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-24434.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-25180.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-25394.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-26095.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-26205.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-26646.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-26997.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-27105.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-27281.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-27583.rs (99%)
 rename src/test/{run-pass => ui}/issues/issue-27889.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-28279.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-28561.rs (99%)
 rename src/test/{run-pass => ui}/issues/issue-28600.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-28822.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-28871.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-28936.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-28999.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-29030.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-29037.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-29048.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-29071.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-29276.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-29516.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-29540.rs (99%)
 rename src/test/{run-pass => ui}/issues/issue-29710.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-29740.rs (99%)
 rename src/test/{run-pass => ui}/issues/issue-31260.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-31597.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-32324.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-33264.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-33287.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-33903.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-34194.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-34751.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-34780.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-35376.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-35546.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-36075.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-36744-without-calls.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-37598.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-37655.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-37725.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-38727.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-39089.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-39467.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-39984.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-40136.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-40962.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-41272.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-41298.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-41628.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-41936-variance-coerce-unsized-cycle.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-42467.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-42956.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-43057.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-43357.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-43483.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-44005.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-44056.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-44247.rs (97%)
 rename src/test/{run-pass/issues/issue-44373.rs => ui/issues/issue-44373-2.rs} (97%)
 rename src/test/{run-pass => ui}/issues/issue-44402.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-44730.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-44851.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-45425.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-46959.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-46964.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-47673.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-47703-1.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-47703-tuple.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-47703.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-47722.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-47789.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-48551.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-51655.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-6991.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-7268.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-8521.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-9243.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-9249.rs (97%)

diff --git a/src/test/run-pass/issues/issue-10396.rs b/src/test/ui/issues/issue-10396.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-10396.rs
rename to src/test/ui/issues/issue-10396.rs
index 5b7bfe1a02ec9..4b4571f99db87 100644
--- a/src/test/run-pass/issues/issue-10396.rs
+++ b/src/test/ui/issues/issue-10396.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #[derive(Debug)]
 enum Foo<'s> {
diff --git a/src/test/run-pass/issues/issue-10456.rs b/src/test/ui/issues/issue-10456.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-10456.rs
rename to src/test/ui/issues/issue-10456.rs
index 66b813f82a4b5..ed8c5e9657067 100644
--- a/src/test/run-pass/issues/issue-10456.rs
+++ b/src/test/ui/issues/issue-10456.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 pub struct Foo;
diff --git a/src/test/run-pass/issues/issue-10763.rs b/src/test/ui/issues/issue-10763.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-10763.rs
rename to src/test/ui/issues/issue-10763.rs
index 705cc3fad132c..08653b1c69698 100644
--- a/src/test/run-pass/issues/issue-10763.rs
+++ b/src/test/ui/issues/issue-10763.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-10902.rs b/src/test/ui/issues/issue-10902.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-10902.rs
rename to src/test/ui/issues/issue-10902.rs
index df9dc0b63d9ca..24bf90b2d9d9c 100644
--- a/src/test/run-pass/issues/issue-10902.rs
+++ b/src/test/ui/issues/issue-10902.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-11384.rs b/src/test/ui/issues/issue-11384.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-11384.rs
rename to src/test/ui/issues/issue-11384.rs
index 5f11bf2841ec5..af4e7fc389ed3 100644
--- a/src/test/run-pass/issues/issue-11384.rs
+++ b/src/test/ui/issues/issue-11384.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 trait Common { fn dummy(&self) { } }
diff --git a/src/test/run-pass/issues/issue-11592.rs b/src/test/ui/issues/issue-11592.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-11592.rs
rename to src/test/ui/issues/issue-11592.rs
index 1157f9b7e76bb..11c6fecd78d41 100644
--- a/src/test/run-pass/issues/issue-11592.rs
+++ b/src/test/ui/issues/issue-11592.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 //! Ensure the private trait Bar isn't complained about.
 
 #![deny(missing_docs)]
diff --git a/src/test/run-pass/issues/issue-11612.rs b/src/test/ui/issues/issue-11612.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-11612.rs
rename to src/test/ui/issues/issue-11612.rs
index ba17a02dd3875..293dd6dfaaa59 100644
--- a/src/test/run-pass/issues/issue-11612.rs
+++ b/src/test/ui/issues/issue-11612.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // #11612
 // We weren't updating the auto adjustments with all the resolved
diff --git a/src/test/run-pass/issues/issue-11869.rs b/src/test/ui/issues/issue-11869.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-11869.rs
rename to src/test/ui/issues/issue-11869.rs
index b3543f726daa7..102b79ac20382 100644
--- a/src/test/run-pass/issues/issue-11869.rs
+++ b/src/test/ui/issues/issue-11869.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-12729.rs b/src/test/ui/issues/issue-12729.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-12729.rs
rename to src/test/ui/issues/issue-12729.rs
index efcc05cc19641..2447bceeea6f1 100644
--- a/src/test/run-pass/issues/issue-12729.rs
+++ b/src/test/ui/issues/issue-12729.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-13105.rs b/src/test/ui/issues/issue-13105.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-13105.rs
rename to src/test/ui/issues/issue-13105.rs
index 906f8ca5e7d35..78e0caca0baf2 100644
--- a/src/test/run-pass/issues/issue-13105.rs
+++ b/src/test/ui/issues/issue-13105.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 trait Foo {
diff --git a/src/test/run-pass/issues/issue-13167.rs b/src/test/ui/issues/issue-13167.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-13167.rs
rename to src/test/ui/issues/issue-13167.rs
index ac0645cd403a1..e44ac88566c41 100644
--- a/src/test/run-pass/issues/issue-13167.rs
+++ b/src/test/ui/issues/issue-13167.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 use std::slice;
diff --git a/src/test/run-pass/issues/issue-13214.rs b/src/test/ui/issues/issue-13214.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-13214.rs
rename to src/test/ui/issues/issue-13214.rs
index 1c119bb634df4..b22942652c459 100644
--- a/src/test/run-pass/issues/issue-13214.rs
+++ b/src/test/ui/issues/issue-13214.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // defining static with struct that contains enum
 // with &'static str variant used to cause ICE
diff --git a/src/test/run-pass/issues/issue-13405.rs b/src/test/ui/issues/issue-13405.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-13405.rs
rename to src/test/ui/issues/issue-13405.rs
index a8ca38838d19e..ed35d3edccfc2 100644
--- a/src/test/run-pass/issues/issue-13405.rs
+++ b/src/test/ui/issues/issue-13405.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(unused_variables)]
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/issues/issue-13703.rs b/src/test/ui/issues/issue-13703.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-13703.rs
rename to src/test/ui/issues/issue-13703.rs
index d0f8be64ef398..e954f94b664ac 100644
--- a/src/test/run-pass/issues/issue-13703.rs
+++ b/src/test/ui/issues/issue-13703.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 pub struct Foo<'a, 'b: 'a> { foo: &'a &'b isize }
diff --git a/src/test/run-pass/issues/issue-13775.rs b/src/test/ui/issues/issue-13775.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-13775.rs
rename to src/test/ui/issues/issue-13775.rs
index ae49922991773..27fcbf7894188 100644
--- a/src/test/run-pass/issues/issue-13775.rs
+++ b/src/test/ui/issues/issue-13775.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 trait Foo {
diff --git a/src/test/run-pass/issues/issue-13837.rs b/src/test/ui/issues/issue-13837.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-13837.rs
rename to src/test/ui/issues/issue-13837.rs
index 98a86748851a8..1e67964093bd3 100644
--- a/src/test/run-pass/issues/issue-13837.rs
+++ b/src/test/ui/issues/issue-13837.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-14082.rs b/src/test/ui/issues/issue-14082.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-14082.rs
rename to src/test/ui/issues/issue-14082.rs
index 01d3c9534f2fd..5a1452fe35746 100644
--- a/src/test/run-pass/issues/issue-14082.rs
+++ b/src/test/ui/issues/issue-14082.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 #![allow(unused_imports, dead_code)]
diff --git a/src/test/run-pass/issues/issue-14254.rs b/src/test/ui/issues/issue-14254.rs
similarity index 99%
rename from src/test/run-pass/issues/issue-14254.rs
rename to src/test/ui/issues/issue-14254.rs
index 4e03535f61333..033b7341db1ed 100644
--- a/src/test/run-pass/issues/issue-14254.rs
+++ b/src/test/ui/issues/issue-14254.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 trait Foo: Sized {
diff --git a/src/test/run-pass/issues/issue-14330.rs b/src/test/ui/issues/issue-14330.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-14330.rs
rename to src/test/ui/issues/issue-14330.rs
index fe54c1cf05c8c..edba1a3bd8fbe 100644
--- a/src/test/run-pass/issues/issue-14330.rs
+++ b/src/test/ui/issues/issue-14330.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(unused_imports)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-14837.rs b/src/test/ui/issues/issue-14837.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-14837.rs
rename to src/test/ui/issues/issue-14837.rs
index 9945c6e4407ae..0c6617e0ab7b2 100644
--- a/src/test/run-pass/issues/issue-14837.rs
+++ b/src/test/ui/issues/issue-14837.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 #[deny(dead_code)]
diff --git a/src/test/run-pass/issues/issue-14933.rs b/src/test/ui/issues/issue-14933.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-14933.rs
rename to src/test/ui/issues/issue-14933.rs
index 30365bb3e4f41..54a2ca8c9edaf 100644
--- a/src/test/run-pass/issues/issue-14933.rs
+++ b/src/test/ui/issues/issue-14933.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 pub type BigRat<T = isize> = T;
diff --git a/src/test/run-pass/issues/issue-14959.rs b/src/test/ui/issues/issue-14959.rs
similarity index 99%
rename from src/test/run-pass/issues/issue-14959.rs
rename to src/test/ui/issues/issue-14959.rs
index fc245fb424497..8b56b42401941 100644
--- a/src/test/run-pass/issues/issue-14959.rs
+++ b/src/test/ui/issues/issue-14959.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 #![feature(fn_traits, unboxed_closures)]
diff --git a/src/test/run-pass/issues/issue-15108.rs b/src/test/ui/issues/issue-15108.rs
similarity index 96%
rename from src/test/run-pass/issues/issue-15108.rs
rename to src/test/ui/issues/issue-15108.rs
index 7288ff23cb403..e650db05a6b21 100644
--- a/src/test/run-pass/issues/issue-15108.rs
+++ b/src/test/ui/issues/issue-15108.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 fn main() {}
diff --git a/src/test/run-pass/issues/issue-15261.rs b/src/test/ui/issues/issue-15261.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-15261.rs
rename to src/test/ui/issues/issue-15261.rs
index 263f9b0bd4b2a..f5f9978ed9b14 100644
--- a/src/test/run-pass/issues/issue-15261.rs
+++ b/src/test/ui/issues/issue-15261.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_upper_case_globals)]
 
diff --git a/src/test/run-pass/issues/issue-15689-2.rs b/src/test/ui/issues/issue-15689-2.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-15689-2.rs
rename to src/test/ui/issues/issue-15689-2.rs
index dedc66336e7be..30bde2aa85816 100644
--- a/src/test/run-pass/issues/issue-15689-2.rs
+++ b/src/test/ui/issues/issue-15689-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-15735.rs b/src/test/ui/issues/issue-15735.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-15735.rs
rename to src/test/ui/issues/issue-15735.rs
index 5ac47bd68bcf1..fbe39b27efc31 100644
--- a/src/test/run-pass/issues/issue-15735.rs
+++ b/src/test/ui/issues/issue-15735.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 struct A<'a> {
     a: &'a i32,
diff --git a/src/test/run-pass/issues/issue-16596.rs b/src/test/ui/issues/issue-16596.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-16596.rs
rename to src/test/ui/issues/issue-16596.rs
index d9583809a89fc..01383c07806c2 100644
--- a/src/test/run-pass/issues/issue-16596.rs
+++ b/src/test/ui/issues/issue-16596.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 
 trait MatrixRow { fn dummy(&self) { }}
diff --git a/src/test/run-pass/issues/issue-16668.rs b/src/test/ui/issues/issue-16668.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-16668.rs
rename to src/test/ui/issues/issue-16668.rs
index fdb49c6898430..d8af376217807 100644
--- a/src/test/run-pass/issues/issue-16668.rs
+++ b/src/test/ui/issues/issue-16668.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 struct Parser<'a, I, O> {
     parse: Box<FnMut(I) -> Result<O, String> + 'a>
diff --git a/src/test/run-pass/issues/issue-17121.rs b/src/test/ui/issues/issue-17121.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-17121.rs
rename to src/test/ui/issues/issue-17121.rs
index fafcdde2bbe3e..f280d60e1ce3e 100644
--- a/src/test/run-pass/issues/issue-17121.rs
+++ b/src/test/ui/issues/issue-17121.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 // ignore-cloudabi no std::fs
diff --git a/src/test/run-pass/issues/issue-17336.rs b/src/test/ui/issues/issue-17336.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-17336.rs
rename to src/test/ui/issues/issue-17336.rs
index b1a77d73aa473..b1cbdb87bcd7d 100644
--- a/src/test/run-pass/issues/issue-17336.rs
+++ b/src/test/ui/issues/issue-17336.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(unused_must_use)]
 #[allow(dead_code)]
 fn check(a: &str) {
diff --git a/src/test/run-pass/issues/issue-17450.rs b/src/test/ui/issues/issue-17450.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-17450.rs
rename to src/test/ui/issues/issue-17450.rs
index 67a44951ae038..f5af630cd184a 100644
--- a/src/test/run-pass/issues/issue-17450.rs
+++ b/src/test/ui/issues/issue-17450.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code, warnings)]
 
 static mut x: isize = 3;
diff --git a/src/test/run-pass/issues/issue-17718-const-destructors.rs b/src/test/ui/issues/issue-17718-const-destructors.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-17718-const-destructors.rs
rename to src/test/ui/issues/issue-17718-const-destructors.rs
index 16f9cea82fa10..da7a9f13ef2fb 100644
--- a/src/test/run-pass/issues/issue-17718-const-destructors.rs
+++ b/src/test/ui/issues/issue-17718-const-destructors.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 struct A;
 impl Drop for A {
diff --git a/src/test/run-pass/issues/issue-17732.rs b/src/test/ui/issues/issue-17732.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-17732.rs
rename to src/test/ui/issues/issue-17732.rs
index c0ab42b4264b4..e5b4a2e3edd3b 100644
--- a/src/test/run-pass/issues/issue-17732.rs
+++ b/src/test/ui/issues/issue-17732.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-17746.rs b/src/test/ui/issues/issue-17746.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-17746.rs
rename to src/test/ui/issues/issue-17746.rs
index 0cdefc290a860..18299c6acb39d 100644
--- a/src/test/run-pass/issues/issue-17746.rs
+++ b/src/test/ui/issues/issue-17746.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // Regression test for #17746
 
diff --git a/src/test/run-pass/issues/issue-17904.rs b/src/test/ui/issues/issue-17904.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-17904.rs
rename to src/test/ui/issues/issue-17904.rs
index 9b76c9fca2aed..8de0f6d2922c8 100644
--- a/src/test/run-pass/issues/issue-17904.rs
+++ b/src/test/ui/issues/issue-17904.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // Test that we can parse where clauses on various forms of tuple
 // structs.
diff --git a/src/test/run-pass/issues/issue-18083.rs b/src/test/ui/issues/issue-18083.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-18083.rs
rename to src/test/ui/issues/issue-18083.rs
index 9118ad28493d5..c370b3605f81b 100644
--- a/src/test/run-pass/issues/issue-18083.rs
+++ b/src/test/ui/issues/issue-18083.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(unused_imports)]
 // These crossed imports should resolve fine, and not block on
diff --git a/src/test/run-pass/issues/issue-18088.rs b/src/test/ui/issues/issue-18088.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-18088.rs
rename to src/test/ui/issues/issue-18088.rs
index cff5ba70128d7..74014fde36bab 100644
--- a/src/test/run-pass/issues/issue-18088.rs
+++ b/src/test/ui/issues/issue-18088.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 
 pub trait Indexable<T>: std::ops::Index<usize, Output = T> {
     fn index2(&self, i: usize) -> &T {
diff --git a/src/test/run-pass/issues/issue-18188.rs b/src/test/ui/issues/issue-18188.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-18188.rs
rename to src/test/ui/issues/issue-18188.rs
index 60d8edc9d590b..b047ee4a4d6d2 100644
--- a/src/test/run-pass/issues/issue-18188.rs
+++ b/src/test/ui/issues/issue-18188.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 pub trait Promisable: Send + Sync {}
diff --git a/src/test/run-pass/issues/issue-18446.rs b/src/test/ui/issues/issue-18446-2.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-18446.rs
rename to src/test/ui/issues/issue-18446-2.rs
index 09f3e451ad134..90cc9b4bc4335 100644
--- a/src/test/run-pass/issues/issue-18446.rs
+++ b/src/test/ui/issues/issue-18446-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // Test that methods in trait impls should override default methods.
 
diff --git a/src/test/run-pass/issues/issue-18738.rs b/src/test/ui/issues/issue-18738.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-18738.rs
rename to src/test/ui/issues/issue-18738.rs
index 8ed663cbbd6f4..defd8f97cbcbd 100644
--- a/src/test/run-pass/issues/issue-18738.rs
+++ b/src/test/ui/issues/issue-18738.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #[derive(Eq, PartialEq, PartialOrd, Ord)]
 enum Test<'a> {
diff --git a/src/test/run-pass/issues/issue-18809.rs b/src/test/ui/issues/issue-18809.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-18809.rs
rename to src/test/ui/issues/issue-18809.rs
index 1895b3bdfe456..f4ce51b677adc 100644
--- a/src/test/run-pass/issues/issue-18809.rs
+++ b/src/test/ui/issues/issue-18809.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 trait Tup {
     type T0;
     type T1;
diff --git a/src/test/run-pass/issues/issue-18906.rs b/src/test/ui/issues/issue-18906.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-18906.rs
rename to src/test/ui/issues/issue-18906.rs
index 4f771752c865a..15701a2a45ab2 100644
--- a/src/test/run-pass/issues/issue-18906.rs
+++ b/src/test/ui/issues/issue-18906.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-19037.rs b/src/test/ui/issues/issue-19037.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-19037.rs
rename to src/test/ui/issues/issue-19037.rs
index 350c17415dacb..59b7d40ae0d84 100644
--- a/src/test/run-pass/issues/issue-19037.rs
+++ b/src/test/ui/issues/issue-19037.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-19081.rs b/src/test/ui/issues/issue-19081.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-19081.rs
rename to src/test/ui/issues/issue-19081.rs
index 56ceaaf9884a3..4188670f8f67a 100644
--- a/src/test/run-pass/issues/issue-19081.rs
+++ b/src/test/ui/issues/issue-19081.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 pub trait Hasher {
     type State;
 
diff --git a/src/test/run-pass/issues/issue-19097.rs b/src/test/ui/issues/issue-19097.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-19097.rs
rename to src/test/ui/issues/issue-19097.rs
index 1ad7f524be462..8198a40b0c1d9 100644
--- a/src/test/run-pass/issues/issue-19097.rs
+++ b/src/test/ui/issues/issue-19097.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // regression test for #19097
 
diff --git a/src/test/run-pass/issues/issue-19098.rs b/src/test/ui/issues/issue-19098.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-19098.rs
rename to src/test/ui/issues/issue-19098.rs
index 5b114659ae9e0..c985f7aad1433 100644
--- a/src/test/run-pass/issues/issue-19098.rs
+++ b/src/test/ui/issues/issue-19098.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 pub trait Handler {
     fn handle(&self, _: &mut String);
 }
diff --git a/src/test/run-pass/issues/issue-19102.rs b/src/test/ui/issues/issue-19102.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-19102.rs
rename to src/test/ui/issues/issue-19102.rs
index c26dca255b99e..48b5fece1dfc8 100644
--- a/src/test/run-pass/issues/issue-19102.rs
+++ b/src/test/ui/issues/issue-19102.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(unused_imports)]
 #![deny(unused_qualifications)]
 
diff --git a/src/test/run-pass/issues/issue-19129-1.rs b/src/test/ui/issues/issue-19129-1.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-19129-1.rs
rename to src/test/ui/issues/issue-19129-1.rs
index cdb23e627c970..97bd20be7d712 100644
--- a/src/test/run-pass/issues/issue-19129-1.rs
+++ b/src/test/ui/issues/issue-19129-1.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 trait Trait<Input> {
diff --git a/src/test/run-pass/issues/issue-19129-2.rs b/src/test/ui/issues/issue-19129-2.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-19129-2.rs
rename to src/test/ui/issues/issue-19129-2.rs
index 8d43ece368024..9b1bc2b8ec45b 100644
--- a/src/test/run-pass/issues/issue-19129-2.rs
+++ b/src/test/ui/issues/issue-19129-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(unused_variables)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-19398.rs b/src/test/ui/issues/issue-19398.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-19398.rs
rename to src/test/ui/issues/issue-19398.rs
index dd2a796dba348..c8a7292b24300 100644
--- a/src/test/run-pass/issues/issue-19398.rs
+++ b/src/test/ui/issues/issue-19398.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 trait T {
diff --git a/src/test/run-pass/issues/issue-19404.rs b/src/test/ui/issues/issue-19404.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-19404.rs
rename to src/test/ui/issues/issue-19404.rs
index 3f8aad4e0b148..f74b2eb1065b9 100644
--- a/src/test/run-pass/issues/issue-19404.rs
+++ b/src/test/ui/issues/issue-19404.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(unused_variables)]
 use std::any::TypeId;
diff --git a/src/test/run-pass/issues/issue-19479.rs b/src/test/ui/issues/issue-19479.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-19479.rs
rename to src/test/ui/issues/issue-19479.rs
index 6326dfd8fe050..fae040a092f63 100644
--- a/src/test/run-pass/issues/issue-19479.rs
+++ b/src/test/ui/issues/issue-19479.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 trait Base {
diff --git a/src/test/run-pass/issues/issue-19631.rs b/src/test/ui/issues/issue-19631.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-19631.rs
rename to src/test/ui/issues/issue-19631.rs
index 604e3d608741a..c46cb2c87df98 100644
--- a/src/test/run-pass/issues/issue-19631.rs
+++ b/src/test/ui/issues/issue-19631.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-19632.rs b/src/test/ui/issues/issue-19632.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-19632.rs
rename to src/test/ui/issues/issue-19632.rs
index 5784886e94c95..c641aee29409d 100644
--- a/src/test/run-pass/issues/issue-19632.rs
+++ b/src/test/ui/issues/issue-19632.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-19850.rs b/src/test/ui/issues/issue-19850.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-19850.rs
rename to src/test/ui/issues/issue-19850.rs
index f5b1697528f04..179135baf2577 100644
--- a/src/test/run-pass/issues/issue-19850.rs
+++ b/src/test/ui/issues/issue-19850.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(unused_variables)]
 // Test that `<Type as Trait>::Output` and `Self::Output` are accepted as type annotations in let
 // bindings
diff --git a/src/test/run-pass/issues/issue-19982.rs b/src/test/ui/issues/issue-19982-2.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-19982.rs
rename to src/test/ui/issues/issue-19982-2.rs
index 380cb3cac2285..8c3462dcf45d2 100644
--- a/src/test/run-pass/issues/issue-19982.rs
+++ b/src/test/ui/issues/issue-19982-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 #![feature(fn_traits, unboxed_closures)]
diff --git a/src/test/run-pass/issues/issue-20009.rs b/src/test/ui/issues/issue-20009.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-20009.rs
rename to src/test/ui/issues/issue-20009.rs
index 604395b3dc7c6..a08bd49f599dd 100644
--- a/src/test/run-pass/issues/issue-20009.rs
+++ b/src/test/ui/issues/issue-20009.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // Check that associated types are `Sized`
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/issues/issue-20091.rs b/src/test/ui/issues/issue-20091.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-20091.rs
rename to src/test/ui/issues/issue-20091.rs
index 46d11b9d9b7d7..cd90e828889d5 100644
--- a/src/test/run-pass/issues/issue-20091.rs
+++ b/src/test/ui/issues/issue-20091.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(stable_features)]
 
 // ignore-cloudabi no processes
diff --git a/src/test/run-pass/issues/issue-20186.rs b/src/test/ui/issues/issue-20186.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-20186.rs
rename to src/test/ui/issues/issue-20186.rs
index 16ac2babd4275..fddb1391017d3 100644
--- a/src/test/run-pass/issues/issue-20186.rs
+++ b/src/test/ui/issues/issue-20186.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(unused_variables)]
 struct Foo;
diff --git a/src/test/run-pass/issues/issue-20396.rs b/src/test/ui/issues/issue-20396.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-20396.rs
rename to src/test/ui/issues/issue-20396.rs
index 6f0ce7ca2d469..13e0347cb0807 100644
--- a/src/test/run-pass/issues/issue-20396.rs
+++ b/src/test/ui/issues/issue-20396.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 #![allow(dead_code)]
diff --git a/src/test/run-pass/issues/issue-20414.rs b/src/test/ui/issues/issue-20414.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-20414.rs
rename to src/test/ui/issues/issue-20414.rs
index f42ba1ff30365..72be151a3bc9b 100644
--- a/src/test/run-pass/issues/issue-20414.rs
+++ b/src/test/ui/issues/issue-20414.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-20454.rs b/src/test/ui/issues/issue-20454.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-20454.rs
rename to src/test/ui/issues/issue-20454.rs
index e00ddf4905fd8..ba15236324e32 100644
--- a/src/test/run-pass/issues/issue-20454.rs
+++ b/src/test/ui/issues/issue-20454.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(unused_must_use)]
 use std::thread;
 
diff --git a/src/test/run-pass/issues/issue-2063-resource.rs b/src/test/ui/issues/issue-2063-resource.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-2063-resource.rs
rename to src/test/ui/issues/issue-2063-resource.rs
index 6e30c13204008..bfe2d7acde677 100644
--- a/src/test/run-pass/issues/issue-2063-resource.rs
+++ b/src/test/ui/issues/issue-2063-resource.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // test that autoderef of a type like this does not
 // cause compiler to loop.  Note that no instances
diff --git a/src/test/run-pass/issues/issue-20644.rs b/src/test/ui/issues/issue-20644.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-20644.rs
rename to src/test/ui/issues/issue-20644.rs
index c53565262e81e..8e50c0becb394 100644
--- a/src/test/run-pass/issues/issue-20644.rs
+++ b/src/test/ui/issues/issue-20644.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(unused_imports)]
 #![allow(stable_features)]
diff --git a/src/test/run-pass/issues/issue-20763-1.rs b/src/test/ui/issues/issue-20763-1.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-20763-1.rs
rename to src/test/ui/issues/issue-20763-1.rs
index df85f615cd2a5..bebbc914a459c 100644
--- a/src/test/run-pass/issues/issue-20763-1.rs
+++ b/src/test/ui/issues/issue-20763-1.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-20763-2.rs b/src/test/ui/issues/issue-20763-2.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-20763-2.rs
rename to src/test/ui/issues/issue-20763-2.rs
index 489b87ce90f8d..87f4e54a6adae 100644
--- a/src/test/run-pass/issues/issue-20763-2.rs
+++ b/src/test/ui/issues/issue-20763-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-20797.rs b/src/test/ui/issues/issue-20797.rs
similarity index 99%
rename from src/test/run-pass/issues/issue-20797.rs
rename to src/test/ui/issues/issue-20797.rs
index 9c8a2571deb4c..70be78ee7b2d4 100644
--- a/src/test/run-pass/issues/issue-20797.rs
+++ b/src/test/ui/issues/issue-20797.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // ignore-cloudabi no std::fs
 
 // Regression test for #20797.
diff --git a/src/test/run-pass/issues/issue-20825.rs b/src/test/ui/issues/issue-20825-2.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-20825.rs
rename to src/test/ui/issues/issue-20825-2.rs
index 62435fd343e85..fe2756e281409 100644
--- a/src/test/run-pass/issues/issue-20825.rs
+++ b/src/test/ui/issues/issue-20825-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 pub trait Subscriber {
     type Input;
 }
diff --git a/src/test/run-pass/issues/issue-21140.rs b/src/test/ui/issues/issue-21140.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-21140.rs
rename to src/test/ui/issues/issue-21140.rs
index ebd5f6752e3a8..fd04b7fcee8ee 100644
--- a/src/test/run-pass/issues/issue-21140.rs
+++ b/src/test/ui/issues/issue-21140.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 pub trait Trait where Self::Out: std::fmt::Display {
     type Out;
 }
diff --git a/src/test/run-pass/issues/issue-21174.rs b/src/test/ui/issues/issue-21174-2.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-21174.rs
rename to src/test/ui/issues/issue-21174-2.rs
index f387b93d8f92a..e7524a942b224 100644
--- a/src/test/run-pass/issues/issue-21174.rs
+++ b/src/test/ui/issues/issue-21174-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(unused_variables)]
 trait Trait<'a> {
diff --git a/src/test/run-pass/issues/issue-21245.rs b/src/test/ui/issues/issue-21245.rs
similarity index 99%
rename from src/test/run-pass/issues/issue-21245.rs
rename to src/test/ui/issues/issue-21245.rs
index 234d70e4dd012..64b322f472bbd 100644
--- a/src/test/run-pass/issues/issue-21245.rs
+++ b/src/test/ui/issues/issue-21245.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // Regression test for issue #21245. Check that we are able to infer
 // the types in these examples correctly. It used to be that
diff --git a/src/test/run-pass/issues/issue-21363.rs b/src/test/ui/issues/issue-21363.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-21363.rs
rename to src/test/ui/issues/issue-21363.rs
index e7f7a80a1deeb..06c5ccbb6ccdb 100644
--- a/src/test/run-pass/issues/issue-21363.rs
+++ b/src/test/ui/issues/issue-21363.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 #![no_implicit_prelude]
diff --git a/src/test/run-pass/issues/issue-21402.rs b/src/test/ui/issues/issue-21402.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-21402.rs
rename to src/test/ui/issues/issue-21402.rs
index 041547a5728fe..32633469ea46f 100644
--- a/src/test/run-pass/issues/issue-21402.rs
+++ b/src/test/ui/issues/issue-21402.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-21520.rs b/src/test/ui/issues/issue-21520.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-21520.rs
rename to src/test/ui/issues/issue-21520.rs
index 33d79b6616296..aac41196215d2 100644
--- a/src/test/run-pass/issues/issue-21520.rs
+++ b/src/test/ui/issues/issue-21520.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // Test that the requirement (in `Bar`) that `T::Bar : 'static` does
 // not wind up propagating to `T`.
diff --git a/src/test/run-pass/issues/issue-21562.rs b/src/test/ui/issues/issue-21562.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-21562.rs
rename to src/test/ui/issues/issue-21562.rs
index 4e90ed7c4473e..2cf97cec31c33 100644
--- a/src/test/run-pass/issues/issue-21562.rs
+++ b/src/test/ui/issues/issue-21562.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_upper_case_globals)]
 
diff --git a/src/test/run-pass/issues/issue-21622.rs b/src/test/ui/issues/issue-21622.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-21622.rs
rename to src/test/ui/issues/issue-21622.rs
index 16db178452e7b..880b3524e1074 100644
--- a/src/test/run-pass/issues/issue-21622.rs
+++ b/src/test/ui/issues/issue-21622.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(unused_variables)]
 
diff --git a/src/test/run-pass/issues/issue-21634.rs b/src/test/ui/issues/issue-21634.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-21634.rs
rename to src/test/ui/issues/issue-21634.rs
index 8c914ac5adc62..d21f562395313 100644
--- a/src/test/run-pass/issues/issue-21634.rs
+++ b/src/test/ui/issues/issue-21634.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(stable_features)]
 
 #![feature(cfg_target_feature)]
diff --git a/src/test/run-pass/issues/issue-21726.rs b/src/test/ui/issues/issue-21726.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-21726.rs
rename to src/test/ui/issues/issue-21726.rs
index ffdff9aa2bafc..b25fe1bc9540c 100644
--- a/src/test/run-pass/issues/issue-21726.rs
+++ b/src/test/ui/issues/issue-21726.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // Regression test for #21726: an issue arose around the rules for
 // subtyping of projection types that resulted in an unconstrained
diff --git a/src/test/run-pass/issues/issue-21891.rs b/src/test/ui/issues/issue-21891.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-21891.rs
rename to src/test/ui/issues/issue-21891.rs
index 90a496617b0ce..d83cf08d1733d 100644
--- a/src/test/run-pass/issues/issue-21891.rs
+++ b/src/test/ui/issues/issue-21891.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_upper_case_globals)]
 
diff --git a/src/test/run-pass/issues/issue-22066.rs b/src/test/ui/issues/issue-22066.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-22066.rs
rename to src/test/ui/issues/issue-22066.rs
index ef4753703bf58..76dae2a2602e0 100644
--- a/src/test/run-pass/issues/issue-22066.rs
+++ b/src/test/ui/issues/issue-22066.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 pub trait LineFormatter<'a> {
     type Iter: Iterator<Item=&'a str> + 'a;
     fn iter(&'a self, line: &'a str) -> Self::Iter;
diff --git a/src/test/run-pass/issues/issue-22356.rs b/src/test/ui/issues/issue-22356.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-22356.rs
rename to src/test/ui/issues/issue-22356.rs
index 6e62ae069829e..87ea53a3f204b 100644
--- a/src/test/run-pass/issues/issue-22356.rs
+++ b/src/test/ui/issues/issue-22356.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(type_alias_bounds)]
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/issues/issue-22375.rs b/src/test/ui/issues/issue-22375.rs
similarity index 96%
rename from src/test/run-pass/issues/issue-22375.rs
rename to src/test/ui/issues/issue-22375.rs
index cf7ff0c404c06..a30f5f7638750 100644
--- a/src/test/run-pass/issues/issue-22375.rs
+++ b/src/test/ui/issues/issue-22375.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 trait A<T: A<T>> {}
 
 fn main() {}
diff --git a/src/test/run-pass/issues/issue-22471.rs b/src/test/ui/issues/issue-22471.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-22471.rs
rename to src/test/ui/issues/issue-22471.rs
index b93f1f354c61a..c13b9dd9248a5 100644
--- a/src/test/run-pass/issues/issue-22471.rs
+++ b/src/test/ui/issues/issue-22471.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(type_alias_bounds)]
 
diff --git a/src/test/run-pass/issues/issue-22781.rs b/src/test/ui/issues/issue-22781.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-22781.rs
rename to src/test/ui/issues/issue-22781.rs
index 8849b505e4b01..21e6138e4965d 100644
--- a/src/test/run-pass/issues/issue-22781.rs
+++ b/src/test/ui/issues/issue-22781.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(unused_variables)]
 use std::collections::HashMap;
 use std::collections::hash_map::Entry::Vacant;
diff --git a/src/test/run-pass/issues/issue-22814.rs b/src/test/ui/issues/issue-22814.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-22814.rs
rename to src/test/ui/issues/issue-22814.rs
index 13c7dab375110..0d11484d96879 100644
--- a/src/test/run-pass/issues/issue-22814.rs
+++ b/src/test/ui/issues/issue-22814.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 trait Test {}
 
 macro_rules! test {
diff --git a/src/test/run-pass/issues/issue-22894.rs b/src/test/ui/issues/issue-22894.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-22894.rs
rename to src/test/ui/issues/issue-22894.rs
index d1cd8efd73c26..f5ecd17d78816 100644
--- a/src/test/run-pass/issues/issue-22894.rs
+++ b/src/test/ui/issues/issue-22894.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #[allow(dead_code)]
 static X: &'static str = &*"";
 fn main() {}
diff --git a/src/test/run-pass/issues/issue-23406.rs b/src/test/ui/issues/issue-23406.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-23406.rs
rename to src/test/ui/issues/issue-23406.rs
index 771f62a6323f4..eef35fe6f2484 100644
--- a/src/test/run-pass/issues/issue-23406.rs
+++ b/src/test/ui/issues/issue-23406.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 trait Inner {
     type T;
diff --git a/src/test/run-pass/issues/issue-23442.rs b/src/test/ui/issues/issue-23442.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-23442.rs
rename to src/test/ui/issues/issue-23442.rs
index 1b31516be17f8..9907cf6b687eb 100644
--- a/src/test/run-pass/issues/issue-23442.rs
+++ b/src/test/ui/issues/issue-23442.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 use std::marker::PhantomData;
 
diff --git a/src/test/run-pass/issues/issue-23477.rs b/src/test/ui/issues/issue-23477.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-23477.rs
rename to src/test/ui/issues/issue-23477.rs
index c862b0dbc2fa5..6d4fdcd08b64c 100644
--- a/src/test/run-pass/issues/issue-23477.rs
+++ b/src/test/ui/issues/issue-23477.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // compiler-flags: -g
 
 pub struct Dst {
diff --git a/src/test/run-pass/issues/issue-23550.rs b/src/test/ui/issues/issue-23550.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-23550.rs
rename to src/test/ui/issues/issue-23550.rs
index 143e0babcd962..e5b672bc3e7c0 100644
--- a/src/test/run-pass/issues/issue-23550.rs
+++ b/src/test/ui/issues/issue-23550.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![feature(core_intrinsics)]
 #![allow(warnings)]
 
diff --git a/src/test/run-pass/issues/issue-23649-3.rs b/src/test/ui/issues/issue-23649-3.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-23649-3.rs
rename to src/test/ui/issues/issue-23649-3.rs
index 067628ec12af9..b2c9183c16c93 100644
--- a/src/test/run-pass/issues/issue-23649-3.rs
+++ b/src/test/ui/issues/issue-23649-3.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #[derive(PartialEq)]
 struct Slice { slice: [u8] }
 
diff --git a/src/test/run-pass/issues/issue-24085.rs b/src/test/ui/issues/issue-24085.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-24085.rs
rename to src/test/ui/issues/issue-24085.rs
index 06350a80730ad..e74f993df67db 100644
--- a/src/test/run-pass/issues/issue-24085.rs
+++ b/src/test/ui/issues/issue-24085.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // Regression test for #24085. Errors were occurring in region
 // inference due to the requirement that `'a:b'`, which was getting
diff --git a/src/test/run-pass/issues/issue-24227.rs b/src/test/ui/issues/issue-24227.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-24227.rs
rename to src/test/ui/issues/issue-24227.rs
index 86241b1763aeb..f2c67e19eef7c 100644
--- a/src/test/run-pass/issues/issue-24227.rs
+++ b/src/test/ui/issues/issue-24227.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // This resulted in an ICE. Test for future-proofing
 // Issue #24227
 
diff --git a/src/test/run-pass/issues/issue-24389.rs b/src/test/ui/issues/issue-24389.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-24389.rs
rename to src/test/ui/issues/issue-24389.rs
index 5eb622bb932b9..704a71dbb1edc 100644
--- a/src/test/run-pass/issues/issue-24389.rs
+++ b/src/test/ui/issues/issue-24389.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 
 struct Foo;
diff --git a/src/test/run-pass/issues/issue-24434.rs b/src/test/ui/issues/issue-24434.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-24434.rs
rename to src/test/ui/issues/issue-24434.rs
index 7fdd6f8ee8be3..490d6dfadec53 100644
--- a/src/test/run-pass/issues/issue-24434.rs
+++ b/src/test/ui/issues/issue-24434.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(unused_attributes)]
 // compile-flags:--cfg set1
 
diff --git a/src/test/run-pass/issues/issue-25180.rs b/src/test/ui/issues/issue-25180.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-25180.rs
rename to src/test/ui/issues/issue-25180.rs
index 04a28fb8f0a29..5f15393dacc12 100644
--- a/src/test/run-pass/issues/issue-25180.rs
+++ b/src/test/ui/issues/issue-25180.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_upper_case_globals)]
 
diff --git a/src/test/run-pass/issues/issue-25394.rs b/src/test/ui/issues/issue-25394.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-25394.rs
rename to src/test/ui/issues/issue-25394.rs
index 4e7b6242712b9..eaa44623f40e6 100644
--- a/src/test/run-pass/issues/issue-25394.rs
+++ b/src/test/ui/issues/issue-25394.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #[derive(Debug)]
 struct Row<T>([T]);
diff --git a/src/test/run-pass/issues/issue-26095.rs b/src/test/ui/issues/issue-26095.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-26095.rs
rename to src/test/ui/issues/issue-26095.rs
index cc7f7cdbab1f7..cf33cf3cb6e17 100644
--- a/src/test/run-pass/issues/issue-26095.rs
+++ b/src/test/ui/issues/issue-26095.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_upper_case_globals)]
 
diff --git a/src/test/run-pass/issues/issue-26205.rs b/src/test/ui/issues/issue-26205.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-26205.rs
rename to src/test/ui/issues/issue-26205.rs
index ce96c3dd5a2a3..ccadee457506e 100644
--- a/src/test/run-pass/issues/issue-26205.rs
+++ b/src/test/ui/issues/issue-26205.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 use std::ops::{Deref, DerefMut};
 
diff --git a/src/test/run-pass/issues/issue-26646.rs b/src/test/ui/issues/issue-26646.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-26646.rs
rename to src/test/ui/issues/issue-26646.rs
index 05602f7504eb8..a587db00dcf2d 100644
--- a/src/test/run-pass/issues/issue-26646.rs
+++ b/src/test/ui/issues/issue-26646.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![deny(unused_attributes)]
 
 #[repr(C)]
diff --git a/src/test/run-pass/issues/issue-26997.rs b/src/test/ui/issues/issue-26997.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-26997.rs
rename to src/test/ui/issues/issue-26997.rs
index 03430e1ac687d..1a4850d245919 100644
--- a/src/test/run-pass/issues/issue-26997.rs
+++ b/src/test/ui/issues/issue-26997.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 pub struct Foo {
     x: isize,
diff --git a/src/test/run-pass/issues/issue-27105.rs b/src/test/ui/issues/issue-27105.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-27105.rs
rename to src/test/ui/issues/issue-27105.rs
index e565acde2f01e..c2a0baaba2844 100644
--- a/src/test/run-pass/issues/issue-27105.rs
+++ b/src/test/ui/issues/issue-27105.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 use std::cell::RefCell;
 use std::rc::Rc;
 
diff --git a/src/test/run-pass/issues/issue-27281.rs b/src/test/ui/issues/issue-27281.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-27281.rs
rename to src/test/ui/issues/issue-27281.rs
index 1dc4ac5cdcc91..1dfbe21921ec4 100644
--- a/src/test/run-pass/issues/issue-27281.rs
+++ b/src/test/ui/issues/issue-27281.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 pub trait Trait<'a> {
     type T;
     type U;
diff --git a/src/test/run-pass/issues/issue-27583.rs b/src/test/ui/issues/issue-27583.rs
similarity index 99%
rename from src/test/run-pass/issues/issue-27583.rs
rename to src/test/ui/issues/issue-27583.rs
index 1a1ad2bc1945b..c0a981f60ee00 100644
--- a/src/test/run-pass/issues/issue-27583.rs
+++ b/src/test/ui/issues/issue-27583.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // Regression test for issue #27583. Unclear how useful this will be
 // going forward, since the issue in question was EXTREMELY sensitive
 // to compiler internals (like the precise numbering of nodes), but
diff --git a/src/test/run-pass/issues/issue-27889.rs b/src/test/ui/issues/issue-27889.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-27889.rs
rename to src/test/ui/issues/issue-27889.rs
index 82d178835e2d2..4e4ef64c5b683 100644
--- a/src/test/run-pass/issues/issue-27889.rs
+++ b/src/test/ui/issues/issue-27889.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(unused_assignments)]
 #![allow(unused_variables)]
 // Test that a field can have the same name in different variants
diff --git a/src/test/run-pass/issues/issue-28279.rs b/src/test/ui/issues/issue-28279.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-28279.rs
rename to src/test/ui/issues/issue-28279.rs
index bd5129a8ae4d9..c3f2c73e845f5 100644
--- a/src/test/run-pass/issues/issue-28279.rs
+++ b/src/test/ui/issues/issue-28279.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 use std::rc::Rc;
 
diff --git a/src/test/run-pass/issues/issue-28561.rs b/src/test/ui/issues/issue-28561.rs
similarity index 99%
rename from src/test/run-pass/issues/issue-28561.rs
rename to src/test/ui/issues/issue-28561.rs
index 5927ce77f8eda..28fac2cba0fab 100644
--- a/src/test/run-pass/issues/issue-28561.rs
+++ b/src/test/ui/issues/issue-28561.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #[derive(Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
 struct Array<T> {
     f00: [T; 00],
diff --git a/src/test/run-pass/issues/issue-28600.rs b/src/test/ui/issues/issue-28600.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-28600.rs
rename to src/test/ui/issues/issue-28600.rs
index 0f3573f7e62ee..88842ad9ca59e 100644
--- a/src/test/run-pass/issues/issue-28600.rs
+++ b/src/test/ui/issues/issue-28600.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // #28600 ICE: pub extern fn with parameter type &str inside struct impl
 
 struct Test;
diff --git a/src/test/run-pass/issues/issue-28822.rs b/src/test/ui/issues/issue-28822.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-28822.rs
rename to src/test/ui/issues/issue-28822.rs
index 1dda721295231..af8531feff23a 100644
--- a/src/test/run-pass/issues/issue-28822.rs
+++ b/src/test/ui/issues/issue-28822.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![feature(min_const_fn)]
 
diff --git a/src/test/run-pass/issues/issue-28871.rs b/src/test/ui/issues/issue-28871.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-28871.rs
rename to src/test/ui/issues/issue-28871.rs
index 2be3240927420..0602b9b2297ee 100644
--- a/src/test/run-pass/issues/issue-28871.rs
+++ b/src/test/ui/issues/issue-28871.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // Regression test for #28871. The problem is that rustc encountered
 // two ways to project, one from a where clause and one from the where
 // clauses on the trait definition. (In fact, in this case, the where
diff --git a/src/test/run-pass/issues/issue-28936.rs b/src/test/ui/issues/issue-28936.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-28936.rs
rename to src/test/ui/issues/issue-28936.rs
index 1e3e3474c171c..fd05383879577 100644
--- a/src/test/run-pass/issues/issue-28936.rs
+++ b/src/test/ui/issues/issue-28936.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 pub type Session = i32;
 pub struct StreamParser<'a, T> {
     _tokens: T,
diff --git a/src/test/run-pass/issues/issue-28999.rs b/src/test/ui/issues/issue-28999.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-28999.rs
rename to src/test/ui/issues/issue-28999.rs
index bb5747ca7443a..7f4ccc971b77a 100644
--- a/src/test/run-pass/issues/issue-28999.rs
+++ b/src/test/ui/issues/issue-28999.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 pub struct Xyz<'a, V> {
     pub v: (V, &'a u32),
 }
diff --git a/src/test/run-pass/issues/issue-29030.rs b/src/test/ui/issues/issue-29030.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-29030.rs
rename to src/test/ui/issues/issue-29030.rs
index 9f4b2cffbbb13..08460e18c1336 100644
--- a/src/test/run-pass/issues/issue-29030.rs
+++ b/src/test/ui/issues/issue-29030.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #[derive(Debug)]
 struct Message<'a, P: 'a = &'a [u8]> {
diff --git a/src/test/run-pass/issues/issue-29037.rs b/src/test/ui/issues/issue-29037.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-29037.rs
rename to src/test/ui/issues/issue-29037.rs
index 3148e61827ff0..cb15e4048b959 100644
--- a/src/test/run-pass/issues/issue-29037.rs
+++ b/src/test/ui/issues/issue-29037.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // This test ensures that each pointer type `P<X>` is covariant in `X`.
 
diff --git a/src/test/run-pass/issues/issue-29048.rs b/src/test/ui/issues/issue-29048.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-29048.rs
rename to src/test/ui/issues/issue-29048.rs
index f889cd8af6170..cbd0eab8b1c51 100644
--- a/src/test/run-pass/issues/issue-29048.rs
+++ b/src/test/ui/issues/issue-29048.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 pub struct Chan;
 pub struct ChanSelect<'c, T> {
     chans: Vec<(&'c Chan, T)>,
diff --git a/src/test/run-pass/issues/issue-29071.rs b/src/test/ui/issues/issue-29071.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-29071.rs
rename to src/test/ui/issues/issue-29071.rs
index 1eab5a7bbdad1..874978826cadd 100644
--- a/src/test/run-pass/issues/issue-29071.rs
+++ b/src/test/ui/issues/issue-29071.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_upper_case_globals)]
 
diff --git a/src/test/run-pass/issues/issue-29276.rs b/src/test/ui/issues/issue-29276.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-29276.rs
rename to src/test/ui/issues/issue-29276.rs
index 9f2a0d6bc99b9..4ea720bfb7ca0 100644
--- a/src/test/run-pass/issues/issue-29276.rs
+++ b/src/test/ui/issues/issue-29276.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 struct S([u8; { struct Z; 0 }]);
 
diff --git a/src/test/run-pass/issues/issue-29516.rs b/src/test/ui/issues/issue-29516.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-29516.rs
rename to src/test/ui/issues/issue-29516.rs
index 55caa65f1cfe3..8315585e15ed9 100644
--- a/src/test/run-pass/issues/issue-29516.rs
+++ b/src/test/ui/issues/issue-29516.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![feature(optin_builtin_traits)]
 
 auto trait NotSame {}
diff --git a/src/test/run-pass/issues/issue-29540.rs b/src/test/ui/issues/issue-29540.rs
similarity index 99%
rename from src/test/run-pass/issues/issue-29540.rs
rename to src/test/ui/issues/issue-29540.rs
index 7e01efcd05f3b..0dbd830c13501 100644
--- a/src/test/run-pass/issues/issue-29540.rs
+++ b/src/test/ui/issues/issue-29540.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #[derive(Debug)]
 pub struct Config {
     pub name: String,
diff --git a/src/test/run-pass/issues/issue-29710.rs b/src/test/ui/issues/issue-29710.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-29710.rs
rename to src/test/ui/issues/issue-29710.rs
index fa768340b71ac..971aac8f694dd 100644
--- a/src/test/run-pass/issues/issue-29710.rs
+++ b/src/test/ui/issues/issue-29710.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![deny(unused_results)]
 #![allow(dead_code)]
 
diff --git a/src/test/run-pass/issues/issue-29740.rs b/src/test/ui/issues/issue-29740.rs
similarity index 99%
rename from src/test/run-pass/issues/issue-29740.rs
rename to src/test/ui/issues/issue-29740.rs
index 3854ad38bdcd2..e383b712f24a3 100644
--- a/src/test/run-pass/issues/issue-29740.rs
+++ b/src/test/ui/issues/issue-29740.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // Regression test for #29740. Inefficient MIR matching algorithms
 // generated way too much code for this sort of case, leading to OOM.
diff --git a/src/test/run-pass/issues/issue-31260.rs b/src/test/ui/issues/issue-31260.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-31260.rs
rename to src/test/ui/issues/issue-31260.rs
index 82d0d5b5ffbb6..085a6e19eb158 100644
--- a/src/test/run-pass/issues/issue-31260.rs
+++ b/src/test/ui/issues/issue-31260.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 pub struct Struct<K: 'static> {
     pub field: K,
diff --git a/src/test/run-pass/issues/issue-31597.rs b/src/test/ui/issues/issue-31597.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-31597.rs
rename to src/test/ui/issues/issue-31597.rs
index f3995511b0fc9..163b7385c8bcb 100644
--- a/src/test/run-pass/issues/issue-31597.rs
+++ b/src/test/ui/issues/issue-31597.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 trait Make {
     type Out;
diff --git a/src/test/run-pass/issues/issue-32324.rs b/src/test/ui/issues/issue-32324.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-32324.rs
rename to src/test/ui/issues/issue-32324.rs
index 483ddaeb9578d..92d88d543a58f 100644
--- a/src/test/run-pass/issues/issue-32324.rs
+++ b/src/test/ui/issues/issue-32324.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 
 trait Resources {
diff --git a/src/test/run-pass/issues/issue-33264.rs b/src/test/ui/issues/issue-33264.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-33264.rs
rename to src/test/ui/issues/issue-33264.rs
index 1c0ad2a659e8d..9b17dae0eef94 100644
--- a/src/test/run-pass/issues/issue-33264.rs
+++ b/src/test/ui/issues/issue-33264.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // only-x86_64
 
 #![allow(dead_code, non_upper_case_globals)]
diff --git a/src/test/run-pass/issues/issue-33287.rs b/src/test/ui/issues/issue-33287.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-33287.rs
rename to src/test/ui/issues/issue-33287.rs
index 31f44ffa34db4..1816d7d4f8878 100644
--- a/src/test/run-pass/issues/issue-33287.rs
+++ b/src/test/ui/issues/issue-33287.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(unused_variables)]
 const A: [u32; 1] = [0];
diff --git a/src/test/run-pass/issues/issue-33903.rs b/src/test/ui/issues/issue-33903.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-33903.rs
rename to src/test/ui/issues/issue-33903.rs
index e521b594aa239..bcbb73ce65b96 100644
--- a/src/test/run-pass/issues/issue-33903.rs
+++ b/src/test/ui/issues/issue-33903.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // Issue 33903:
 // Built-in indexing should be used even when the index is not
diff --git a/src/test/run-pass/issues/issue-34194.rs b/src/test/ui/issues/issue-34194.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-34194.rs
rename to src/test/ui/issues/issue-34194.rs
index dfc0a34651a31..986048a03ee11 100644
--- a/src/test/run-pass/issues/issue-34194.rs
+++ b/src/test/ui/issues/issue-34194.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 
 struct A {
diff --git a/src/test/run-pass/issues/issue-34751.rs b/src/test/ui/issues/issue-34751.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-34751.rs
rename to src/test/ui/issues/issue-34751.rs
index d4758b80e9793..e39e3c3b309b8 100644
--- a/src/test/run-pass/issues/issue-34751.rs
+++ b/src/test/ui/issues/issue-34751.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // #34751 ICE: 'rustc' panicked at 'assertion failed: !substs.has_regions_escaping_depth(0)'
 
diff --git a/src/test/run-pass/issues/issue-34780.rs b/src/test/ui/issues/issue-34780.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-34780.rs
rename to src/test/ui/issues/issue-34780.rs
index b7f2871a8d152..90b462a7432f3 100644
--- a/src/test/run-pass/issues/issue-34780.rs
+++ b/src/test/ui/issues/issue-34780.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(stable_features)]
 #![feature(associated_consts)]
 
diff --git a/src/test/run-pass/issues/issue-35376.rs b/src/test/ui/issues/issue-35376.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-35376.rs
rename to src/test/ui/issues/issue-35376.rs
index ee8c6c9f35c20..0265a5845f988 100644
--- a/src/test/run-pass/issues/issue-35376.rs
+++ b/src/test/ui/issues/issue-35376.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![feature(specialization)]
 
 fn main() {}
diff --git a/src/test/run-pass/issues/issue-35546.rs b/src/test/ui/issues/issue-35546.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-35546.rs
rename to src/test/ui/issues/issue-35546.rs
index 13d099081b05f..79680565ee178 100644
--- a/src/test/run-pass/issues/issue-35546.rs
+++ b/src/test/ui/issues/issue-35546.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // Regression test for #35546. Check that we are able to codegen
 // this. Before we had problems because of the drop glue signature
diff --git a/src/test/run-pass/issues/issue-36075.rs b/src/test/ui/issues/issue-36075.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-36075.rs
rename to src/test/ui/issues/issue-36075.rs
index 4042bd1979498..fdc10ae936b9a 100644
--- a/src/test/run-pass/issues/issue-36075.rs
+++ b/src/test/ui/issues/issue-36075.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 trait DeclarationParser {
     type Declaration;
diff --git a/src/test/run-pass/issues/issue-36744-without-calls.rs b/src/test/ui/issues/issue-36744-without-calls.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-36744-without-calls.rs
rename to src/test/ui/issues/issue-36744-without-calls.rs
index ad54d6e403cb4..8a47ebbd0a899 100644
--- a/src/test/run-pass/issues/issue-36744-without-calls.rs
+++ b/src/test/ui/issues/issue-36744-without-calls.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // Tests for an LLVM abort when storing a lifetime-parametric fn into
 // context that is expecting one that is not lifetime-parametric
 // (i.e. has no `for <'_>`).
diff --git a/src/test/run-pass/issues/issue-37598.rs b/src/test/ui/issues/issue-37598.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-37598.rs
rename to src/test/ui/issues/issue-37598.rs
index 3001591c406e8..9956301dcc9b3 100644
--- a/src/test/run-pass/issues/issue-37598.rs
+++ b/src/test/ui/issues/issue-37598.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![feature(slice_patterns)]
 
diff --git a/src/test/run-pass/issues/issue-37655.rs b/src/test/ui/issues/issue-37655.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-37655.rs
rename to src/test/ui/issues/issue-37655.rs
index 899686befc234..472b3383727ae 100644
--- a/src/test/run-pass/issues/issue-37655.rs
+++ b/src/test/ui/issues/issue-37655.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // Regression test for #37655. The problem was a false edge created by
 // coercion that wound up requiring that `'a` (in `split()`) outlive
 // `'b`, which shouldn't be necessary.
diff --git a/src/test/run-pass/issues/issue-37725.rs b/src/test/ui/issues/issue-37725.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-37725.rs
rename to src/test/ui/issues/issue-37725.rs
index 8b29dad918d39..fa5bb362c9f6d 100644
--- a/src/test/run-pass/issues/issue-37725.rs
+++ b/src/test/ui/issues/issue-37725.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 trait Foo {
     fn foo(&self);
diff --git a/src/test/run-pass/issues/issue-38727.rs b/src/test/ui/issues/issue-38727.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-38727.rs
rename to src/test/ui/issues/issue-38727.rs
index ccf0e1c2bdbd7..5774d08473add 100644
--- a/src/test/run-pass/issues/issue-38727.rs
+++ b/src/test/ui/issues/issue-38727.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #[repr(u64)]
 enum A {
diff --git a/src/test/run-pass/issues/issue-39089.rs b/src/test/ui/issues/issue-39089.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-39089.rs
rename to src/test/ui/issues/issue-39089.rs
index 6908563a81ce5..f6acc4b814df1 100644
--- a/src/test/run-pass/issues/issue-39089.rs
+++ b/src/test/ui/issues/issue-39089.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 fn f<T: ?for<'a> Sized>() {}
 
diff --git a/src/test/run-pass/issues/issue-39467.rs b/src/test/ui/issues/issue-39467.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-39467.rs
rename to src/test/ui/issues/issue-39467.rs
index d54cf3f27c51e..417b3160a4d9b 100644
--- a/src/test/run-pass/issues/issue-39467.rs
+++ b/src/test/ui/issues/issue-39467.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 macro_rules! expr { () => { () } }
 
diff --git a/src/test/run-pass/issues/issue-39984.rs b/src/test/ui/issues/issue-39984.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-39984.rs
rename to src/test/ui/issues/issue-39984.rs
index c90585cb734ea..cd4b32688d35d 100644
--- a/src/test/run-pass/issues/issue-39984.rs
+++ b/src/test/ui/issues/issue-39984.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(unreachable_code)]
 // Regression test for issue #39984.
diff --git a/src/test/run-pass/issues/issue-40136.rs b/src/test/ui/issues/issue-40136.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-40136.rs
rename to src/test/ui/issues/issue-40136.rs
index 00d33fae13c11..77f4466ae54e7 100644
--- a/src/test/run-pass/issues/issue-40136.rs
+++ b/src/test/ui/issues/issue-40136.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 
 macro_rules! m { () => { 0 } }
diff --git a/src/test/run-pass/issues/issue-40962.rs b/src/test/ui/issues/issue-40962.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-40962.rs
rename to src/test/ui/issues/issue-40962.rs
index 9c9fb2ce9cbe0..8b2a53f4032e3 100644
--- a/src/test/run-pass/issues/issue-40962.rs
+++ b/src/test/ui/issues/issue-40962.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 macro_rules! m {
     ($i:meta) => {
         #[derive($i)]
diff --git a/src/test/run-pass/issues/issue-41272.rs b/src/test/ui/issues/issue-41272.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-41272.rs
rename to src/test/ui/issues/issue-41272.rs
index 827edd39d2f91..ff8c234ae5ede 100644
--- a/src/test/run-pass/issues/issue-41272.rs
+++ b/src/test/ui/issues/issue-41272.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 struct Foo;
 
diff --git a/src/test/run-pass/issues/issue-41298.rs b/src/test/ui/issues/issue-41298.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-41298.rs
rename to src/test/ui/issues/issue-41298.rs
index 189c419c5dbbd..808e6a7f05fa1 100644
--- a/src/test/run-pass/issues/issue-41298.rs
+++ b/src/test/ui/issues/issue-41298.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 struct Function<T, F> { t: T, f: F }
 
diff --git a/src/test/run-pass/issues/issue-41628.rs b/src/test/ui/issues/issue-41628.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-41628.rs
rename to src/test/ui/issues/issue-41628.rs
index f4b9588ff0567..ac626f0ba387e 100644
--- a/src/test/run-pass/issues/issue-41628.rs
+++ b/src/test/ui/issues/issue-41628.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![deny(dead_code)]
 
 #[used]
diff --git a/src/test/run-pass/issues/issue-41936-variance-coerce-unsized-cycle.rs b/src/test/ui/issues/issue-41936-variance-coerce-unsized-cycle.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-41936-variance-coerce-unsized-cycle.rs
rename to src/test/ui/issues/issue-41936-variance-coerce-unsized-cycle.rs
index 1a4b283a81be5..96c9a565233f2 100644
--- a/src/test/run-pass/issues/issue-41936-variance-coerce-unsized-cycle.rs
+++ b/src/test/ui/issues/issue-41936-variance-coerce-unsized-cycle.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // Regression test for #41936. The coerce-unsized trait check in
 // coherence was using subtyping, which triggered variance
diff --git a/src/test/run-pass/issues/issue-42467.rs b/src/test/ui/issues/issue-42467.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-42467.rs
rename to src/test/ui/issues/issue-42467.rs
index 82bab74a49b66..2acefd718c93c 100644
--- a/src/test/run-pass/issues/issue-42467.rs
+++ b/src/test/ui/issues/issue-42467.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 struct Foo<T>(T);
 
diff --git a/src/test/run-pass/issues/issue-42956.rs b/src/test/ui/issues/issue-42956.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-42956.rs
rename to src/test/ui/issues/issue-42956.rs
index 2210facf294a5..9dff9f6628206 100644
--- a/src/test/run-pass/issues/issue-42956.rs
+++ b/src/test/ui/issues/issue-42956.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(stable_features)]
 #![feature(associated_consts)]
diff --git a/src/test/run-pass/issues/issue-43057.rs b/src/test/ui/issues/issue-43057.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-43057.rs
rename to src/test/ui/issues/issue-43057.rs
index 26140246a7f12..ba363e9e29e29 100644
--- a/src/test/run-pass/issues/issue-43057.rs
+++ b/src/test/ui/issues/issue-43057.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(unused)]
 
 macro_rules! column {
diff --git a/src/test/run-pass/issues/issue-43357.rs b/src/test/ui/issues/issue-43357.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-43357.rs
rename to src/test/ui/issues/issue-43357.rs
index 558b0712bb1f3..d42f0de4849d1 100644
--- a/src/test/run-pass/issues/issue-43357.rs
+++ b/src/test/ui/issues/issue-43357.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 trait Trait {
     type Output;
diff --git a/src/test/run-pass/issues/issue-43483.rs b/src/test/ui/issues/issue-43483.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-43483.rs
rename to src/test/ui/issues/issue-43483.rs
index 841bc629ce5b2..9622265ce2e01 100644
--- a/src/test/run-pass/issues/issue-43483.rs
+++ b/src/test/ui/issues/issue-43483.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(unused_variables)]
 trait VecN {
diff --git a/src/test/run-pass/issues/issue-44005.rs b/src/test/ui/issues/issue-44005.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-44005.rs
rename to src/test/ui/issues/issue-44005.rs
index 699cb18ffc72f..c3599294e37e4 100644
--- a/src/test/run-pass/issues/issue-44005.rs
+++ b/src/test/ui/issues/issue-44005.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 pub trait Foo<'a> {
     type Bar;
     fn foo(&'a self) -> Self::Bar;
diff --git a/src/test/run-pass/issues/issue-44056.rs b/src/test/ui/issues/issue-44056.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-44056.rs
rename to src/test/ui/issues/issue-44056.rs
index 50fe999706681..b2f0e917749d5 100644
--- a/src/test/run-pass/issues/issue-44056.rs
+++ b/src/test/ui/issues/issue-44056.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // only-x86_64
 // no-prefer-dynamic
 // compile-flags: -Ctarget-feature=+avx -Clto
diff --git a/src/test/run-pass/issues/issue-44247.rs b/src/test/ui/issues/issue-44247.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-44247.rs
rename to src/test/ui/issues/issue-44247.rs
index c1204aa43a224..29c4b977d65d9 100644
--- a/src/test/run-pass/issues/issue-44247.rs
+++ b/src/test/ui/issues/issue-44247.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 trait T {
     type X;
diff --git a/src/test/run-pass/issues/issue-44373.rs b/src/test/ui/issues/issue-44373-2.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-44373.rs
rename to src/test/ui/issues/issue-44373-2.rs
index 2ed79dd89c8e6..ccc99f0ecc48e 100644
--- a/src/test/run-pass/issues/issue-44373.rs
+++ b/src/test/ui/issues/issue-44373-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // compile-flags: -Z borrowck=compare
 
diff --git a/src/test/run-pass/issues/issue-44402.rs b/src/test/ui/issues/issue-44402.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-44402.rs
rename to src/test/ui/issues/issue-44402.rs
index 6863fdbb56692..f44f261041a37 100644
--- a/src/test/run-pass/issues/issue-44402.rs
+++ b/src/test/ui/issues/issue-44402.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![feature(never_type)]
 #![feature(exhaustive_patterns)]
diff --git a/src/test/run-pass/issues/issue-44730.rs b/src/test/ui/issues/issue-44730.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-44730.rs
rename to src/test/ui/issues/issue-44730.rs
index 0f4d2e174fc09..61b266e2b7e25 100644
--- a/src/test/run-pass/issues/issue-44730.rs
+++ b/src/test/ui/issues/issue-44730.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 //! dox
 
 #![deny(missing_docs)]
diff --git a/src/test/run-pass/issues/issue-44851.rs b/src/test/ui/issues/issue-44851.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-44851.rs
rename to src/test/ui/issues/issue-44851.rs
index 1e9f4d3e4e540..4a302be05e70a 100644
--- a/src/test/run-pass/issues/issue-44851.rs
+++ b/src/test/ui/issues/issue-44851.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 macro_rules! a {
     () => { "a" }
 }
diff --git a/src/test/run-pass/issues/issue-45425.rs b/src/test/ui/issues/issue-45425.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-45425.rs
rename to src/test/ui/issues/issue-45425.rs
index dfc7c8a8795b8..2b5b7ff18155c 100644
--- a/src/test/run-pass/issues/issue-45425.rs
+++ b/src/test/ui/issues/issue-45425.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 use std::ops::Add;
 
diff --git a/src/test/run-pass/issues/issue-46959.rs b/src/test/ui/issues/issue-46959.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-46959.rs
rename to src/test/ui/issues/issue-46959.rs
index baaff2d4581d9..0e585378fa7f4 100644
--- a/src/test/run-pass/issues/issue-46959.rs
+++ b/src/test/ui/issues/issue-46959.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![deny(non_camel_case_types)]
 
 #[allow(dead_code)]
diff --git a/src/test/run-pass/issues/issue-46964.rs b/src/test/ui/issues/issue-46964.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-46964.rs
rename to src/test/ui/issues/issue-46964.rs
index ad4d6e3ac1a64..61c5a1a56cedf 100644
--- a/src/test/run-pass/issues/issue-46964.rs
+++ b/src/test/ui/issues/issue-46964.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 mod my_mod {
     #[derive(Clone, Copy, Eq, PartialEq, PartialOrd, Ord, Hash)]
     pub struct Name<'a> {
diff --git a/src/test/run-pass/issues/issue-47673.rs b/src/test/ui/issues/issue-47673.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-47673.rs
rename to src/test/ui/issues/issue-47673.rs
index 1e733a0c4d6f9..7cef527acd795 100644
--- a/src/test/run-pass/issues/issue-47673.rs
+++ b/src/test/ui/issues/issue-47673.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(unused_imports)]
 
 use {{}, {}};
diff --git a/src/test/run-pass/issues/issue-47703-1.rs b/src/test/ui/issues/issue-47703-1.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-47703-1.rs
rename to src/test/ui/issues/issue-47703-1.rs
index 7cf34d3cd428e..446ca27a53e7c 100644
--- a/src/test/run-pass/issues/issue-47703-1.rs
+++ b/src/test/ui/issues/issue-47703-1.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![feature(nll)]
 
diff --git a/src/test/run-pass/issues/issue-47703-tuple.rs b/src/test/ui/issues/issue-47703-tuple.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-47703-tuple.rs
rename to src/test/ui/issues/issue-47703-tuple.rs
index ee9d7f38dbea6..c2b4673a09fb5 100644
--- a/src/test/run-pass/issues/issue-47703-tuple.rs
+++ b/src/test/ui/issues/issue-47703-tuple.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![feature(nll)]
 
diff --git a/src/test/run-pass/issues/issue-47703.rs b/src/test/ui/issues/issue-47703.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-47703.rs
rename to src/test/ui/issues/issue-47703.rs
index 17353c8e59f7c..084eab05d68e2 100644
--- a/src/test/run-pass/issues/issue-47703.rs
+++ b/src/test/ui/issues/issue-47703.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![feature(nll)]
 
diff --git a/src/test/run-pass/issues/issue-47722.rs b/src/test/ui/issues/issue-47722.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-47722.rs
rename to src/test/ui/issues/issue-47722.rs
index a8e0faeed0601..39fbe33d823f4 100644
--- a/src/test/run-pass/issues/issue-47722.rs
+++ b/src/test/ui/issues/issue-47722.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 
 // Tests that automatic coercions from &mut T to *mut T
diff --git a/src/test/run-pass/issues/issue-47789.rs b/src/test/ui/issues/issue-47789.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-47789.rs
rename to src/test/ui/issues/issue-47789.rs
index 349aa4f73abc4..57957aed3db7e 100644
--- a/src/test/run-pass/issues/issue-47789.rs
+++ b/src/test/ui/issues/issue-47789.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_upper_case_globals)]
 
diff --git a/src/test/run-pass/issues/issue-48551.rs b/src/test/ui/issues/issue-48551.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-48551.rs
rename to src/test/ui/issues/issue-48551.rs
index b4059d1fd7519..2da1059d74a1d 100644
--- a/src/test/run-pass/issues/issue-48551.rs
+++ b/src/test/ui/issues/issue-48551.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // Regression test for #48551. Covers a case where duplicate candidates
 // arose during associated type projection.
 
diff --git a/src/test/run-pass/issues/issue-51655.rs b/src/test/ui/issues/issue-51655.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-51655.rs
rename to src/test/ui/issues/issue-51655.rs
index 17c04a4097a8d..d8c69fd3d55b7 100644
--- a/src/test/run-pass/issues/issue-51655.rs
+++ b/src/test/ui/issues/issue-51655.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 
 const PATH_DOT: &[u8] = &[b'.'];
diff --git a/src/test/run-pass/issues/issue-6991.rs b/src/test/ui/issues/issue-6991.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-6991.rs
rename to src/test/ui/issues/issue-6991.rs
index 3d1108e84ad24..1de1f8b1a865e 100644
--- a/src/test/run-pass/issues/issue-6991.rs
+++ b/src/test/ui/issues/issue-6991.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_upper_case_globals)]
 
diff --git a/src/test/run-pass/issues/issue-7268.rs b/src/test/ui/issues/issue-7268.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-7268.rs
rename to src/test/ui/issues/issue-7268.rs
index 961f90dfc377d..b4d0255fa10bf 100644
--- a/src/test/run-pass/issues/issue-7268.rs
+++ b/src/test/ui/issues/issue-7268.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-8521.rs b/src/test/ui/issues/issue-8521.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-8521.rs
rename to src/test/ui/issues/issue-8521.rs
index b70a79bed3cae..724ac962f3b33 100644
--- a/src/test/run-pass/issues/issue-8521.rs
+++ b/src/test/ui/issues/issue-8521.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 trait Foo1 {}
 
 trait A {}
diff --git a/src/test/run-pass/issues/issue-9243.rs b/src/test/ui/issues/issue-9243.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-9243.rs
rename to src/test/ui/issues/issue-9243.rs
index f079268d6e10b..3f5721a3df7a0 100644
--- a/src/test/run-pass/issues/issue-9243.rs
+++ b/src/test/ui/issues/issue-9243.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // Regression test for issue 9243
 #![allow(non_upper_case_globals)]
diff --git a/src/test/run-pass/issues/issue-9249.rs b/src/test/ui/issues/issue-9249.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-9249.rs
rename to src/test/ui/issues/issue-9249.rs
index eb66c565a78c2..3013fde84dcc0 100644
--- a/src/test/run-pass/issues/issue-9249.rs
+++ b/src/test/ui/issues/issue-9249.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 

From 454b14a511d4a7aadb68152c78c06e1e893a0fb7 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Tue, 2 Oct 2018 13:14:19 +0200
Subject: [PATCH 2/2] move some more tests

---
 src/test/{run-pass => ui}/issues/issue-10853.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-1251.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-14901.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-14936.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-1821.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-1866.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-18988.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-22777.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-2311-2.rs                | 2 +-
 src/test/{run-pass => ui}/issues/issue-2311.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-2312.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-24161.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-2487-a.rs                | 2 +-
 src/test/{run-pass => ui}/issues/issue-2502.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-2611-3.rs                | 2 +-
 src/test/{run-pass => ui}/issues/issue-2748-a.rs                | 2 +-
 src/test/{run-pass => ui}/issues/issue-2804-2.rs                | 2 +-
 src/test/{run-pass => ui}/issues/issue-2904.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-3149.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-3424.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-3563-2.rs                | 2 +-
 src/test/{run-pass => ui}/issues/issue-3609.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-37733.rs                 | 2 +-
 src/test/{run-pass => ui}/issues/issue-3874.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-3888-2.rs                | 2 +-
 src/test/{run-pass => ui}/issues/issue-3979-2.rs                | 2 +-
 src/test/{run-pass => ui}/issues/issue-3991.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-4025.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-4464.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-4830.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-5353.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-5572.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-5754.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-5884.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-5900.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-5950.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-6341.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-6470.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-6557.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-6898.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-7607-2.rs                | 2 +-
 .../issues/issue-7673-cast-generically-implemented-trait.rs     | 2 +-
 .../issue-8171-default-method-self-inherit-builtin-trait.rs     | 2 +-
 src/test/{run-pass => ui}/issues/issue-8398.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-8578.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-9110.rs                  | 2 +-
 src/test/{run-pass => ui}/issues/issue-9719.rs                  | 2 +-
 47 files changed, 47 insertions(+), 47 deletions(-)
 rename src/test/{run-pass => ui}/issues/issue-10853.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-1251.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-14901.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-14936.rs (99%)
 rename src/test/{run-pass => ui}/issues/issue-1821.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-1866.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-18988.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-22777.rs (99%)
 rename src/test/{run-pass => ui}/issues/issue-2311-2.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-2311.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-2312.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-24161.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-2487-a.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-2502.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-2611-3.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-2748-a.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-2804-2.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-2904.rs (99%)
 rename src/test/{run-pass => ui}/issues/issue-3149.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-3424.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-3563-2.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-3609.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-37733.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-3874.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-3888-2.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-3979-2.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-3991.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-4025.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-4464.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-4830.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-5353.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-5572.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-5754.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-5884.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-5900.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-5950.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-6341.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-6470.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-6557.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-6898.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-7607-2.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-7673-cast-generically-implemented-trait.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-8171-default-method-self-inherit-builtin-trait.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-8398.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-8578.rs (98%)
 rename src/test/{run-pass => ui}/issues/issue-9110.rs (97%)
 rename src/test/{run-pass => ui}/issues/issue-9719.rs (98%)

diff --git a/src/test/run-pass/issues/issue-10853.rs b/src/test/ui/issues/issue-10853.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-10853.rs
rename to src/test/ui/issues/issue-10853.rs
index 4a67d256f5de5..6e2aea4d1ab42 100644
--- a/src/test/run-pass/issues/issue-10853.rs
+++ b/src/test/ui/issues/issue-10853.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 #![deny(missing_docs)]
diff --git a/src/test/run-pass/issues/issue-1251.rs b/src/test/ui/issues/issue-1251.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-1251.rs
rename to src/test/ui/issues/issue-1251.rs
index f9d48b8c835a5..b42404ce7739b 100644
--- a/src/test/run-pass/issues/issue-1251.rs
+++ b/src/test/ui/issues/issue-1251.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(unused_attributes)]
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/issues/issue-14901.rs b/src/test/ui/issues/issue-14901.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-14901.rs
rename to src/test/ui/issues/issue-14901.rs
index 7612c5bc8557a..18a6cfde3bdf1 100644
--- a/src/test/run-pass/issues/issue-14901.rs
+++ b/src/test/ui/issues/issue-14901.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 pub trait Reader {}
 
 enum Wrapper<'a> {
diff --git a/src/test/run-pass/issues/issue-14936.rs b/src/test/ui/issues/issue-14936.rs
similarity index 99%
rename from src/test/run-pass/issues/issue-14936.rs
rename to src/test/ui/issues/issue-14936.rs
index 4249a83e3c22e..d90814daf5f28 100644
--- a/src/test/run-pass/issues/issue-14936.rs
+++ b/src/test/ui/issues/issue-14936.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(unused_macros)]
 #![allow(dead_code)]
 #![feature(asm)]
diff --git a/src/test/run-pass/issues/issue-1821.rs b/src/test/ui/issues/issue-1821.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-1821.rs
rename to src/test/ui/issues/issue-1821.rs
index d37b6df6e34a8..8518547ac2559 100644
--- a/src/test/run-pass/issues/issue-1821.rs
+++ b/src/test/ui/issues/issue-1821.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/src/test/run-pass/issues/issue-1866.rs b/src/test/ui/issues/issue-1866.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-1866.rs
rename to src/test/ui/issues/issue-1866.rs
index f27d8032dd660..eb670b4a5828a 100644
--- a/src/test/run-pass/issues/issue-1866.rs
+++ b/src/test/ui/issues/issue-1866.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/src/test/run-pass/issues/issue-18988.rs b/src/test/ui/issues/issue-18988.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-18988.rs
rename to src/test/ui/issues/issue-18988.rs
index 691d41174303f..6aadef691387f 100644
--- a/src/test/run-pass/issues/issue-18988.rs
+++ b/src/test/ui/issues/issue-18988.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 pub trait Foo : Send { }
 
diff --git a/src/test/run-pass/issues/issue-22777.rs b/src/test/ui/issues/issue-22777.rs
similarity index 99%
rename from src/test/run-pass/issues/issue-22777.rs
rename to src/test/ui/issues/issue-22777.rs
index 92ad7a43d4d17..c97c10073e397 100644
--- a/src/test/run-pass/issues/issue-22777.rs
+++ b/src/test/ui/issues/issue-22777.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // This test is reduced from libsyntax.  It is just checking that we
 // can successfully deal with a "deep" structure, which the drop-check
 // was hitting a recursion limit on at one point.
diff --git a/src/test/run-pass/issues/issue-2311-2.rs b/src/test/ui/issues/issue-2311-2.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-2311-2.rs
rename to src/test/ui/issues/issue-2311-2.rs
index 493ff6f01cbe7..cc6376eb66895 100644
--- a/src/test/run-pass/issues/issue-2311-2.rs
+++ b/src/test/ui/issues/issue-2311-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/src/test/run-pass/issues/issue-2311.rs b/src/test/ui/issues/issue-2311.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-2311.rs
rename to src/test/ui/issues/issue-2311.rs
index 816754c4617e9..77e014e278598 100644
--- a/src/test/run-pass/issues/issue-2311.rs
+++ b/src/test/ui/issues/issue-2311.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(non_camel_case_types)]
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/issues/issue-2312.rs b/src/test/ui/issues/issue-2312.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-2312.rs
rename to src/test/ui/issues/issue-2312.rs
index 9975f8a5aa725..0de460a30ab40 100644
--- a/src/test/run-pass/issues/issue-2312.rs
+++ b/src/test/ui/issues/issue-2312.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/src/test/run-pass/issues/issue-24161.rs b/src/test/ui/issues/issue-24161.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-24161.rs
rename to src/test/ui/issues/issue-24161.rs
index 8bb88be7c5625..fb50f4dc8db0f 100644
--- a/src/test/run-pass/issues/issue-24161.rs
+++ b/src/test/ui/issues/issue-24161.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #[derive(Copy,Clone)]
 struct Functions {
diff --git a/src/test/run-pass/issues/issue-2487-a.rs b/src/test/ui/issues/issue-2487-a.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-2487-a.rs
rename to src/test/ui/issues/issue-2487-a.rs
index 6bd1757f64cea..bff4eb92806d0 100644
--- a/src/test/run-pass/issues/issue-2487-a.rs
+++ b/src/test/ui/issues/issue-2487-a.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/src/test/run-pass/issues/issue-2502.rs b/src/test/ui/issues/issue-2502.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-2502.rs
rename to src/test/ui/issues/issue-2502.rs
index 938a8e290444b..24ba19c4b7f2a 100644
--- a/src/test/run-pass/issues/issue-2502.rs
+++ b/src/test/ui/issues/issue-2502.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/src/test/run-pass/issues/issue-2611-3.rs b/src/test/ui/issues/issue-2611-3.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-2611-3.rs
rename to src/test/ui/issues/issue-2611-3.rs
index 99fd1a727f55c..29a8200104ac0 100644
--- a/src/test/run-pass/issues/issue-2611-3.rs
+++ b/src/test/ui/issues/issue-2611-3.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // Tests that impls are allowed to have looser, more permissive bounds
 // than the traits require.
diff --git a/src/test/run-pass/issues/issue-2748-a.rs b/src/test/ui/issues/issue-2748-a.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-2748-a.rs
rename to src/test/ui/issues/issue-2748-a.rs
index db7b46a4dc5af..8c8d3c557fc7d 100644
--- a/src/test/run-pass/issues/issue-2748-a.rs
+++ b/src/test/ui/issues/issue-2748-a.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_snake_case)]
 
diff --git a/src/test/run-pass/issues/issue-2804-2.rs b/src/test/ui/issues/issue-2804-2.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-2804-2.rs
rename to src/test/ui/issues/issue-2804-2.rs
index 3e64d78ba0274..1894d50ed9921 100644
--- a/src/test/run-pass/issues/issue-2804-2.rs
+++ b/src/test/ui/issues/issue-2804-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // Minimized version of issue-2804.rs. Both check that callee IDs don't
 // clobber the previous node ID in a macro expr
diff --git a/src/test/run-pass/issues/issue-2904.rs b/src/test/ui/issues/issue-2904.rs
similarity index 99%
rename from src/test/run-pass/issues/issue-2904.rs
rename to src/test/ui/issues/issue-2904.rs
index ab40c2e0bbec5..2e91979a517d0 100644
--- a/src/test/run-pass/issues/issue-2904.rs
+++ b/src/test/ui/issues/issue-2904.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(unused_must_use)]
 #![allow(dead_code)]
 #![allow(unused_mut)]
diff --git a/src/test/run-pass/issues/issue-3149.rs b/src/test/ui/issues/issue-3149.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-3149.rs
rename to src/test/ui/issues/issue-3149.rs
index 4eb3378a089ee..507af2f6c2a46 100644
--- a/src/test/run-pass/issues/issue-3149.rs
+++ b/src/test/ui/issues/issue-3149.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_snake_case)]
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/issues/issue-3424.rs b/src/test/ui/issues/issue-3424.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-3424.rs
rename to src/test/ui/issues/issue-3424.rs
index cf1b002266172..7bf0c4393c302 100644
--- a/src/test/run-pass/issues/issue-3424.rs
+++ b/src/test/ui/issues/issue-3424.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 // rustc --test ignores2.rs && ./ignores2
diff --git a/src/test/run-pass/issues/issue-3563-2.rs b/src/test/ui/issues/issue-3563-2.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-3563-2.rs
rename to src/test/ui/issues/issue-3563-2.rs
index 534bec59018e6..916adc83223ac 100644
--- a/src/test/run-pass/issues/issue-3563-2.rs
+++ b/src/test/ui/issues/issue-3563-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 trait Canvas {
diff --git a/src/test/run-pass/issues/issue-3609.rs b/src/test/ui/issues/issue-3609.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-3609.rs
rename to src/test/ui/issues/issue-3609.rs
index abbaf630e78e0..070b2e538d7ba 100644
--- a/src/test/run-pass/issues/issue-3609.rs
+++ b/src/test/ui/issues/issue-3609.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(unused_must_use)]
 #![allow(dead_code)]
 #![allow(unused_mut)]
diff --git a/src/test/run-pass/issues/issue-37733.rs b/src/test/ui/issues/issue-37733.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-37733.rs
rename to src/test/ui/issues/issue-37733.rs
index a982cae262120..04a4c19785b50 100644
--- a/src/test/run-pass/issues/issue-37733.rs
+++ b/src/test/ui/issues/issue-37733.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 type A = for<> fn();
 
diff --git a/src/test/run-pass/issues/issue-3874.rs b/src/test/ui/issues/issue-3874.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-3874.rs
rename to src/test/ui/issues/issue-3874.rs
index 2b1e25d2a1a7a..791a4bb8af0af 100644
--- a/src/test/run-pass/issues/issue-3874.rs
+++ b/src/test/ui/issues/issue-3874.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-3888-2.rs b/src/test/ui/issues/issue-3888-2.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-3888-2.rs
rename to src/test/ui/issues/issue-3888-2.rs
index 2d702dac0285a..79b206799ad24 100644
--- a/src/test/run-pass/issues/issue-3888-2.rs
+++ b/src/test/ui/issues/issue-3888-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-3979-2.rs b/src/test/ui/issues/issue-3979-2.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-3979-2.rs
rename to src/test/ui/issues/issue-3979-2.rs
index 9b8e5817c6c15..adfd5873ea77b 100644
--- a/src/test/run-pass/issues/issue-3979-2.rs
+++ b/src/test/ui/issues/issue-3979-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 trait A {
diff --git a/src/test/run-pass/issues/issue-3991.rs b/src/test/ui/issues/issue-3991.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-3991.rs
rename to src/test/ui/issues/issue-3991.rs
index 9028066cfacd5..90fa1f8c3e09e 100644
--- a/src/test/run-pass/issues/issue-3991.rs
+++ b/src/test/ui/issues/issue-3991.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/issues/issue-4025.rs b/src/test/ui/issues/issue-4025.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-4025.rs
rename to src/test/ui/issues/issue-4025.rs
index 41af0826c00aa..470dd1e430f9c 100644
--- a/src/test/run-pass/issues/issue-4025.rs
+++ b/src/test/ui/issues/issue-4025.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(unused_mut)]
 /*
diff --git a/src/test/run-pass/issues/issue-4464.rs b/src/test/ui/issues/issue-4464.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-4464.rs
rename to src/test/ui/issues/issue-4464.rs
index fda063e8ddd27..a1b2040450ad9 100644
--- a/src/test/run-pass/issues/issue-4464.rs
+++ b/src/test/ui/issues/issue-4464.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-4830.rs b/src/test/ui/issues/issue-4830.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-4830.rs
rename to src/test/ui/issues/issue-4830.rs
index 5140162ae4353..274305dfa78ed 100644
--- a/src/test/run-pass/issues/issue-4830.rs
+++ b/src/test/ui/issues/issue-4830.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/issues/issue-5353.rs b/src/test/ui/issues/issue-5353.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-5353.rs
rename to src/test/ui/issues/issue-5353.rs
index d9d0783133165..0c5de871f098c 100644
--- a/src/test/run-pass/issues/issue-5353.rs
+++ b/src/test/ui/issues/issue-5353.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-5572.rs b/src/test/ui/issues/issue-5572.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-5572.rs
rename to src/test/ui/issues/issue-5572.rs
index 02f12a0303a59..90465668d8100 100644
--- a/src/test/run-pass/issues/issue-5572.rs
+++ b/src/test/ui/issues/issue-5572.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-5754.rs b/src/test/ui/issues/issue-5754.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-5754.rs
rename to src/test/ui/issues/issue-5754.rs
index 9b9026304598e..d60edcad0db66 100644
--- a/src/test/run-pass/issues/issue-5754.rs
+++ b/src/test/ui/issues/issue-5754.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(improper_ctypes)]
 
diff --git a/src/test/run-pass/issues/issue-5884.rs b/src/test/ui/issues/issue-5884.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-5884.rs
rename to src/test/ui/issues/issue-5884.rs
index 82d87d9d270a1..d0c898e3f36b8 100644
--- a/src/test/run-pass/issues/issue-5884.rs
+++ b/src/test/ui/issues/issue-5884.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-5900.rs b/src/test/ui/issues/issue-5900.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-5900.rs
rename to src/test/ui/issues/issue-5900.rs
index edb4ead53e42f..4dc5a61238832 100644
--- a/src/test/run-pass/issues/issue-5900.rs
+++ b/src/test/ui/issues/issue-5900.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-5950.rs b/src/test/ui/issues/issue-5950.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-5950.rs
rename to src/test/ui/issues/issue-5950.rs
index 239f968041392..6cdd36efaa719 100644
--- a/src/test/run-pass/issues/issue-5950.rs
+++ b/src/test/ui/issues/issue-5950.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-6341.rs b/src/test/ui/issues/issue-6341.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-6341.rs
rename to src/test/ui/issues/issue-6341.rs
index ca79e304b15fc..758e33536bd3e 100644
--- a/src/test/run-pass/issues/issue-6341.rs
+++ b/src/test/ui/issues/issue-6341.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 #[derive(PartialEq)]
diff --git a/src/test/run-pass/issues/issue-6470.rs b/src/test/ui/issues/issue-6470.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-6470.rs
rename to src/test/ui/issues/issue-6470.rs
index a23a6532b1550..00eb3b6348d35 100644
--- a/src/test/run-pass/issues/issue-6470.rs
+++ b/src/test/ui/issues/issue-6470.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(improper_ctypes)]
 
diff --git a/src/test/run-pass/issues/issue-6557.rs b/src/test/ui/issues/issue-6557.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-6557.rs
rename to src/test/ui/issues/issue-6557.rs
index 886d13c4c6f12..ddec8b3f93456 100644
--- a/src/test/run-pass/issues/issue-6557.rs
+++ b/src/test/ui/issues/issue-6557.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-6898.rs b/src/test/ui/issues/issue-6898.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-6898.rs
rename to src/test/ui/issues/issue-6898.rs
index b9a3a24585b5c..20174f241a409 100644
--- a/src/test/run-pass/issues/issue-6898.rs
+++ b/src/test/ui/issues/issue-6898.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 use std::mem;
diff --git a/src/test/run-pass/issues/issue-7607-2.rs b/src/test/ui/issues/issue-7607-2.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-7607-2.rs
rename to src/test/ui/issues/issue-7607-2.rs
index fa97eae7cb33e..9c05717c1d712 100644
--- a/src/test/run-pass/issues/issue-7607-2.rs
+++ b/src/test/ui/issues/issue-7607-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-7673-cast-generically-implemented-trait.rs b/src/test/ui/issues/issue-7673-cast-generically-implemented-trait.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-7673-cast-generically-implemented-trait.rs
rename to src/test/ui/issues/issue-7673-cast-generically-implemented-trait.rs
index 6e5a6c551ebfe..d3af62e8836c6 100644
--- a/src/test/run-pass/issues/issue-7673-cast-generically-implemented-trait.rs
+++ b/src/test/ui/issues/issue-7673-cast-generically-implemented-trait.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-8171-default-method-self-inherit-builtin-trait.rs b/src/test/ui/issues/issue-8171-default-method-self-inherit-builtin-trait.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-8171-default-method-self-inherit-builtin-trait.rs
rename to src/test/ui/issues/issue-8171-default-method-self-inherit-builtin-trait.rs
index 9ddc63a208aed..27859e1a2aefd 100644
--- a/src/test/run-pass/issues/issue-8171-default-method-self-inherit-builtin-trait.rs
+++ b/src/test/ui/issues/issue-8171-default-method-self-inherit-builtin-trait.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-8398.rs b/src/test/ui/issues/issue-8398.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-8398.rs
rename to src/test/ui/issues/issue-8398.rs
index 2458e91daeb87..36c24be5fce31 100644
--- a/src/test/run-pass/issues/issue-8398.rs
+++ b/src/test/ui/issues/issue-8398.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-8578.rs b/src/test/ui/issues/issue-8578.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-8578.rs
rename to src/test/ui/issues/issue-8578.rs
index 4cf39e3e5f055..0c5cbf24700af 100644
--- a/src/test/run-pass/issues/issue-8578.rs
+++ b/src/test/ui/issues/issue-8578.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 #![allow(non_upper_case_globals)]
diff --git a/src/test/run-pass/issues/issue-9110.rs b/src/test/ui/issues/issue-9110.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-9110.rs
rename to src/test/ui/issues/issue-9110.rs
index 150df681ea4d7..86314659fcbe9 100644
--- a/src/test/run-pass/issues/issue-9110.rs
+++ b/src/test/ui/issues/issue-9110.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 #![allow(non_snake_case)]
diff --git a/src/test/run-pass/issues/issue-9719.rs b/src/test/ui/issues/issue-9719.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-9719.rs
rename to src/test/ui/issues/issue-9719.rs
index f98eba1cfdf8e..c3845dd61066c 100644
--- a/src/test/run-pass/issues/issue-9719.rs
+++ b/src/test/ui/issues/issue-9719.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616