rust-lang
diff --git a/‎tests/ui/README.md‎
Lines changed: 0 additions & 6 deletions b/‎tests/ui/README.md‎
Lines changed: 0 additions & 6 deletions
diff --git a/‎tests/ui/meta/no_std-extern-libc.rs‎ ‎tests/ui/bootstrap/no_std-extern-libc.rs‎tests/ui/meta/no_std-extern-libc.rs renamed to tests/ui/bootstrap/no_std-extern-libc.rs b/‎tests/ui/meta/no_std-extern-libc.rs‎ ‎tests/ui/bootstrap/no_std-extern-libc.rs‎tests/ui/meta/no_std-extern-libc.rs renamed to tests/ui/bootstrap/no_std-extern-libc.rs
diff --git a/‎tests/ui/meta/auxiliary/env.rs‎ ‎…i/compiletest-self-test/auxiliary/env.rs‎tests/ui/meta/auxiliary/env.rs renamed to tests/ui/compiletest-self-test/auxiliary/env.rs b/‎tests/ui/meta/auxiliary/env.rs‎ ‎…i/compiletest-self-test/auxiliary/env.rs‎tests/ui/meta/auxiliary/env.rs renamed to tests/ui/compiletest-self-test/auxiliary/env.rs
diff --git a/‎tests/ui/meta/dir.with.dots/test.rs‎ ‎…piletest-self-test/dir.with.dots/test.rs‎tests/ui/meta/dir.with.dots/test.rs renamed to tests/ui/compiletest-self-test/dir.with.dots/test.rs b/‎tests/ui/meta/dir.with.dots/test.rs‎ ‎…piletest-self-test/dir.with.dots/test.rs‎tests/ui/meta/dir.with.dots/test.rs renamed to tests/ui/compiletest-self-test/dir.with.dots/test.rs
diff --git a/‎…meta/expected-error-correct-rev.a.stderr‎ ‎…test/expected-error-correct-rev.a.stderr‎tests/ui/meta/expected-error-correct-rev.a.stderr renamed to tests/ui/compiletest-self-test/expected-error-correct-rev.a.stderr b/‎…meta/expected-error-correct-rev.a.stderr‎ ‎…test/expected-error-correct-rev.a.stderr‎tests/ui/meta/expected-error-correct-rev.a.stderr renamed to tests/ui/compiletest-self-test/expected-error-correct-rev.a.stderr
diff --git a/‎…ts/ui/meta/expected-error-correct-rev.rs‎ ‎…-self-test/expected-error-correct-rev.rs‎tests/ui/meta/expected-error-correct-rev.rs renamed to tests/ui/compiletest-self-test/expected-error-correct-rev.rs b/‎…ts/ui/meta/expected-error-correct-rev.rs‎ ‎…-self-test/expected-error-correct-rev.rs‎tests/ui/meta/expected-error-correct-rev.rs renamed to tests/ui/compiletest-self-test/expected-error-correct-rev.rs
diff --git a/‎…a/meta-expected-error-wrong-rev.a.stderr‎ ‎…t/meta-expected-error-wrong-rev.a.stderr‎tests/ui/meta/meta-expected-error-wrong-rev.a.stderr renamed to tests/ui/compiletest-self-test/meta-expected-error-wrong-rev.a.stderr b/‎…a/meta-expected-error-wrong-rev.a.stderr‎ ‎…t/meta-expected-error-wrong-rev.a.stderr‎tests/ui/meta/meta-expected-error-wrong-rev.a.stderr renamed to tests/ui/compiletest-self-test/meta-expected-error-wrong-rev.a.stderr
diff --git a/‎…ui/meta/meta-expected-error-wrong-rev.rs‎ ‎…lf-test/meta-expected-error-wrong-rev.rs‎tests/ui/meta/meta-expected-error-wrong-rev.rs renamed to tests/ui/compiletest-self-test/meta-expected-error-wrong-rev.rs b/‎…ui/meta/meta-expected-error-wrong-rev.rs‎ ‎…lf-test/meta-expected-error-wrong-rev.rs‎tests/ui/meta/meta-expected-error-wrong-rev.rs renamed to tests/ui/compiletest-self-test/meta-expected-error-wrong-rev.rs
diff --git a/‎tests/ui/meta/revision-bad.rs‎ ‎…ui/compiletest-self-test/revision-bad.rs‎tests/ui/meta/revision-bad.rs renamed to tests/ui/compiletest-self-test/revision-bad.rs b/‎tests/ui/meta/revision-bad.rs‎ ‎…ui/compiletest-self-test/revision-bad.rs‎tests/ui/meta/revision-bad.rs renamed to tests/ui/compiletest-self-test/revision-bad.rs
diff --git a/‎tests/ui/meta/revision-ok.rs‎ ‎…/ui/compiletest-self-test/revision-ok.rs‎tests/ui/meta/revision-ok.rs renamed to tests/ui/compiletest-self-test/revision-ok.rs b/‎tests/ui/meta/revision-ok.rs‎ ‎…/ui/compiletest-self-test/revision-ok.rs‎tests/ui/meta/revision-ok.rs renamed to tests/ui/compiletest-self-test/revision-ok.rs
@@ -909,12 +909,6 @@ See [Tracking issue for allowing overlapping implementations for marker trait #2
 
 Broad category of tests on `match` constructs.
 
-## `tests/ui/meta/`: Tests for compiletest itself
-
-These tests check the function of the UI test suite at large and Compiletest in itself.
-
-**FIXME**: This should absolutely be merged with `tests/ui/compiletest-self-test/`.
-
 ## `tests/ui/methods/`
 
 A broad category for anything related to methods and method resolution.