[ClangTidy] Separate tests for infrastructure and checkers

Summary:
This change moves tests for checkers and infrastructure into separate
directories, making it easier to find infrastructure tests. Tests for
checkers are already easy to find because they are named after the
checker. Tests for infrastructure were difficult to find because they
were outnumbered by tests for checkers. Now they are in a separate
directory.

Reviewers: jfb, jdoerfert, lebedev.ri

Subscribers: srhines, nemanjai, aheejin, kbarton, christof, mgrang, arphaman, jfb, lebedev.ri, cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D68807

llvm-svn: 374540

564 files changed, 0 insertions, 0 deletions

diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/a.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/a.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/Headers/a.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/a.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/b.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/b.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/Headers/b.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/b.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/clang-c/c.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/clang-c/c.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/Headers/clang-c/c.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/clang-c/c.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/clang/b.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/clang/b.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/Headers/clang/b.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/clang/b.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/cross-file-a.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/cross-file-a.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/Headers/cross-file-a.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/cross-file-a.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/cross-file-b.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/cross-file-b.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/Headers/cross-file-b.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/cross-file-b.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/cross-file-c.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/cross-file-c.h
index 342dd340099..342dd340099 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/Headers/cross-file-c.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/cross-file-c.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/gtest/foo.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/gtest/foo.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/Headers/gtest/foo.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/gtest/foo.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/i.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/i.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/Headers/i.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/i.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/j.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/j.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/Headers/j.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/j.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/llvm-c/d.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/llvm-c/d.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/Headers/llvm-c/d.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/llvm-c/d.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/llvm/a.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/llvm/a.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/Headers/llvm/a.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/llvm/a.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/s.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/s.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/Headers/s.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/s.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/system-header-simulation.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/system-header-simulation.h
index 0df5305e5af..0df5305e5af 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/Headers/system-header-simulation.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/system-header-simulation.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/absl/external-file.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/external-file.h
index 11e2e4aa96c..11e2e4aa96c 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/absl/external-file.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/external-file.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/absl/flags/internal-file.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/flags/internal-file.h
index c81cf9eee62..c81cf9eee62 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/absl/flags/internal-file.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/flags/internal-file.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/absl/strings/internal-file.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/strings/internal-file.h
index 6014278e260..6014278e260 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/absl/strings/internal-file.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/strings/internal-file.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/absl/time/time.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/time/time.h
index 5454f97836d..5454f97836d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/absl/time/time.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/time/time.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/a.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/a.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/a.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/a.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/cstdarg.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/cstdarg.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/cstdarg.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/cstdarg.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/cstdlib.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/cstdlib.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/cstdlib.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/cstdlib.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/j.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/j.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/j.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/j.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/r.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/r.h
index 56757a701bf..56757a701bf 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/r.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/r.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/s.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/s.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/s.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/s.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/t.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/t.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/t.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/t.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/transitive.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/transitive.h
index 6dba769fb47..6dba769fb47 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/system/transitive.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/system/transitive.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/transitive2.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/transitive2.h
index ea567885f34..ea567885f34 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/fuchsia-restrict-system-includes/transitive2.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/fuchsia-restrict-system-includes/transitive2.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/google-namespaces.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/google-namespaces.h
index f4d87f5bc95..f4d87f5bc95 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/google-namespaces.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/google-namespaces.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/gtest/gtest-typed-test.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/gtest-typed-test.h
index 3222da24c61..3222da24c61 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/gtest/gtest-typed-test.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/gtest-typed-test.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/gtest/gtest.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/gtest.h
index 1b4f58f2038..1b4f58f2038 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/gtest/gtest.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/gtest.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/gtest/nosuite/gtest/gtest-typed-test.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/nosuite/gtest/gtest-typed-test.h
index 3f0a89b05e0..3f0a89b05e0 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/gtest/nosuite/gtest/gtest-typed-test.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/nosuite/gtest/gtest-typed-test.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/gtest/nosuite/gtest/gtest.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/nosuite/gtest/gtest.h
index 8880df86360..8880df86360 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/gtest/nosuite/gtest/gtest.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/nosuite/gtest/gtest.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/assert.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/assert.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/assert.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/assert.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/complex.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/complex.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/complex.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/complex.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/ctype.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/ctype.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/ctype.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/ctype.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/errno.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/errno.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/errno.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/errno.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/fenv.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/fenv.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/fenv.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/fenv.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/float.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/float.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/float.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/float.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/inttypes.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/inttypes.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/inttypes.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/inttypes.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/iso646.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/iso646.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/iso646.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/iso646.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/limits.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/limits.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/limits.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/limits.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/locale.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/locale.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/locale.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/locale.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/math.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/math.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/math.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/math.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/setjmp.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/setjmp.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/setjmp.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/setjmp.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/signal.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/signal.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/signal.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/signal.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stdalign.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdalign.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stdalign.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdalign.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stdarg.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdarg.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stdarg.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdarg.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stdbool.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdbool.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stdbool.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdbool.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stddef.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stddef.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stddef.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stddef.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stdint.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdint.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stdint.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdint.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stdio.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdio.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stdio.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdio.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stdlib.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdlib.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/stdlib.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdlib.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/string.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/string.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/string.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/string.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/tgmath.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/tgmath.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/tgmath.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/tgmath.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/time.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/time.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/time.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/time.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/uchar.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/uchar.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/uchar.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/uchar.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/wchar.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/wchar.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/wchar.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/wchar.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/wctype.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/wctype.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-deprecated-headers/wctype.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/wctype.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-loop-convert/structures.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-loop-convert/structures.h
index 02d440c21a5..02d440c21a5 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-loop-convert/structures.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-loop-convert/structures.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-pass-by-value/header-with-fix.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-pass-by-value/header-with-fix.h
index 62609e25f68..62609e25f68 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-pass-by-value/header-with-fix.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-pass-by-value/header-with-fix.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-pass-by-value/header.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-pass-by-value/header.h
index c2103cb3fc7..c2103cb3fc7 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-pass-by-value/header.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-pass-by-value/header.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-replace-auto-ptr/memory.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-replace-auto-ptr/memory.h
index bc476ced927..bc476ced927 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-replace-auto-ptr/memory.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-replace-auto-ptr/memory.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-smart-ptr/initializer_list.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-smart-ptr/initializer_list.h
index 28592cf8f70..28592cf8f70 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-smart-ptr/initializer_list.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-smart-ptr/initializer_list.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-smart-ptr/shared_ptr.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-smart-ptr/shared_ptr.h
index 0f4f2a97095..0f4f2a97095 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-smart-ptr/shared_ptr.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-smart-ptr/shared_ptr.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-smart-ptr/unique_ptr.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-smart-ptr/unique_ptr.h
index 5dc9e02b637..5dc9e02b637 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-smart-ptr/unique_ptr.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-smart-ptr/unique_ptr.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/modernize-use-auto/containers.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-use-auto/containers.h
index c99b7a4407d..c99b7a4407d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/modernize-use-auto/containers.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-use-auto/containers.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/mpi-type-mismatch/mpimock.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/mpi-type-mismatch/mpimock.h
index cb90028d08f..cb90028d08f 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/mpi-type-mismatch/mpimock.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/mpi-type-mismatch/mpimock.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/performance-unnecessary-value-param/header-fixed.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/performance-unnecessary-value-param/header-fixed.h
index f3e9e7241d2..f3e9e7241d2 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/performance-unnecessary-value-param/header-fixed.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/performance-unnecessary-value-param/header-fixed.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/performance-unnecessary-value-param/header.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/performance-unnecessary-value-param/header.h
index 3f55c79a268..3f55c79a268 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/performance-unnecessary-value-param/header.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/performance-unnecessary-value-param/header.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/readability-identifier-naming/system/system-header.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/system/system-header.h
index 8a394a9b3e3..8a394a9b3e3 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/readability-identifier-naming/system/system-header.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/system/system-header.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/readability-identifier-naming/user-header.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/user-header.h
index f03982ce73b..f03982ce73b 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/readability-identifier-naming/user-header.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/user-header.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/unused-using-decls.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/unused-using-decls.h
index 8245cb19feb..8245cb19feb 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/unused-using-decls.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/Inputs/unused-using-decls.h
diff --git a/clang-tools-extra/test/clang-tidy/abseil-duration-addition.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-addition.cpp
index 33cfc58fef3..33cfc58fef3 100644
--- a/clang-tools-extra/test/clang-tidy/abseil-duration-addition.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-addition.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-duration-comparison.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-comparison.cpp
index 9fa422bec05..9fa422bec05 100644
--- a/clang-tools-extra/test/clang-tidy/abseil-duration-comparison.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-comparison.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-duration-conversion-cast.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-conversion-cast.cpp
index 0c2a9d791f1..0c2a9d791f1 100644
--- a/clang-tools-extra/test/clang-tidy/abseil-duration-conversion-cast.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-conversion-cast.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-duration-division.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-division.cpp
index 51d012f1538..51d012f1538 100644
--- a/clang-tools-extra/test/clang-tidy/abseil-duration-division.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-division.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-duration-factory-float.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-factory-float.cpp
index 2649d2b90d8..2649d2b90d8 100644
--- a/clang-tools-extra/test/clang-tidy/abseil-duration-factory-float.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-factory-float.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-duration-factory-scale.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-factory-scale.cpp
index 04c361328f5..04c361328f5 100644
--- a/clang-tools-extra/test/clang-tidy/abseil-duration-factory-scale.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-factory-scale.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-duration-subtraction.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-subtraction.cpp
index 154b7d4ba76..154b7d4ba76 100644
--- a/clang-tools-extra/test/clang-tidy/abseil-duration-subtraction.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-subtraction.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-duration-unnecessary-conversion.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-unnecessary-conversion.cpp
index dde1da90634..dde1da90634 100644
--- a/clang-tools-extra/test/clang-tidy/abseil-duration-unnecessary-conversion.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-unnecessary-conversion.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-faster-strsplit-delimiter.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-faster-strsplit-delimiter.cpp
index ff8c034d2b1..ff8c034d2b1 100644
--- a/clang-tools-extra/test/clang-tidy/abseil-faster-strsplit-delimiter.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/abseil-faster-strsplit-delimiter.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-no-internal-dependencies.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-no-internal-dependencies.cpp
index 272d0060bdb..272d0060bdb 100644
--- a/clang-tools-extra/test/clang-tidy/abseil-no-internal-dependencies.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/abseil-no-internal-dependencies.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-no-namespace.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-no-namespace.cpp
index 78821c373f5..78821c373f5 100644
--- a/clang-tools-extra/test/clang-tidy/abseil-no-namespace.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/abseil-no-namespace.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-redundant-strcat-calls.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-redundant-strcat-calls.cpp
index 2d723797143..2d723797143 100644
--- a/clang-tools-extra/test/clang-tidy/abseil-redundant-strcat-calls.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/abseil-redundant-strcat-calls.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-str-cat-append.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-str-cat-append.cpp
index 9a2585da5b2..9a2585da5b2 100644
--- a/clang-tools-extra/test/clang-tidy/abseil-str-cat-append.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/abseil-str-cat-append.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-string-find-startswith.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-string-find-startswith.cpp
index 89365bfa1f8..89365bfa1f8 100644
--- a/clang-tools-extra/test/clang-tidy/abseil-string-find-startswith.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/abseil-string-find-startswith.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-time-comparison.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-time-comparison.cpp
index ab03020c3c7..ab03020c3c7 100644
--- a/clang-tools-extra/test/clang-tidy/abseil-time-comparison.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/abseil-time-comparison.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-time-subtraction.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-time-subtraction.cpp
index 6fd239bb457..6fd239bb457 100644
--- a/clang-tools-extra/test/clang-tidy/abseil-time-subtraction.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/abseil-time-subtraction.cpp
diff --git a/clang-tools-extra/test/clang-tidy/abseil-upgrade-duration-conversions.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil-upgrade-duration-conversions.cpp
index db393a96a50..db393a96a50 100644
--- a/clang-tools-extra/test/clang-tidy/abseil-upgrade-duration-conversions.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/abseil-upgrade-duration-conversions.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-accept.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-accept.cpp
index 9990594266b..9990594266b 100644
--- a/clang-tools-extra/test/clang-tidy/android-cloexec-accept.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-accept.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-accept4.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-accept4.cpp
index 448d4a9f640..448d4a9f640 100644
--- a/clang-tools-extra/test/clang-tidy/android-cloexec-accept4.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-accept4.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-creat.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-creat.cpp
index df57b10a238..df57b10a238 100644
--- a/clang-tools-extra/test/clang-tidy/android-cloexec-creat.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-creat.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-dup.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-dup.cpp
index f7011b8b835..f7011b8b835 100644
--- a/clang-tools-extra/test/clang-tidy/android-cloexec-dup.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-dup.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-epoll-create.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-epoll-create.cpp
index d58e493b903..d58e493b903 100644
--- a/clang-tools-extra/test/clang-tidy/android-cloexec-epoll-create.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-epoll-create.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-epoll-create1.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-epoll-create1.cpp
index 696a20cd07b..696a20cd07b 100644
--- a/clang-tools-extra/test/clang-tidy/android-cloexec-epoll-create1.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-epoll-create1.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-fopen.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-fopen.cpp
index 6b6c655c157..6b6c655c157 100644
--- a/clang-tools-extra/test/clang-tidy/android-cloexec-fopen.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-fopen.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-inotify-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-inotify-init.cpp
index 01eb51e3962..01eb51e3962 100644
--- a/clang-tools-extra/test/clang-tidy/android-cloexec-inotify-init.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-inotify-init.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-inotify-init1.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-inotify-init1.cpp
index 2b74fad1359..2b74fad1359 100644
--- a/clang-tools-extra/test/clang-tidy/android-cloexec-inotify-init1.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-inotify-init1.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-memfd-create.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-memfd-create.cpp
index a8dafd5e887..a8dafd5e887 100644
--- a/clang-tools-extra/test/clang-tidy/android-cloexec-memfd-create.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-memfd-create.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-open.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-open.cpp
index 4ef1f400dad..4ef1f400dad 100644
--- a/clang-tools-extra/test/clang-tidy/android-cloexec-open.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-open.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-pipe.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-pipe.cpp
index c5622f23452..c5622f23452 100644
--- a/clang-tools-extra/test/clang-tidy/android-cloexec-pipe.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-pipe.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-pipe2.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-pipe2.cpp
index 4bda70fa77c..4bda70fa77c 100644
--- a/clang-tools-extra/test/clang-tidy/android-cloexec-pipe2.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-pipe2.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-cloexec-socket.cpp b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-socket.cpp
index 25f332d3138..25f332d3138 100644
--- a/clang-tools-extra/test/clang-tidy/android-cloexec-socket.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-socket.cpp
diff --git a/clang-tools-extra/test/clang-tidy/android-comparison-in-temp-failure-retry.c b/clang-tools-extra/test/clang-tidy/checkers/android-comparison-in-temp-failure-retry.c
index 3be3eecce1c..3be3eecce1c 100644
--- a/clang-tools-extra/test/clang-tidy/android-comparison-in-temp-failure-retry.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/android-comparison-in-temp-failure-retry.c
diff --git a/clang-tools-extra/test/clang-tidy/boost-use-to-string.cpp b/clang-tools-extra/test/clang-tidy/checkers/boost-use-to-string.cpp
index 44ba172c2ff..44ba172c2ff 100644
--- a/clang-tools-extra/test/clang-tidy/boost-use-to-string.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/boost-use-to-string.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-argument-comment-gmock.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-gmock.cpp
index 95b1a071301..95b1a071301 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-argument-comment-gmock.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-gmock.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-argument-comment-ignore-single-argument.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-ignore-single-argument.cpp
index ea726563596..ea726563596 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-argument-comment-ignore-single-argument.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-ignore-single-argument.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-argument-comment-literals.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-literals.cpp
index 5642960ee9b..5642960ee9b 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-argument-comment-literals.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-literals.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-argument-comment-strict.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-strict.cpp
index 46e346fa6cb..46e346fa6cb 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-argument-comment-strict.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-strict.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-argument-comment.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment.cpp
index 8a4d9e5b644..8a4d9e5b644 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-argument-comment.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-assert-side-effect.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-assert-side-effect.cpp
index 0933402e90c..0933402e90c 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-assert-side-effect.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-assert-side-effect.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-bool-pointer-implicit-conversion.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-bool-pointer-implicit-conversion.cpp
index 37c6939b590..37c6939b590 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-bool-pointer-implicit-conversion.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-bool-pointer-implicit-conversion.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-branch-clone-macro-crash.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone-branch-clone-macro-crash.c
index ce0c0137d0a..ce0c0137d0a 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-branch-clone-macro-crash.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-branch-clone-macro-crash.c
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-branch-clone.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-branch-clone.cpp
index af16f510555..af16f510555 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-branch-clone.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-branch-clone.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-copy-constructor-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-copy-constructor-init.cpp
index 981d0b5af74..981d0b5af74 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-copy-constructor-init.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-copy-constructor-init.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-dangling-handle.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-dangling-handle.cpp
index d3caf73b88c..d3caf73b88c 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-dangling-handle.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-dangling-handle.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-dynamic-static-initializers.hpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-dynamic-static-initializers.hpp
index 647b2e57165..647b2e57165 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-dynamic-static-initializers.hpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-dynamic-static-initializers.hpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-exception-escape-openmp.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-exception-escape-openmp.cpp
index 101c339b8fe..101c339b8fe 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-exception-escape-openmp.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-exception-escape-openmp.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-exception-escape.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-exception-escape.cpp
index ebb44f84f67..ebb44f84f67 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-exception-escape.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-exception-escape.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-fold-init-type.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-fold-init-type.cpp
index e7fdf395c50..e7fdf395c50 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-fold-init-type.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-fold-init-type.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-forward-declaration-namespace.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-forward-declaration-namespace.cpp
index e0b2258778f..e0b2258778f 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-forward-declaration-namespace.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-forward-declaration-namespace.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-forwarding-reference-overload.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-forwarding-reference-overload.cpp
index e5d0ba395d1..e5d0ba395d1 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-forwarding-reference-overload.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-forwarding-reference-overload.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-inaccurate-erase.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-inaccurate-erase.cpp
index eff57eaabf7..eff57eaabf7 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-inaccurate-erase.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-inaccurate-erase.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-incorrect-roundings.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-incorrect-roundings.cpp
index 7ada0616cc8..7ada0616cc8 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-incorrect-roundings.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-incorrect-roundings.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-infinite-loop.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-infinite-loop.cpp
index 33d94820b0f..33d94820b0f 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-infinite-loop.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-infinite-loop.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-integer-division.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-integer-division.cpp
index 243ad46713c..243ad46713c 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-integer-division.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-integer-division.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-lambda-function-name.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-lambda-function-name.cpp
index 145928b4e20..145928b4e20 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-lambda-function-name.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-lambda-function-name.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-macro-parentheses-cmdline.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-macro-parentheses-cmdline.cpp
index 9ff757d13c6..9ff757d13c6 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-macro-parentheses-cmdline.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-macro-parentheses-cmdline.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-macro-parentheses.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-macro-parentheses.cpp
index 2cc45e83b20..2cc45e83b20 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-macro-parentheses.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-macro-parentheses.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-macro-repeated-side-effects.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone-macro-repeated-side-effects.c
index 995d872dce7..995d872dce7 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-macro-repeated-side-effects.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-macro-repeated-side-effects.c
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-misplaced-operator-in-strlen-in-alloc.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-operator-in-strlen-in-alloc.c
index c5deb25e9ac..c5deb25e9ac 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-misplaced-operator-in-strlen-in-alloc.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-operator-in-strlen-in-alloc.c
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-misplaced-operator-in-strlen-in-alloc.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-operator-in-strlen-in-alloc.cpp
index 58d63fa7afd..58d63fa7afd 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-misplaced-operator-in-strlen-in-alloc.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-operator-in-strlen-in-alloc.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-misplaced-widening-cast-explicit-only.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-widening-cast-explicit-only.cpp
index ed2fd4094f2..ed2fd4094f2 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-misplaced-widening-cast-explicit-only.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-widening-cast-explicit-only.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-misplaced-widening-cast-implicit-enabled.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-widening-cast-implicit-enabled.cpp
index 5487b33958b..5487b33958b 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-misplaced-widening-cast-implicit-enabled.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-widening-cast-implicit-enabled.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-move-forwarding-reference.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-move-forwarding-reference.cpp
index 68eeb126b5d..68eeb126b5d 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-move-forwarding-reference.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-move-forwarding-reference.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-multiple-statement-macro.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-multiple-statement-macro.cpp
index 5b88d8dcf1d..5b88d8dcf1d 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-multiple-statement-macro.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-multiple-statement-macro.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-parent-virtual-call.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-parent-virtual-call.cpp
index ad845886fcb..ad845886fcb 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-parent-virtual-call.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-parent-virtual-call.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-posix-return.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-posix-return.cpp
index 271893c7070..271893c7070 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-posix-return.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-posix-return.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-sizeof-container.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-sizeof-container.cpp
index b45183de895..b45183de895 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-sizeof-container.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-sizeof-container.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-sizeof-expression.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-sizeof-expression.cpp
index b82beccc794..b82beccc794 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-sizeof-expression.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-sizeof-expression.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-string-constructor.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-string-constructor.cpp
index d3d927c27dc..d3d927c27dc 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-string-constructor.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-string-constructor.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-string-integer-assignment.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-string-integer-assignment.cpp
index 18fe5ef4e5c..18fe5ef4e5c 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-string-integer-assignment.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-string-integer-assignment.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-string-literal-with-embedded-nul.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-string-literal-with-embedded-nul.cpp
index f939f5282eb..f939f5282eb 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-string-literal-with-embedded-nul.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-string-literal-with-embedded-nul.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-enum-usage-strict.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-enum-usage-strict.cpp
index cf0ec598d19..cf0ec598d19 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-enum-usage-strict.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-enum-usage-strict.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-enum-usage.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-enum-usage.cpp
index 314e4342451..314e4342451 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-enum-usage.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-enum-usage.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-memset-usage.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-memset-usage.cpp
index f33ae5ae10a..f33ae5ae10a 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-memset-usage.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-memset-usage.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-missing-comma.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-missing-comma.cpp
index f0393101183..f0393101183 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-missing-comma.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-missing-comma.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-semicolon-fail.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-semicolon-fail.cpp
index 45fa2262f6d..45fa2262f6d 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-semicolon-fail.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-semicolon-fail.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-semicolon.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-semicolon.cpp
index 4f9f4c5db65..4f9f4c5db65 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-semicolon.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-semicolon.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-string-compare.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-string-compare.c
index 3b3175ab958..3b3175ab958 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-string-compare.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-string-compare.c
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-string-compare.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-string-compare.cpp
index c1c24ffcd44..c1c24ffcd44 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-string-compare.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-string-compare.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-swapped-arguments.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-swapped-arguments.cpp
index 06fb2d869f6..06fb2d869f6 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-swapped-arguments.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-swapped-arguments.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-terminating-continue.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-terminating-continue.cpp
index 4bdcbc42fc4..4bdcbc42fc4 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-terminating-continue.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-terminating-continue.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-throw-keyword-missing.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-throw-keyword-missing.cpp
index 93ecf06ce97..93ecf06ce97 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-throw-keyword-missing.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-throw-keyword-missing.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-too-small-loop-variable-magniute-bits-upper-limit.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-too-small-loop-variable-magniute-bits-upper-limit.cpp
index d602a1d08e2..d602a1d08e2 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-too-small-loop-variable-magniute-bits-upper-limit.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-too-small-loop-variable-magniute-bits-upper-limit.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-too-small-loop-variable.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-too-small-loop-variable.cpp
index 5a633559484..5a633559484 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-too-small-loop-variable.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-too-small-loop-variable.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-undefined-memory-manipulation.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-undefined-memory-manipulation.cpp
index 805501096d8..805501096d8 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-undefined-memory-manipulation.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-undefined-memory-manipulation.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-undelegated-constructor-cxx98.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-undelegated-constructor-cxx98.cpp
index f859f24dd7b..f859f24dd7b 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-undelegated-constructor-cxx98.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-undelegated-constructor-cxx98.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-undelegated-constructor.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-undelegated-constructor.cpp
index 09b20ac74e2..09b20ac74e2 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-undelegated-constructor.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-undelegated-constructor.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-unhandled-self-assignment-warn-only-if-this-has-suspicious-field.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-unhandled-self-assignment-warn-only-if-this-has-suspicious-field.cpp
index 0e6ee47478d..0e6ee47478d 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-unhandled-self-assignment-warn-only-if-this-has-suspicious-field.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-unhandled-self-assignment-warn-only-if-this-has-suspicious-field.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-unhandled-self-assignment.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-unhandled-self-assignment.cpp
index 49bb5314f9e..49bb5314f9e 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-unhandled-self-assignment.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-unhandled-self-assignment.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-unused-raii.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-unused-raii.cpp
index 91ade5242ef..91ade5242ef 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-unused-raii.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-unused-raii.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-unused-return-value-custom.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-unused-return-value-custom.cpp
index 53ace6358a0..53ace6358a0 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-unused-return-value-custom.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-unused-return-value-custom.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-unused-return-value.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-unused-return-value.cpp
index 797f56d9f4f..797f56d9f4f 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-unused-return-value.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-unused-return-value.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-use-after-move.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-use-after-move.cpp
index a28c901308c..a28c901308c 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-use-after-move.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-use-after-move.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-virtual-near-miss.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-virtual-near-miss.cpp
index 553d2f45a98..553d2f45a98 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-virtual-near-miss.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone-virtual-near-miss.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cert-dcl21-cpp.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert-dcl21-cpp.cpp
index c975f70fbb0..c975f70fbb0 100644
--- a/clang-tools-extra/test/clang-tidy/cert-dcl21-cpp.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cert-dcl21-cpp.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cert-dcl58-cpp.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert-dcl58-cpp.cpp
index 34ee368dffe..34ee368dffe 100644
--- a/clang-tools-extra/test/clang-tidy/cert-dcl58-cpp.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cert-dcl58-cpp.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cert-env33-c.c b/clang-tools-extra/test/clang-tidy/checkers/cert-env33-c.c
index 5846b496242..5846b496242 100644
--- a/clang-tools-extra/test/clang-tidy/cert-env33-c.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/cert-env33-c.c
diff --git a/clang-tools-extra/test/clang-tidy/cert-err34-c.c b/clang-tools-extra/test/clang-tidy/checkers/cert-err34-c.c
index e2cfc2182b3..e2cfc2182b3 100644
--- a/clang-tools-extra/test/clang-tidy/cert-err34-c.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/cert-err34-c.c
diff --git a/clang-tools-extra/test/clang-tidy/cert-err34-c.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert-err34-c.cpp
index 1c358bc3fb5..1c358bc3fb5 100644
--- a/clang-tools-extra/test/clang-tidy/cert-err34-c.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cert-err34-c.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cert-flp30-c.c b/clang-tools-extra/test/clang-tidy/checkers/cert-flp30-c.c
index eee16bee3d8..eee16bee3d8 100644
--- a/clang-tools-extra/test/clang-tidy/cert-flp30-c.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/cert-flp30-c.c
diff --git a/clang-tools-extra/test/clang-tidy/cert-limited-randomness.c b/clang-tools-extra/test/clang-tidy/checkers/cert-limited-randomness.c
index c8009b55ba8..c8009b55ba8 100644
--- a/clang-tools-extra/test/clang-tidy/cert-limited-randomness.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/cert-limited-randomness.c
diff --git a/clang-tools-extra/test/clang-tidy/cert-limited-randomness.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert-limited-randomness.cpp
index 845b7350de9..845b7350de9 100644
--- a/clang-tools-extra/test/clang-tidy/cert-limited-randomness.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cert-limited-randomness.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cert-msc32-c.c b/clang-tools-extra/test/clang-tidy/checkers/cert-msc32-c.c
index 6cc40fa2ba6..6cc40fa2ba6 100644
--- a/clang-tools-extra/test/clang-tidy/cert-msc32-c.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/cert-msc32-c.c
diff --git a/clang-tools-extra/test/clang-tidy/cert-msc51-cpp.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert-msc51-cpp.cpp
index 4aec74b1ed7..4aec74b1ed7 100644
--- a/clang-tools-extra/test/clang-tidy/cert-msc51-cpp.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cert-msc51-cpp.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cert-oop11-cpp.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert-oop11-cpp.cpp
index f7f3a648675..f7f3a648675 100644
--- a/clang-tools-extra/test/clang-tidy/cert-oop11-cpp.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cert-oop11-cpp.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cert-oop54-cpp.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert-oop54-cpp.cpp
index f601e672820..f601e672820 100644
--- a/clang-tools-extra/test/clang-tidy/cert-oop54-cpp.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cert-oop54-cpp.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cert-setlongjmp.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert-setlongjmp.cpp
index 88d1db35f6b..88d1db35f6b 100644
--- a/clang-tools-extra/test/clang-tidy/cert-setlongjmp.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cert-setlongjmp.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cert-static-object-exception.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert-static-object-exception.cpp
index b915252bfff..b915252bfff 100644
--- a/clang-tools-extra/test/clang-tidy/cert-static-object-exception.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cert-static-object-exception.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cert-throw-exception-type.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert-throw-exception-type.cpp
index bc0ecc808b2..bc0ecc808b2 100644
--- a/clang-tools-extra/test/clang-tidy/cert-throw-exception-type.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cert-throw-exception-type.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cert-uppercase-literal-suffix-integer.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert-uppercase-literal-suffix-integer.cpp
index c19aacdd1b6..c19aacdd1b6 100644
--- a/clang-tools-extra/test/clang-tidy/cert-uppercase-literal-suffix-integer.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cert-uppercase-literal-suffix-integer.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cert-variadic-function-def.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert-variadic-function-def.cpp
index 6b2421b82fa..6b2421b82fa 100644
--- a/clang-tools-extra/test/clang-tidy/cert-variadic-function-def.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cert-variadic-function-def.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-avoid-goto.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-avoid-goto.cpp
index ee236bc4469..ee236bc4469 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-avoid-goto.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-avoid-goto.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-init-variables.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-init-variables.cpp
index d43e44808a4..d43e44808a4 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-init-variables.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-init-variables.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-interfaces-global-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-interfaces-global-init.cpp
index 51f79e522c0..51f79e522c0 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-interfaces-global-init.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-interfaces-global-init.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-macro-usage-caps-only.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage-caps-only.cpp
index a1d49bf99f8..a1d49bf99f8 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-macro-usage-caps-only.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage-caps-only.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-macro-usage-command-line-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage-command-line-macros.cpp
index d4f9a0da876..d4f9a0da876 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-macro-usage-command-line-macros.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage-command-line-macros.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-macro-usage-custom.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage-custom.cpp
index e25eae32309..e25eae32309 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-macro-usage-custom.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage-custom.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-macro-usage.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage.cpp
index edce328ec65..edce328ec65 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-macro-usage.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-narrowing-conversions-long-is-32bits.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-long-is-32bits.cpp
index dcf1848a30f..dcf1848a30f 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-narrowing-conversions-long-is-32bits.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-long-is-32bits.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-narrowing-conversions-narrowingfloatingpoint-option.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-narrowingfloatingpoint-option.cpp
index 14840df18d0..14840df18d0 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-narrowing-conversions-narrowingfloatingpoint-option.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-narrowingfloatingpoint-option.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-narrowing-conversions-pedanticmode-option.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-pedanticmode-option.cpp
index f28985d2f31..f28985d2f31 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-narrowing-conversions-pedanticmode-option.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-pedanticmode-option.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-narrowing-conversions-unsigned-char.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-unsigned-char.cpp
index 6bd437f98d4..6bd437f98d4 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-narrowing-conversions-unsigned-char.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-unsigned-char.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-narrowing-conversions.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions.cpp
index cc817a021fd..cc817a021fd 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-narrowing-conversions.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-no-malloc-custom.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-no-malloc-custom.cpp
index 89142fbd513..89142fbd513 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-no-malloc-custom.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-no-malloc-custom.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-no-malloc-no-functions.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-no-malloc-no-functions.cpp
index 8b4d46480c5..8b4d46480c5 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-no-malloc-no-functions.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-no-malloc-no-functions.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-no-malloc.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-no-malloc.cpp
index 7b7ccf3b05e..7b7ccf3b05e 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-no-malloc.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-no-malloc.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-owning-memory-containers.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-owning-memory-containers.cpp
index d39e697c6bd..d39e697c6bd 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-owning-memory-containers.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-owning-memory-containers.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-owning-memory-legacy-functions.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-owning-memory-legacy-functions.cpp
index d5bfcbc31c9..d5bfcbc31c9 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-owning-memory-legacy-functions.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-owning-memory-legacy-functions.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-owning-memory.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-owning-memory.cpp
index 72b13801cf1..72b13801cf1 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-owning-memory.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-owning-memory.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-array-to-pointer-decay.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-array-to-pointer-decay.cpp
index 2287e48a4fe..2287e48a4fe 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-array-to-pointer-decay.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-array-to-pointer-decay.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-constant-array-index-c++03.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-constant-array-index-c++03.cpp
index ad1cc5ab897..ad1cc5ab897 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-constant-array-index-c++03.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-constant-array-index-c++03.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-constant-array-index-gslheader.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-constant-array-index-gslheader.cpp
index 71b957d8474..71b957d8474 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-constant-array-index-gslheader.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-constant-array-index-gslheader.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-constant-array-index.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-constant-array-index.cpp
index 35194109934..35194109934 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-constant-array-index.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-constant-array-index.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-pointer-arithmetic-pr36489.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-pointer-arithmetic-pr36489.cpp
index faab2a1ccf0..faab2a1ccf0 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-pointer-arithmetic-pr36489.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-pointer-arithmetic-pr36489.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-pointer-arithmetic.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-pointer-arithmetic.cpp
index 7cbc6ddf96a..7cbc6ddf96a 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-pointer-arithmetic.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-pointer-arithmetic.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-const-cast.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-const-cast.cpp
index 2d32e13723a..2d32e13723a 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-const-cast.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-const-cast.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-cstyle-cast.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-cstyle-cast.cpp
index 31f59e3bb07..31f59e3bb07 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-cstyle-cast.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-cstyle-cast.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init-cxx2a.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-cxx2a.cpp
index 3b384c24b84..3b384c24b84 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init-cxx2a.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-cxx2a.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init-cxx98.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-cxx98.cpp
index 6e47123568f..6e47123568f 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init-cxx98.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-cxx98.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init-delayed.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-delayed.cpp
index d3436ba6c12..d3436ba6c12 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init-delayed.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-delayed.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init-no-crash.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-no-crash.cpp
index 300fff6cb17..300fff6cb17 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init-no-crash.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-no-crash.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init-use-assignment.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-use-assignment.cpp
index d6570502c92..d6570502c92 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init-use-assignment.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-use-assignment.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init.cpp
index 7daf9dfeaeb..7daf9dfeaeb 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-reinterpret-cast.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-reinterpret-cast.cpp
index 54208102e6f..54208102e6f 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-reinterpret-cast.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-reinterpret-cast.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-static-cast-downcast.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-static-cast-downcast.cpp
index 7a6c027ec47..7a6c027ec47 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-static-cast-downcast.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-static-cast-downcast.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-union-access.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-union-access.cpp
index 6abc22b9e43..6abc22b9e43 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-union-access.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-union-access.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-vararg.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-vararg.cpp
index 021322aacb6..021322aacb6 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-vararg.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-vararg.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-slicing.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-slicing.cpp
index 6856f52f706..6856f52f706 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-slicing.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-slicing.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-special-member-functions-cxx-03.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-special-member-functions-cxx-03.cpp
index 10f3955846d..10f3955846d 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-special-member-functions-cxx-03.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-special-member-functions-cxx-03.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-special-member-functions-relaxed.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-special-member-functions-relaxed.cpp
index 4fff02de87a..4fff02de87a 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-special-member-functions-relaxed.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-special-member-functions-relaxed.cpp
diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-special-member-functions.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-special-member-functions.cpp
index 013ba8623a6..013ba8623a6 100644
--- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-special-member-functions.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-special-member-functions.cpp
diff --git a/clang-tools-extra/test/clang-tidy/darwin-avoid-spinlock.m b/clang-tools-extra/test/clang-tidy/checkers/darwin-avoid-spinlock.m
index c870e0a0fed..c870e0a0fed 100644
--- a/clang-tools-extra/test/clang-tidy/darwin-avoid-spinlock.m
+++ b/clang-tools-extra/test/clang-tidy/checkers/darwin-avoid-spinlock.m
diff --git a/clang-tools-extra/test/clang-tidy/darwin-dispatch-once-nonstatic.mm b/clang-tools-extra/test/clang-tidy/checkers/darwin-dispatch-once-nonstatic.mm
index 92d6f453c66..92d6f453c66 100644
--- a/clang-tools-extra/test/clang-tidy/darwin-dispatch-once-nonstatic.mm
+++ b/clang-tools-extra/test/clang-tidy/checkers/darwin-dispatch-once-nonstatic.mm
diff --git a/clang-tools-extra/test/clang-tidy/fuchsia-default-arguments-calls.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-default-arguments-calls.cpp
index ed9079092f6..ed9079092f6 100644
--- a/clang-tools-extra/test/clang-tidy/fuchsia-default-arguments-calls.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-default-arguments-calls.cpp
diff --git a/clang-tools-extra/test/clang-tidy/fuchsia-default-arguments-declarations.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-default-arguments-declarations.cpp
index 1fe7041e24c..1fe7041e24c 100644
--- a/clang-tools-extra/test/clang-tidy/fuchsia-default-arguments-declarations.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-default-arguments-declarations.cpp
diff --git a/clang-tools-extra/test/clang-tidy/fuchsia-multiple-inheritance.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-multiple-inheritance.cpp
index c7869761cf8..c7869761cf8 100644
--- a/clang-tools-extra/test/clang-tidy/fuchsia-multiple-inheritance.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-multiple-inheritance.cpp
diff --git a/clang-tools-extra/test/clang-tidy/fuchsia-overloaded-operator.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-overloaded-operator.cpp
index 7f7a36e8c98..7f7a36e8c98 100644
--- a/clang-tools-extra/test/clang-tidy/fuchsia-overloaded-operator.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-overloaded-operator.cpp
diff --git a/clang-tools-extra/test/clang-tidy/fuchsia-restrict-system-includes-all.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-restrict-system-includes-all.cpp
index d521c1358db..d521c1358db 100644
--- a/clang-tools-extra/test/clang-tidy/fuchsia-restrict-system-includes-all.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-restrict-system-includes-all.cpp
diff --git a/clang-tools-extra/test/clang-tidy/fuchsia-restrict-system-includes-glob.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-restrict-system-includes-glob.cpp
index 104f3689246..104f3689246 100644
--- a/clang-tools-extra/test/clang-tidy/fuchsia-restrict-system-includes-glob.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-restrict-system-includes-glob.cpp
diff --git a/clang-tools-extra/test/clang-tidy/fuchsia-restrict-system-includes-headers.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-restrict-system-includes-headers.cpp
index b9c00e2a105..b9c00e2a105 100644
--- a/clang-tools-extra/test/clang-tidy/fuchsia-restrict-system-includes-headers.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-restrict-system-includes-headers.cpp
diff --git a/clang-tools-extra/test/clang-tidy/fuchsia-restrict-system-includes.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-restrict-system-includes.cpp
index c36640822b4..c36640822b4 100644
--- a/clang-tools-extra/test/clang-tidy/fuchsia-restrict-system-includes.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-restrict-system-includes.cpp
diff --git a/clang-tools-extra/test/clang-tidy/fuchsia-statically-constructed-objects.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-statically-constructed-objects.cpp
index 006494eeca6..006494eeca6 100644
--- a/clang-tools-extra/test/clang-tidy/fuchsia-statically-constructed-objects.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-statically-constructed-objects.cpp
diff --git a/clang-tools-extra/test/clang-tidy/fuchsia-trailing-return.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-trailing-return.cpp
index f6c943ac873..f6c943ac873 100644
--- a/clang-tools-extra/test/clang-tidy/fuchsia-trailing-return.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-trailing-return.cpp
diff --git a/clang-tools-extra/test/clang-tidy/fuchsia-virtual-inheritance.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-virtual-inheritance.cpp
index 0c3311afcbd..0c3311afcbd 100644
--- a/clang-tools-extra/test/clang-tidy/fuchsia-virtual-inheritance.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/fuchsia-virtual-inheritance.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-build-explicit-make-pair.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-build-explicit-make-pair.cpp
index 6dcd357f511..6dcd357f511 100644
--- a/clang-tools-extra/test/clang-tidy/google-build-explicit-make-pair.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/google-build-explicit-make-pair.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-default-arguments.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-default-arguments.cpp
index 48d3f2d2bd7..48d3f2d2bd7 100644
--- a/clang-tools-extra/test/clang-tidy/google-default-arguments.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/google-default-arguments.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-explicit-constructor.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-explicit-constructor.cpp
index 921237a436c..921237a436c 100644
--- a/clang-tools-extra/test/clang-tidy/google-explicit-constructor.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/google-explicit-constructor.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-module.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-module.cpp
index 494ac48e176..494ac48e176 100644
--- a/clang-tools-extra/test/clang-tidy/google-module.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/google-module.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-namespaces.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-namespaces.cpp
index 9bda3c0451b..9bda3c0451b 100644
--- a/clang-tools-extra/test/clang-tidy/google-namespaces.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/google-namespaces.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-objc-avoid-nsobject-new.m b/clang-tools-extra/test/clang-tidy/checkers/google-objc-avoid-nsobject-new.m
index f8b1d20f4f6..f8b1d20f4f6 100644
--- a/clang-tools-extra/test/clang-tidy/google-objc-avoid-nsobject-new.m
+++ b/clang-tools-extra/test/clang-tidy/checkers/google-objc-avoid-nsobject-new.m
diff --git a/clang-tools-extra/test/clang-tidy/google-objc-avoid-throwing-exception.m b/clang-tools-extra/test/clang-tidy/checkers/google-objc-avoid-throwing-exception.m
index 7fa32e7a5aa..7fa32e7a5aa 100644
--- a/clang-tools-extra/test/clang-tidy/google-objc-avoid-throwing-exception.m
+++ b/clang-tools-extra/test/clang-tidy/checkers/google-objc-avoid-throwing-exception.m
diff --git a/clang-tools-extra/test/clang-tidy/google-objc-function-naming.m b/clang-tools-extra/test/clang-tidy/checkers/google-objc-function-naming.m
index 01433d9fa1a..01433d9fa1a 100644
--- a/clang-tools-extra/test/clang-tidy/google-objc-function-naming.m
+++ b/clang-tools-extra/test/clang-tidy/checkers/google-objc-function-naming.m
diff --git a/clang-tools-extra/test/clang-tidy/google-objc-function-naming.mm b/clang-tools-extra/test/clang-tidy/checkers/google-objc-function-naming.mm
index 43c2d7ebf67..43c2d7ebf67 100644
--- a/clang-tools-extra/test/clang-tidy/google-objc-function-naming.mm
+++ b/clang-tools-extra/test/clang-tidy/checkers/google-objc-function-naming.mm
diff --git a/clang-tools-extra/test/clang-tidy/google-objc-global-variable-declaration.m b/clang-tools-extra/test/clang-tidy/checkers/google-objc-global-variable-declaration.m
index d807a39d274..d807a39d274 100644
--- a/clang-tools-extra/test/clang-tidy/google-objc-global-variable-declaration.m
+++ b/clang-tools-extra/test/clang-tidy/checkers/google-objc-global-variable-declaration.m
diff --git a/clang-tools-extra/test/clang-tidy/google-objc-global-variable-declaration.mm b/clang-tools-extra/test/clang-tidy/checkers/google-objc-global-variable-declaration.mm
index 345edec1f97..345edec1f97 100644
--- a/clang-tools-extra/test/clang-tidy/google-objc-global-variable-declaration.mm
+++ b/clang-tools-extra/test/clang-tidy/checkers/google-objc-global-variable-declaration.mm
diff --git a/clang-tools-extra/test/clang-tidy/google-overloaded-unary-and.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-overloaded-unary-and.cpp
index 16893d2725a..16893d2725a 100644
--- a/clang-tools-extra/test/clang-tidy/google-overloaded-unary-and.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/google-overloaded-unary-and.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-readability-casting.c b/clang-tools-extra/test/clang-tidy/checkers/google-readability-casting.c
index 488bcd79637..488bcd79637 100644
--- a/clang-tools-extra/test/clang-tidy/google-readability-casting.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/google-readability-casting.c
diff --git a/clang-tools-extra/test/clang-tidy/google-readability-casting.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-readability-casting.cpp
index 4655e27cd8b..4655e27cd8b 100644
--- a/clang-tools-extra/test/clang-tidy/google-readability-casting.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/google-readability-casting.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-readability-casting.mm b/clang-tools-extra/test/clang-tidy/checkers/google-readability-casting.mm
index b987dc2279a..b987dc2279a 100644
--- a/clang-tools-extra/test/clang-tidy/google-readability-casting.mm
+++ b/clang-tools-extra/test/clang-tidy/checkers/google-readability-casting.mm
diff --git a/clang-tools-extra/test/clang-tidy/google-readability-namespace-comments.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-readability-namespace-comments.cpp
index 591c9dae5a7..591c9dae5a7 100644
--- a/clang-tools-extra/test/clang-tidy/google-readability-namespace-comments.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/google-readability-namespace-comments.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-readability-nested-namespace-comments.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-readability-nested-namespace-comments.cpp
index 017081d2e95..017081d2e95 100644
--- a/clang-tools-extra/test/clang-tidy/google-readability-nested-namespace-comments.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/google-readability-nested-namespace-comments.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-readability-todo.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-readability-todo.cpp
index 6b900aa9215..6b900aa9215 100644
--- a/clang-tools-extra/test/clang-tidy/google-readability-todo.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/google-readability-todo.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-runtime-int-std.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-runtime-int-std.cpp
index e5cdb3ec048..e5cdb3ec048 100644
--- a/clang-tools-extra/test/clang-tidy/google-runtime-int-std.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/google-runtime-int-std.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-runtime-int.c b/clang-tools-extra/test/clang-tidy/checkers/google-runtime-int.c
index 8657e2dd212..8657e2dd212 100644
--- a/clang-tools-extra/test/clang-tidy/google-runtime-int.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/google-runtime-int.c
diff --git a/clang-tools-extra/test/clang-tidy/google-runtime-int.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-runtime-int.cpp
index 4bb739876b7..4bb739876b7 100644
--- a/clang-tools-extra/test/clang-tidy/google-runtime-int.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/google-runtime-int.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-runtime-int.m b/clang-tools-extra/test/clang-tidy/checkers/google-runtime-int.m
index dd1225c9c5b..dd1225c9c5b 100644
--- a/clang-tools-extra/test/clang-tidy/google-runtime-int.m
+++ b/clang-tools-extra/test/clang-tidy/checkers/google-runtime-int.m
diff --git a/clang-tools-extra/test/clang-tidy/google-runtime-references.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-runtime-references.cpp
index 1ebbbe3fc86..1ebbbe3fc86 100644
--- a/clang-tools-extra/test/clang-tidy/google-runtime-references.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/google-runtime-references.cpp
diff --git a/clang-tools-extra/test/clang-tidy/google-upgrade-googletest-case.cpp b/clang-tools-extra/test/clang-tidy/checkers/google-upgrade-googletest-case.cpp
index ce70e791835..ce70e791835 100644
--- a/clang-tools-extra/test/clang-tidy/google-upgrade-googletest-case.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/google-upgrade-googletest-case.cpp
diff --git a/clang-tools-extra/test/clang-tidy/hicpp-exception-baseclass.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp-exception-baseclass.cpp
index b5e405a6918..b5e405a6918 100644
--- a/clang-tools-extra/test/clang-tidy/hicpp-exception-baseclass.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/hicpp-exception-baseclass.cpp
diff --git a/clang-tools-extra/test/clang-tidy/hicpp-multiway-paths-covered-else.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp-multiway-paths-covered-else.cpp
index 34820b5fcc0..34820b5fcc0 100644
--- a/clang-tools-extra/test/clang-tidy/hicpp-multiway-paths-covered-else.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/hicpp-multiway-paths-covered-else.cpp
diff --git a/clang-tools-extra/test/clang-tidy/hicpp-multiway-paths-covered.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp-multiway-paths-covered.cpp
index 15a3407dc1c..15a3407dc1c 100644
--- a/clang-tools-extra/test/clang-tidy/hicpp-multiway-paths-covered.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/hicpp-multiway-paths-covered.cpp
diff --git a/clang-tools-extra/test/clang-tidy/hicpp-no-assembler-msvc.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp-no-assembler-msvc.cpp
index d29a9e93108..d29a9e93108 100644
--- a/clang-tools-extra/test/clang-tidy/hicpp-no-assembler-msvc.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/hicpp-no-assembler-msvc.cpp
diff --git a/clang-tools-extra/test/clang-tidy/hicpp-no-assembler.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp-no-assembler.cpp
index d08ea74f6cd..d08ea74f6cd 100644
--- a/clang-tools-extra/test/clang-tidy/hicpp-no-assembler.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/hicpp-no-assembler.cpp
diff --git a/clang-tools-extra/test/clang-tidy/hicpp-signed-bitwise-bug34747.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise-bug34747.cpp
index 217df71dc33..217df71dc33 100644
--- a/clang-tools-extra/test/clang-tidy/hicpp-signed-bitwise-bug34747.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise-bug34747.cpp
diff --git a/clang-tools-extra/test/clang-tidy/hicpp-signed-bitwise-standard-types.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise-standard-types.cpp
index b88b266ff4b..b88b266ff4b 100644
--- a/clang-tools-extra/test/clang-tidy/hicpp-signed-bitwise-standard-types.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise-standard-types.cpp
diff --git a/clang-tools-extra/test/clang-tidy/hicpp-signed-bitwise-standard-types.h b/clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise-standard-types.h
index e66fd090635..e66fd090635 100644
--- a/clang-tools-extra/test/clang-tidy/hicpp-signed-bitwise-standard-types.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise-standard-types.h
diff --git a/clang-tools-extra/test/clang-tidy/hicpp-signed-bitwise.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise.cpp
index 58cc911d108..58cc911d108 100644
--- a/clang-tools-extra/test/clang-tidy/hicpp-signed-bitwise.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise.cpp
diff --git a/clang-tools-extra/test/clang-tidy/linuxkernel-must-check-errs.c b/clang-tools-extra/test/clang-tidy/checkers/linuxkernel-must-check-errs.c
index a025516f271..a025516f271 100644
--- a/clang-tools-extra/test/clang-tidy/linuxkernel-must-check-errs.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/linuxkernel-must-check-errs.c
diff --git a/clang-tools-extra/test/clang-tidy/llvm-include-order.cpp b/clang-tools-extra/test/clang-tidy/checkers/llvm-include-order.cpp
index 7272353bedc..7272353bedc 100644
--- a/clang-tools-extra/test/clang-tidy/llvm-include-order.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/llvm-include-order.cpp
diff --git a/clang-tools-extra/test/clang-tidy/llvm-prefer-isa-or-dyn-cast-in-conditionals.cpp b/clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-isa-or-dyn-cast-in-conditionals.cpp
index 48652d521ba..48652d521ba 100644
--- a/clang-tools-extra/test/clang-tidy/llvm-prefer-isa-or-dyn-cast-in-conditionals.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-isa-or-dyn-cast-in-conditionals.cpp
diff --git a/clang-tools-extra/test/clang-tidy/llvm-prefer-register-over-unsigned.cpp b/clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-register-over-unsigned.cpp
index 22af2ac6ae9..22af2ac6ae9 100644
--- a/clang-tools-extra/test/clang-tidy/llvm-prefer-register-over-unsigned.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-register-over-unsigned.cpp
diff --git a/clang-tools-extra/test/clang-tidy/llvm-prefer-register-over-unsigned2.cpp b/clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-register-over-unsigned2.cpp
index 3b796f2e475..3b796f2e475 100644
--- a/clang-tools-extra/test/clang-tidy/llvm-prefer-register-over-unsigned2.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-register-over-unsigned2.cpp
diff --git a/clang-tools-extra/test/clang-tidy/llvm-prefer-register-over-unsigned3.cpp b/clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-register-over-unsigned3.cpp
index 7d61f6c78a2..7d61f6c78a2 100644
--- a/clang-tools-extra/test/clang-tidy/llvm-prefer-register-over-unsigned3.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-register-over-unsigned3.cpp
diff --git a/clang-tools-extra/test/clang-tidy/llvm-twine-local.cpp b/clang-tools-extra/test/clang-tidy/checkers/llvm-twine-local.cpp
index 06eb7613d43..06eb7613d43 100644
--- a/clang-tools-extra/test/clang-tidy/llvm-twine-local.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/llvm-twine-local.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-definitions-in-headers-1z.hpp b/clang-tools-extra/test/clang-tidy/checkers/misc-definitions-in-headers-1z.hpp
index 79fb7bc0bd8..79fb7bc0bd8 100644
--- a/clang-tools-extra/test/clang-tidy/misc-definitions-in-headers-1z.hpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc-definitions-in-headers-1z.hpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-definitions-in-headers.hpp b/clang-tools-extra/test/clang-tidy/checkers/misc-definitions-in-headers.hpp
index 25009ebe2bb..25009ebe2bb 100644
--- a/clang-tools-extra/test/clang-tidy/misc-definitions-in-headers.hpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc-definitions-in-headers.hpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-misplaced-const-cxx17.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-misplaced-const-cxx17.cpp
index 7816a091d7a..7816a091d7a 100644
--- a/clang-tools-extra/test/clang-tidy/misc-misplaced-const-cxx17.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc-misplaced-const-cxx17.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-misplaced-const.c b/clang-tools-extra/test/clang-tidy/checkers/misc-misplaced-const.c
index cccf3a4506f..cccf3a4506f 100644
--- a/clang-tools-extra/test/clang-tidy/misc-misplaced-const.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc-misplaced-const.c
diff --git a/clang-tools-extra/test/clang-tidy/misc-misplaced-const.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-misplaced-const.cpp
index d7ea893c215..d7ea893c215 100644
--- a/clang-tools-extra/test/clang-tidy/misc-misplaced-const.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc-misplaced-const.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-new-delete-overloads-sized-dealloc.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-new-delete-overloads-sized-dealloc.cpp
index 69867882797..69867882797 100644
--- a/clang-tools-extra/test/clang-tidy/misc-new-delete-overloads-sized-dealloc.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc-new-delete-overloads-sized-dealloc.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-new-delete-overloads.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-new-delete-overloads.cpp
index 78f021144b2..78f021144b2 100644
--- a/clang-tools-extra/test/clang-tidy/misc-new-delete-overloads.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc-new-delete-overloads.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-non-copyable-objects.c b/clang-tools-extra/test/clang-tidy/checkers/misc-non-copyable-objects.c
index ac6198e8b37..ac6198e8b37 100644
--- a/clang-tools-extra/test/clang-tidy/misc-non-copyable-objects.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc-non-copyable-objects.c
diff --git a/clang-tools-extra/test/clang-tidy/misc-non-copyable-objects.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-non-copyable-objects.cpp
index 3d716f4ffe8..3d716f4ffe8 100644
--- a/clang-tools-extra/test/clang-tidy/misc-non-copyable-objects.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc-non-copyable-objects.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-non-private-member-variables-in-classes.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-non-private-member-variables-in-classes.cpp
index 2a93ff6a18c..2a93ff6a18c 100644
--- a/clang-tools-extra/test/clang-tidy/misc-non-private-member-variables-in-classes.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc-non-private-member-variables-in-classes.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-redundant-expression.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-redundant-expression.cpp
index f6b47eb79fb..f6b47eb79fb 100644
--- a/clang-tools-extra/test/clang-tidy/misc-redundant-expression.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc-redundant-expression.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-static-assert.c b/clang-tools-extra/test/clang-tidy/checkers/misc-static-assert.c
index e3e8304977c..e3e8304977c 100644
--- a/clang-tools-extra/test/clang-tidy/misc-static-assert.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc-static-assert.c
diff --git a/clang-tools-extra/test/clang-tidy/misc-static-assert.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-static-assert.cpp
index 85ae053cffe..85ae053cffe 100644
--- a/clang-tools-extra/test/clang-tidy/misc-static-assert.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc-static-assert.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-throw-by-value-catch-by-reference.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-throw-by-value-catch-by-reference.cpp
index 269ef90f38f..269ef90f38f 100644
--- a/clang-tools-extra/test/clang-tidy/misc-throw-by-value-catch-by-reference.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc-throw-by-value-catch-by-reference.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-unconventional-assign-operator-cxx17.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-unconventional-assign-operator-cxx17.cpp
index d6e9ebe49a9..d6e9ebe49a9 100644
--- a/clang-tools-extra/test/clang-tidy/misc-unconventional-assign-operator-cxx17.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc-unconventional-assign-operator-cxx17.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-unconventional-assign-operator.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-unconventional-assign-operator.cpp
index a0a37c0ff1c..a0a37c0ff1c 100644
--- a/clang-tools-extra/test/clang-tidy/misc-unconventional-assign-operator.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc-unconventional-assign-operator.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-uniqueptr-reset-release.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-uniqueptr-reset-release.cpp
index 1bd6e6f4c54..1bd6e6f4c54 100644
--- a/clang-tools-extra/test/clang-tidy/misc-uniqueptr-reset-release.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc-uniqueptr-reset-release.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-unused-alias-decls.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-unused-alias-decls.cpp
index 6d63df4047a..6d63df4047a 100644
--- a/clang-tools-extra/test/clang-tidy/misc-unused-alias-decls.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc-unused-alias-decls.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-unused-parameters-strict.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-unused-parameters-strict.cpp
index a334b45942e..a334b45942e 100644
--- a/clang-tools-extra/test/clang-tidy/misc-unused-parameters-strict.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc-unused-parameters-strict.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-unused-parameters.c b/clang-tools-extra/test/clang-tidy/checkers/misc-unused-parameters.c
index 1f4527a2ec8..1f4527a2ec8 100644
--- a/clang-tools-extra/test/clang-tidy/misc-unused-parameters.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc-unused-parameters.c
diff --git a/clang-tools-extra/test/clang-tidy/misc-unused-parameters.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-unused-parameters.cpp
index 119eff67318..119eff67318 100644
--- a/clang-tools-extra/test/clang-tidy/misc-unused-parameters.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc-unused-parameters.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-unused-using-decls-errors.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-unused-using-decls-errors.cpp
index 1c26a6961aa..1c26a6961aa 100644
--- a/clang-tools-extra/test/clang-tidy/misc-unused-using-decls-errors.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc-unused-using-decls-errors.cpp
diff --git a/clang-tools-extra/test/clang-tidy/misc-unused-using-decls.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-unused-using-decls.cpp
index 9511160bc2f..9511160bc2f 100644
--- a/clang-tools-extra/test/clang-tidy/misc-unused-using-decls.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc-unused-using-decls.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-avoid-bind.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-bind.cpp
index fa60cdc2c9d..fa60cdc2c9d 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-avoid-bind.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-bind.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-avoid-c-arrays-ignores-main.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-c-arrays-ignores-main.cpp
index 6549422f393..6549422f393 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-avoid-c-arrays-ignores-main.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-c-arrays-ignores-main.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-avoid-c-arrays-ignores-three-arg-main.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-c-arrays-ignores-three-arg-main.cpp
index 22a4016f79f..22a4016f79f 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-avoid-c-arrays-ignores-three-arg-main.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-c-arrays-ignores-three-arg-main.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-avoid-c-arrays.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-c-arrays.cpp
index dd3078010eb..dd3078010eb 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-avoid-c-arrays.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-c-arrays.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-concat-nested-namespaces.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-concat-nested-namespaces.cpp
index dcde32d0f06..dcde32d0f06 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-concat-nested-namespaces.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-concat-nested-namespaces.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-deprecated-headers-cxx03.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-headers-cxx03.cpp
index 4511f46d57b..4511f46d57b 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-deprecated-headers-cxx03.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-headers-cxx03.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-deprecated-headers-cxx11.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-headers-cxx11.cpp
index c3374a9123b..c3374a9123b 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-deprecated-headers-cxx11.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-headers-cxx11.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-deprecated-ios-base-aliases.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-ios-base-aliases.cpp
index 680cb9ec40b..680cb9ec40b 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-deprecated-ios-base-aliases.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-ios-base-aliases.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-assert-failure.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-assert-failure.cpp
index fab51dafd2e..fab51dafd2e 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-assert-failure.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-assert-failure.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-basic.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-basic.cpp
index 06b1b739632..06b1b739632 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-basic.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-basic.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-camelback.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-camelback.cpp
index 42c492f58b5..42c492f58b5 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-camelback.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-camelback.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-const.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-const.cpp
index fd3bddedd56..fd3bddedd56 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-const.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-const.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-extra.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-extra.cpp
index d57c335d922..d57c335d922 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-extra.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-extra.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-lowercase.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-lowercase.cpp
index 1389376b2e4..1389376b2e4 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-lowercase.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-lowercase.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-negative.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-negative.cpp
index 607baaed5dd..607baaed5dd 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-negative.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-negative.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-uppercase.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-uppercase.cpp
index 09e5f45ed04..09e5f45ed04 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-uppercase.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-uppercase.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-loop-convert.c b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert.c
index 4c7d956c31d..4c7d956c31d 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-loop-convert.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert.c
diff --git a/clang-tools-extra/test/clang-tidy/modernize-make-shared-header.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-make-shared-header.cpp
index 8f293312f0d..8f293312f0d 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-make-shared-header.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-make-shared-header.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-make-shared.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-make-shared.cpp
index e046801e242..e046801e242 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-make-shared.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-make-shared.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-make-unique-cxx11.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-cxx11.cpp
index 9cd58b4198f..9cd58b4198f 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-make-unique-cxx11.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-cxx11.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-make-unique-header.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-header.cpp
index 88d82d6b38c..88d82d6b38c 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-make-unique-header.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-header.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-make-unique-inaccessible-ctors.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-inaccessible-ctors.cpp
index 31821f24754..31821f24754 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-make-unique-inaccessible-ctors.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-inaccessible-ctors.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-make-unique-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-macros.cpp
index 3a7da911260..3a7da911260 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-make-unique-macros.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-macros.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-make-unique.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique.cpp
index 4cc195dabdd..4cc195dabdd 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-make-unique.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-pass-by-value-header.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value-header.cpp
index 992ad27c61f..992ad27c61f 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-pass-by-value-header.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value-header.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-pass-by-value-macro-header.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value-macro-header.cpp
index 5bfe680f583..5bfe680f583 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-pass-by-value-macro-header.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value-macro-header.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-pass-by-value-multi-fixes.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value-multi-fixes.cpp
index 7980c301c57..7980c301c57 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-pass-by-value-multi-fixes.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value-multi-fixes.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-pass-by-value.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value.cpp
index 6bf68ca0b6a..6bf68ca0b6a 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-pass-by-value.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-raw-string-literal-delimiter.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-raw-string-literal-delimiter.cpp
index 2507a6f6974..2507a6f6974 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-raw-string-literal-delimiter.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-raw-string-literal-delimiter.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-raw-string-literal-replace-shorter.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-raw-string-literal-replace-shorter.cpp
index 673a8aa5af8..673a8aa5af8 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-raw-string-literal-replace-shorter.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-raw-string-literal-replace-shorter.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-raw-string-literal.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-raw-string-literal.cpp
index 0fb0db10181..0fb0db10181 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-raw-string-literal.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-raw-string-literal.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-redundant-void-arg-delayed.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-redundant-void-arg-delayed.cpp
index dd887758819..dd887758819 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-redundant-void-arg-delayed.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-redundant-void-arg-delayed.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-redundant-void-arg.c b/clang-tools-extra/test/clang-tidy/checkers/modernize-redundant-void-arg.c
index fdaf3757069..fdaf3757069 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-redundant-void-arg.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-redundant-void-arg.c
diff --git a/clang-tools-extra/test/clang-tidy/modernize-redundant-void-arg.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-redundant-void-arg.cpp
index 0fad5d55f4e..0fad5d55f4e 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-redundant-void-arg.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-redundant-void-arg.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-replace-auto-ptr.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-replace-auto-ptr.cpp
index c54ba1c75c6..c54ba1c75c6 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-replace-auto-ptr.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-replace-auto-ptr.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-replace-random-shuffle.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-replace-random-shuffle.cpp
index f96a60b3778..f96a60b3778 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-replace-random-shuffle.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-replace-random-shuffle.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-return-braced-init-list.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-return-braced-init-list.cpp
index 29d81c6df1f..29d81c6df1f 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-return-braced-init-list.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-return-braced-init-list.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-shrink-to-fit.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-shrink-to-fit.cpp
index 6993d300c25..6993d300c25 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-shrink-to-fit.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-shrink-to-fit.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-unary-static-assert.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-unary-static-assert.cpp
index 97ad94834cd..97ad94834cd 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-unary-static-assert.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-unary-static-assert.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-auto-cast-remove-stars.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-cast-remove-stars.cpp
index 5fbc243c66a..5fbc243c66a 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-auto-cast-remove-stars.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-cast-remove-stars.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-auto-cast.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-cast.cpp
index 47c12471fec..47c12471fec 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-auto-cast.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-cast.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-auto-iterator.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-iterator.cpp
index 9690972a97c..9690972a97c 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-auto-iterator.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-iterator.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-auto-min-type-name-length.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-min-type-name-length.cpp
index dd79ad416ed..dd79ad416ed 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-auto-min-type-name-length.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-min-type-name-length.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-auto-new-remove-stars.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-new-remove-stars.cpp
index 3eb1bf9d769..3eb1bf9d769 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-auto-new-remove-stars.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-new-remove-stars.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-auto-new.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-new.cpp
index c9a438971cf..c9a438971cf 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-auto-new.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-new.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-bool-literals-ignore-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-bool-literals-ignore-macros.cpp
index fc0ec47186a..fc0ec47186a 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-bool-literals-ignore-macros.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-bool-literals-ignore-macros.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-bool-literals.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-bool-literals.cpp
index a6b66be92a0..a6b66be92a0 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-bool-literals.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-bool-literals.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-default-member-init-assignment.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init-assignment.cpp
index f27a95bcc30..f27a95bcc30 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-default-member-init-assignment.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init-assignment.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-default-member-init-bitfield.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init-bitfield.cpp
index 2eaf8f8a62e..2eaf8f8a62e 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-default-member-init-bitfield.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init-bitfield.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-default-member-init-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init-macros.cpp
index 62be60c9768..62be60c9768 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-default-member-init-macros.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init-macros.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-default-member-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init.cpp
index 5af9855835c..5af9855835c 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-default-member-init.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-emplace-ignore-implicit-constructors.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-emplace-ignore-implicit-constructors.cpp
index 538b641c03c..538b641c03c 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-emplace-ignore-implicit-constructors.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-emplace-ignore-implicit-constructors.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-emplace.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-emplace.cpp
index 4e74d49d33f..4e74d49d33f 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-emplace.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-emplace.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-equals-default-copy.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default-copy.cpp
index 8aa80d8a957..8aa80d8a957 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-equals-default-copy.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default-copy.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-equals-default-delayed.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default-delayed.cpp
index f39efd8452f..f39efd8452f 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-equals-default-delayed.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default-delayed.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-equals-default-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default-macros.cpp
index a660f81e293..a660f81e293 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-equals-default-macros.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default-macros.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-equals-default.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default.cpp
index c214f6a5739..c214f6a5739 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-equals-default.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-equals-delete-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-delete-macros.cpp
index f20804f1e59..f20804f1e59 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-equals-delete-macros.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-delete-macros.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-equals-delete.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-delete.cpp
index 988c8e5b2b9..988c8e5b2b9 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-equals-delete.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-delete.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-nodiscard-clang-unused.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-clang-unused.cpp
index 0d29a032274..0d29a032274 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-nodiscard-clang-unused.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-clang-unused.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-nodiscard-cxx11.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-cxx11.cpp
index 8c75043a064..8c75043a064 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-nodiscard-cxx11.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-cxx11.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-nodiscard-gcc-unused.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-gcc-unused.cpp
index 7ddcb7aff38..7ddcb7aff38 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-nodiscard-gcc-unused.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-gcc-unused.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-nodiscard-no-macro-inscope-cxx11.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-no-macro-inscope-cxx11.cpp
index 5ac821ad466..5ac821ad466 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-nodiscard-no-macro-inscope-cxx11.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-no-macro-inscope-cxx11.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-nodiscard-no-macro.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-no-macro.cpp
index 578df3665f8..578df3665f8 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-nodiscard-no-macro.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-no-macro.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-nodiscard.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard.cpp
index a571f096363..a571f096363 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-nodiscard.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-noexcept-macro.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-noexcept-macro.cpp
index 77b59cf51df..77b59cf51df 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-noexcept-macro.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-noexcept-macro.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-noexcept-opt.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-noexcept-opt.cpp
index 92c1387d64d..92c1387d64d 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-noexcept-opt.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-noexcept-opt.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-noexcept.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-noexcept.cpp
index 863a4ed9a6f..863a4ed9a6f 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-noexcept.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-noexcept.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-nullptr-basic.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nullptr-basic.cpp
index 5fd823b754e..5fd823b754e 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-nullptr-basic.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nullptr-basic.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-nullptr.c b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nullptr.c
index c2ccbbd8117..c2ccbbd8117 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-nullptr.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nullptr.c
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-nullptr.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nullptr.cpp
index d7b78ac9c3f..d7b78ac9c3f 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-nullptr.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nullptr.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-override-cxx98.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-cxx98.cpp
index aaa9d35cdef..aaa9d35cdef 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-override-cxx98.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-cxx98.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-override-ms.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-ms.cpp
index e7c00895860..e7c00895860 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-override-ms.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-ms.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-override-no-destructors.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-no-destructors.cpp
index aa8ee42eb84..aa8ee42eb84 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-override-no-destructors.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-no-destructors.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-override-with-macro.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-with-macro.cpp
index 37013adaff8..37013adaff8 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-override-with-macro.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-with-macro.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-override-with-no-macro-inscope.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-with-no-macro-inscope.cpp
index f0cbdc5c2b1..f0cbdc5c2b1 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-override-with-no-macro-inscope.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-with-no-macro-inscope.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-override.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-override.cpp
index 8e4e113e4f4..8e4e113e4f4 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-override.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-override.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-trailing-return-type.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-trailing-return-type.cpp
index 15b3e274707..15b3e274707 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-trailing-return-type.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-trailing-return-type.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-transparent-functors.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-transparent-functors.cpp
index dde427a7920..dde427a7920 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-transparent-functors.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-transparent-functors.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-uncaught-exceptions.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-uncaught-exceptions.cpp
index 8f399c21ca0..8f399c21ca0 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-uncaught-exceptions.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-uncaught-exceptions.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-using-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-using-macros.cpp
index 93a50eb5ba0..93a50eb5ba0 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-using-macros.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-using-macros.cpp
diff --git a/clang-tools-extra/test/clang-tidy/modernize-use-using.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-using.cpp
index efa4030d001..efa4030d001 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-use-using.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-using.cpp
diff --git a/clang-tools-extra/test/clang-tidy/mpi-buffer-deref.cpp b/clang-tools-extra/test/clang-tidy/checkers/mpi-buffer-deref.cpp
index 47d58a5a6c4..47d58a5a6c4 100644
--- a/clang-tools-extra/test/clang-tidy/mpi-buffer-deref.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/mpi-buffer-deref.cpp
diff --git a/clang-tools-extra/test/clang-tidy/mpi-type-mismatch.cpp b/clang-tools-extra/test/clang-tidy/checkers/mpi-type-mismatch.cpp
index bf978dcc188..bf978dcc188 100644
--- a/clang-tools-extra/test/clang-tidy/mpi-type-mismatch.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/mpi-type-mismatch.cpp
diff --git a/clang-tools-extra/test/clang-tidy/objc-avoid-nserror-init.m b/clang-tools-extra/test/clang-tidy/checkers/objc-avoid-nserror-init.m
index 77940779cf4..77940779cf4 100644
--- a/clang-tools-extra/test/clang-tidy/objc-avoid-nserror-init.m
+++ b/clang-tools-extra/test/clang-tidy/checkers/objc-avoid-nserror-init.m
diff --git a/clang-tools-extra/test/clang-tidy/objc-forbidden-subclassing-custom.m b/clang-tools-extra/test/clang-tidy/checkers/objc-forbidden-subclassing-custom.m
index 59e6a880033..59e6a880033 100644
--- a/clang-tools-extra/test/clang-tidy/objc-forbidden-subclassing-custom.m
+++ b/clang-tools-extra/test/clang-tidy/checkers/objc-forbidden-subclassing-custom.m
diff --git a/clang-tools-extra/test/clang-tidy/objc-forbidden-subclassing.m b/clang-tools-extra/test/clang-tidy/checkers/objc-forbidden-subclassing.m
index 3ad38bf479b..3ad38bf479b 100644
--- a/clang-tools-extra/test/clang-tidy/objc-forbidden-subclassing.m
+++ b/clang-tools-extra/test/clang-tidy/checkers/objc-forbidden-subclassing.m
diff --git a/clang-tools-extra/test/clang-tidy/objc-missing-hash.m b/clang-tools-extra/test/clang-tidy/checkers/objc-missing-hash.m
index b9cc9d023ad..b9cc9d023ad 100644
--- a/clang-tools-extra/test/clang-tidy/objc-missing-hash.m
+++ b/clang-tools-extra/test/clang-tidy/checkers/objc-missing-hash.m
diff --git a/clang-tools-extra/test/clang-tidy/objc-property-declaration.m b/clang-tools-extra/test/clang-tidy/checkers/objc-property-declaration.m
index b56bdcd186c..b56bdcd186c 100644
--- a/clang-tools-extra/test/clang-tidy/objc-property-declaration.m
+++ b/clang-tools-extra/test/clang-tidy/checkers/objc-property-declaration.m
diff --git a/clang-tools-extra/test/clang-tidy/objc-super-self.m b/clang-tools-extra/test/clang-tidy/checkers/objc-super-self.m
index 9653cd22490..9653cd22490 100644
--- a/clang-tools-extra/test/clang-tidy/objc-super-self.m
+++ b/clang-tools-extra/test/clang-tidy/checkers/objc-super-self.m
diff --git a/clang-tools-extra/test/clang-tidy/openmp-exception-escape.cpp b/clang-tools-extra/test/clang-tidy/checkers/openmp-exception-escape.cpp
index 73345836925..73345836925 100644
--- a/clang-tools-extra/test/clang-tidy/openmp-exception-escape.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/openmp-exception-escape.cpp
diff --git a/clang-tools-extra/test/clang-tidy/openmp-use-default-none.cpp b/clang-tools-extra/test/clang-tidy/checkers/openmp-use-default-none.cpp
index 35d2d17b1e0..35d2d17b1e0 100644
--- a/clang-tools-extra/test/clang-tidy/openmp-use-default-none.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/openmp-use-default-none.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-faster-string-find.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-faster-string-find.cpp
index b36e32301f5..b36e32301f5 100644
--- a/clang-tools-extra/test/clang-tidy/performance-faster-string-find.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance-faster-string-find.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-for-range-copy-allowed-types.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-for-range-copy-allowed-types.cpp
index c40347c6d35..c40347c6d35 100644
--- a/clang-tools-extra/test/clang-tidy/performance-for-range-copy-allowed-types.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance-for-range-copy-allowed-types.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-for-range-copy-warn-on-all-auto-copies.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-for-range-copy-warn-on-all-auto-copies.cpp
index 99d23a971f5..99d23a971f5 100644
--- a/clang-tools-extra/test/clang-tidy/performance-for-range-copy-warn-on-all-auto-copies.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance-for-range-copy-warn-on-all-auto-copies.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-for-range-copy.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-for-range-copy.cpp
index e51142161ed..e51142161ed 100644
--- a/clang-tools-extra/test/clang-tidy/performance-for-range-copy.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance-for-range-copy.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-implicit-conversion-in-loop.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-implicit-conversion-in-loop.cpp
index 72f9e526653..72f9e526653 100644
--- a/clang-tools-extra/test/clang-tidy/performance-implicit-conversion-in-loop.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance-implicit-conversion-in-loop.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-inefficient-algorithm.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-algorithm.cpp
index aa4e30d6f3f..aa4e30d6f3f 100644
--- a/clang-tools-extra/test/clang-tidy/performance-inefficient-algorithm.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-algorithm.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-inefficient-string-concatenation.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-string-concatenation.cpp
index 1dbd56b3222..1dbd56b3222 100644
--- a/clang-tools-extra/test/clang-tidy/performance-inefficient-string-concatenation.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-string-concatenation.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-inefficient-vector-operation.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-vector-operation.cpp
index ffac24c2b9a..ffac24c2b9a 100644
--- a/clang-tools-extra/test/clang-tidy/performance-inefficient-vector-operation.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-vector-operation.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-move-const-arg-trivially-copyable.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-move-const-arg-trivially-copyable.cpp
index 2bf1de46de8..2bf1de46de8 100644
--- a/clang-tools-extra/test/clang-tidy/performance-move-const-arg-trivially-copyable.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance-move-const-arg-trivially-copyable.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-move-const-arg.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-move-const-arg.cpp
index 06ed6e0b56b..06ed6e0b56b 100644
--- a/clang-tools-extra/test/clang-tidy/performance-move-const-arg.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance-move-const-arg.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-move-constructor-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-move-constructor-init.cpp
index ddc1107d14c..ddc1107d14c 100644
--- a/clang-tools-extra/test/clang-tidy/performance-move-constructor-init.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance-move-constructor-init.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-noexcept-move-constructor-fix.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-noexcept-move-constructor-fix.cpp
index 6b6e6c2cb02..6b6e6c2cb02 100644
--- a/clang-tools-extra/test/clang-tidy/performance-noexcept-move-constructor-fix.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance-noexcept-move-constructor-fix.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-noexcept-move-constructor.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-noexcept-move-constructor.cpp
index 70d70650c1d..70d70650c1d 100644
--- a/clang-tools-extra/test/clang-tidy/performance-noexcept-move-constructor.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance-noexcept-move-constructor.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-type-promotion-in-math-fn.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-type-promotion-in-math-fn.cpp
index b2da7cc393a..b2da7cc393a 100644
--- a/clang-tools-extra/test/clang-tidy/performance-type-promotion-in-math-fn.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance-type-promotion-in-math-fn.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-unnecessary-copy-initialization-allowed-types.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-copy-initialization-allowed-types.cpp
index 420efa8dbe3..420efa8dbe3 100644
--- a/clang-tools-extra/test/clang-tidy/performance-unnecessary-copy-initialization-allowed-types.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-copy-initialization-allowed-types.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-unnecessary-copy-initialization.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-copy-initialization.cpp
index 50dcfd8f8bf..50dcfd8f8bf 100644
--- a/clang-tools-extra/test/clang-tidy/performance-unnecessary-copy-initialization.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-copy-initialization.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param-allowed-types.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-allowed-types.cpp
index 054732cd99d..054732cd99d 100644
--- a/clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param-allowed-types.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-allowed-types.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param-arc.m b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-arc.m
index 0a9ea0639ec..0a9ea0639ec 100644
--- a/clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param-arc.m
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-arc.m
diff --git a/clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param-arc.mm b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-arc.mm
index 4ed05069a4b..4ed05069a4b 100644
--- a/clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param-arc.mm
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-arc.mm
diff --git a/clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param-delayed.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-delayed.cpp
index 623bf8b3082..623bf8b3082 100644
--- a/clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param-delayed.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-delayed.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param-header.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-header.cpp
index 6c09fca330b..6c09fca330b 100644
--- a/clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param-header.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-header.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param-incomplete-type.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-incomplete-type.cpp
index e46163a3e23..e46163a3e23 100644
--- a/clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param-incomplete-type.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-incomplete-type.cpp
diff --git a/clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param.cpp
index f801494cf0f..f801494cf0f 100644
--- a/clang-tools-extra/test/clang-tidy/performance-unnecessary-value-param.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param.cpp
diff --git a/clang-tools-extra/test/clang-tidy/portability-simd-intrinsics-ppc.cpp b/clang-tools-extra/test/clang-tidy/checkers/portability-simd-intrinsics-ppc.cpp
index e8700bc15d7..e8700bc15d7 100644
--- a/clang-tools-extra/test/clang-tidy/portability-simd-intrinsics-ppc.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/portability-simd-intrinsics-ppc.cpp
diff --git a/clang-tools-extra/test/clang-tidy/portability-simd-intrinsics-x86.cpp b/clang-tools-extra/test/clang-tidy/checkers/portability-simd-intrinsics-x86.cpp
index 3ec64e0f713..3ec64e0f713 100644
--- a/clang-tools-extra/test/clang-tidy/portability-simd-intrinsics-x86.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/portability-simd-intrinsics-x86.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-avoid-const-params-in-decls.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-avoid-const-params-in-decls.cpp
index c2c12a429fb..c2c12a429fb 100644
--- a/clang-tools-extra/test/clang-tidy/readability-avoid-const-params-in-decls.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-avoid-const-params-in-decls.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-avoid-underscore-in-googletest-name.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-avoid-underscore-in-googletest-name.cpp
index 6e8a5c2d50a..6e8a5c2d50a 100644
--- a/clang-tools-extra/test/clang-tidy/readability-avoid-underscore-in-googletest-name.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-avoid-underscore-in-googletest-name.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-braces-around-statements-assert-failure.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-assert-failure.cpp
index 7d619c0ba59..7d619c0ba59 100644
--- a/clang-tools-extra/test/clang-tidy/readability-braces-around-statements-assert-failure.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-assert-failure.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-braces-around-statements-few-lines.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-few-lines.cpp
index 00d253a8f1c..00d253a8f1c 100644
--- a/clang-tools-extra/test/clang-tidy/readability-braces-around-statements-few-lines.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-few-lines.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-braces-around-statements-format.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-format.cpp
index 81f832dc7c2..81f832dc7c2 100644
--- a/clang-tools-extra/test/clang-tidy/readability-braces-around-statements-format.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-format.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-braces-around-statements-same-line.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-same-line.cpp
index 504043f3086..504043f3086 100644
--- a/clang-tools-extra/test/clang-tidy/readability-braces-around-statements-same-line.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-same-line.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-braces-around-statements-single-line.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-single-line.cpp
index 3edbd4bf8e6..3edbd4bf8e6 100644
--- a/clang-tools-extra/test/clang-tidy/readability-braces-around-statements-single-line.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-single-line.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-braces-around-statements.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements.cpp
index 8dc5bf150fa..8dc5bf150fa 100644
--- a/clang-tools-extra/test/clang-tidy/readability-braces-around-statements.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-const-return-type.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-const-return-type.cpp
index 78557c5e652..78557c5e652 100644
--- a/clang-tools-extra/test/clang-tidy/readability-const-return-type.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-const-return-type.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-container-size-empty.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-container-size-empty.cpp
index c67d9275bbf..c67d9275bbf 100644
--- a/clang-tools-extra/test/clang-tidy/readability-container-size-empty.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-container-size-empty.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-convert-member-functions-to-static.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-convert-member-functions-to-static.cpp
index 9612fa9de8c..9612fa9de8c 100644
--- a/clang-tools-extra/test/clang-tidy/readability-convert-member-functions-to-static.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-convert-member-functions-to-static.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-delete-null-pointer.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-delete-null-pointer.cpp
index 5a7ccae4d52..5a7ccae4d52 100644
--- a/clang-tools-extra/test/clang-tidy/readability-delete-null-pointer.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-delete-null-pointer.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-deleted-default.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-deleted-default.cpp
index 232f224128a..232f224128a 100644
--- a/clang-tools-extra/test/clang-tidy/readability-deleted-default.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-deleted-default.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-else-after-return-if-constexpr.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return-if-constexpr.cpp
index 6532940eaf2..6532940eaf2 100644
--- a/clang-tools-extra/test/clang-tidy/readability-else-after-return-if-constexpr.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return-if-constexpr.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-else-after-return.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return.cpp
index f9e52e01243..f9e52e01243 100644
--- a/clang-tools-extra/test/clang-tidy/readability-else-after-return.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-function-size-variables-c++17.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-function-size-variables-c++17.cpp
index 8af0d9668b7..8af0d9668b7 100644
--- a/clang-tools-extra/test/clang-tidy/readability-function-size-variables-c++17.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-function-size-variables-c++17.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-function-size.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-function-size.cpp
index 9c52f1e6e1c..9c52f1e6e1c 100644
--- a/clang-tools-extra/test/clang-tidy/readability-function-size.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-function-size.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-identifier-naming-bugfix.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-bugfix.cpp
index 9f892ebcecc..9f892ebcecc 100644
--- a/clang-tools-extra/test/clang-tidy/readability-identifier-naming-bugfix.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-bugfix.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-identifier-naming-objc.m b/clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-objc.m
index ab123c27202..ab123c27202 100644
--- a/clang-tools-extra/test/clang-tidy/readability-identifier-naming-objc.m
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-objc.m
diff --git a/clang-tools-extra/test/clang-tidy/readability-identifier-naming.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming.cpp
index c9509434813..c9509434813 100644
--- a/clang-tools-extra/test/clang-tidy/readability-identifier-naming.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-implicit-bool-conversion-allow-in-conditions.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-implicit-bool-conversion-allow-in-conditions.cpp
index bd149ef5844..bd149ef5844 100644
--- a/clang-tools-extra/test/clang-tidy/readability-implicit-bool-conversion-allow-in-conditions.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-implicit-bool-conversion-allow-in-conditions.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-implicit-bool-conversion-cxx98.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-implicit-bool-conversion-cxx98.cpp
index 861677ac6c3..861677ac6c3 100644
--- a/clang-tools-extra/test/clang-tidy/readability-implicit-bool-conversion-cxx98.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-implicit-bool-conversion-cxx98.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-implicit-bool-conversion.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-implicit-bool-conversion.cpp
index d5e9bee4294..d5e9bee4294 100644
--- a/clang-tools-extra/test/clang-tidy/readability-implicit-bool-conversion.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-implicit-bool-conversion.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-inconsistent-declaration-parameter-name-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-inconsistent-declaration-parameter-name-macros.cpp
index 4dcf99ec8ef..4dcf99ec8ef 100644
--- a/clang-tools-extra/test/clang-tidy/readability-inconsistent-declaration-parameter-name-macros.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-inconsistent-declaration-parameter-name-macros.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-inconsistent-declaration-parameter-name-strict.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-inconsistent-declaration-parameter-name-strict.cpp
index a02492b673a..a02492b673a 100644
--- a/clang-tools-extra/test/clang-tidy/readability-inconsistent-declaration-parameter-name-strict.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-inconsistent-declaration-parameter-name-strict.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-inconsistent-declaration-parameter-name.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-inconsistent-declaration-parameter-name.cpp
index f00ebfa896a..f00ebfa896a 100644
--- a/clang-tools-extra/test/clang-tidy/readability-inconsistent-declaration-parameter-name.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-inconsistent-declaration-parameter-name.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-isolate-declaration-cxx17.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration-cxx17.cpp
index ac2652771a8..ac2652771a8 100644
--- a/clang-tools-extra/test/clang-tidy/readability-isolate-declaration-cxx17.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration-cxx17.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-isolate-declaration-fixing.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration-fixing.cpp
index 3bd1982b34f..3bd1982b34f 100644
--- a/clang-tools-extra/test/clang-tidy/readability-isolate-declaration-fixing.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration-fixing.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-isolate-declaration-no-infinite-loop.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration-no-infinite-loop.cpp
index 78a8ec73880..78a8ec73880 100644
--- a/clang-tools-extra/test/clang-tidy/readability-isolate-declaration-no-infinite-loop.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration-no-infinite-loop.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-isolate-declaration.c b/clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration.c
index e09a581fa9f..e09a581fa9f 100644
--- a/clang-tools-extra/test/clang-tidy/readability-isolate-declaration.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration.c
diff --git a/clang-tools-extra/test/clang-tidy/readability-isolate-declaration.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration.cpp
index 7489d5db7df..7489d5db7df 100644
--- a/clang-tools-extra/test/clang-tidy/readability-isolate-declaration.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-magic-numbers.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-magic-numbers.cpp
index 3cf9dc52ea2..3cf9dc52ea2 100644
--- a/clang-tools-extra/test/clang-tidy/readability-magic-numbers.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-magic-numbers.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-misleading-indentation.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-misleading-indentation.cpp
index 40399492354..40399492354 100644
--- a/clang-tools-extra/test/clang-tidy/readability-misleading-indentation.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-misleading-indentation.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-misplaced-array-index.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-misplaced-array-index.cpp
index 43dd4583d5e..43dd4583d5e 100644
--- a/clang-tools-extra/test/clang-tidy/readability-misplaced-array-index.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-misplaced-array-index.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-named-parameter.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-named-parameter.cpp
index af2c1954bc5..af2c1954bc5 100644
--- a/clang-tools-extra/test/clang-tidy/readability-named-parameter.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-named-parameter.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-non-const-parameter.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-non-const-parameter.cpp
index 6cd1f9130f2..6cd1f9130f2 100644
--- a/clang-tools-extra/test/clang-tidy/readability-non-const-parameter.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-non-const-parameter.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-control-flow.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-control-flow.cpp
index 0352e3a9444..0352e3a9444 100644
--- a/clang-tools-extra/test/clang-tidy/readability-redundant-control-flow.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-control-flow.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-declaration-ignore-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-declaration-ignore-macros.cpp
index 8e556f5d26b..8e556f5d26b 100644
--- a/clang-tools-extra/test/clang-tidy/readability-redundant-declaration-ignore-macros.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-declaration-ignore-macros.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-declaration.c b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-declaration.c
index 21172637268..21172637268 100644
--- a/clang-tools-extra/test/clang-tidy/readability-redundant-declaration.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-declaration.c
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-declaration.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-declaration.cpp
index 47c9584311b..47c9584311b 100644
--- a/clang-tools-extra/test/clang-tidy/readability-redundant-declaration.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-declaration.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-function-ptr-dereference.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-function-ptr-dereference.cpp
index 2b34ce1df55..2b34ce1df55 100644
--- a/clang-tools-extra/test/clang-tidy/readability-redundant-function-ptr-dereference.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-function-ptr-dereference.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-member-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-member-init.cpp
index 90b52fd1a48..90b52fd1a48 100644
--- a/clang-tools-extra/test/clang-tidy/readability-redundant-member-init.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-member-init.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-preprocessor-ifdef.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-preprocessor-ifdef.cpp
index 72b608b1c2c..72b608b1c2c 100644
--- a/clang-tools-extra/test/clang-tidy/readability-redundant-preprocessor-ifdef.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-preprocessor-ifdef.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-preprocessor.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-preprocessor.cpp
index 6cffd8f4389..6cffd8f4389 100644
--- a/clang-tools-extra/test/clang-tidy/readability-redundant-preprocessor.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-preprocessor.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-preprocessor.h b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-preprocessor.h
index dfe5f9733af..dfe5f9733af 100644
--- a/clang-tools-extra/test/clang-tidy/readability-redundant-preprocessor.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-preprocessor.h
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-smartptr-get-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-smartptr-get-macros.cpp
index 91af3fcec61..91af3fcec61 100644
--- a/clang-tools-extra/test/clang-tidy/readability-redundant-smartptr-get-macros.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-smartptr-get-macros.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-smartptr-get-msvc.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-smartptr-get-msvc.cpp
index bd8990a27b2..bd8990a27b2 100644
--- a/clang-tools-extra/test/clang-tidy/readability-redundant-smartptr-get-msvc.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-smartptr-get-msvc.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-smartptr-get.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-smartptr-get.cpp
index 51d98796265..51d98796265 100644
--- a/clang-tools-extra/test/clang-tidy/readability-redundant-smartptr-get.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-smartptr-get.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-string-cstr-msvc.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-cstr-msvc.cpp
index a6b6b20728c..a6b6b20728c 100644
--- a/clang-tools-extra/test/clang-tidy/readability-redundant-string-cstr-msvc.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-cstr-msvc.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-string-cstr.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-cstr.cpp
index d8434d3ca7c..d8434d3ca7c 100644
--- a/clang-tools-extra/test/clang-tidy/readability-redundant-string-cstr.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-cstr.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-string-init-msvc.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init-msvc.cpp
index fe05845db66..fe05845db66 100644
--- a/clang-tools-extra/test/clang-tidy/readability-redundant-string-init-msvc.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init-msvc.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-string-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init.cpp
index b88e4a0f4d6..b88e4a0f4d6 100644
--- a/clang-tools-extra/test/clang-tidy/readability-redundant-string-init.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-simplify-bool-expr-chained-conditional-assignment.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-chained-conditional-assignment.cpp
index 65b86c3736c..65b86c3736c 100644
--- a/clang-tools-extra/test/clang-tidy/readability-simplify-bool-expr-chained-conditional-assignment.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-chained-conditional-assignment.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-simplify-bool-expr-chained-conditional-return.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-chained-conditional-return.cpp
index fb8759cf522..fb8759cf522 100644
--- a/clang-tools-extra/test/clang-tidy/readability-simplify-bool-expr-chained-conditional-return.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-chained-conditional-return.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-simplify-bool-expr-members.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-members.cpp
index e72091121e8..e72091121e8 100644
--- a/clang-tools-extra/test/clang-tidy/readability-simplify-bool-expr-members.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-members.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-simplify-bool-expr.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr.cpp
index cd93c5d4be7..cd93c5d4be7 100644
--- a/clang-tools-extra/test/clang-tidy/readability-simplify-bool-expr.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-simplify-subscript-expr.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-simplify-subscript-expr.cpp
index 16197dcda67..16197dcda67 100644
--- a/clang-tools-extra/test/clang-tidy/readability-simplify-subscript-expr.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-simplify-subscript-expr.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-static-accessed-through-instance-nesting-threshold.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-static-accessed-through-instance-nesting-threshold.cpp
index 03752497b40..03752497b40 100644
--- a/clang-tools-extra/test/clang-tidy/readability-static-accessed-through-instance-nesting-threshold.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-static-accessed-through-instance-nesting-threshold.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-static-accessed-through-instance.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-static-accessed-through-instance.cpp
index 9de96ae3a9d..9de96ae3a9d 100644
--- a/clang-tools-extra/test/clang-tidy/readability-static-accessed-through-instance.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-static-accessed-through-instance.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-static-definition-in-anonymous-namespace.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-static-definition-in-anonymous-namespace.cpp
index 5c3c8c12d68..5c3c8c12d68 100644
--- a/clang-tools-extra/test/clang-tidy/readability-static-definition-in-anonymous-namespace.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-static-definition-in-anonymous-namespace.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-string-compare.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-string-compare.cpp
index 45114edf2f0..45114edf2f0 100644
--- a/clang-tools-extra/test/clang-tidy/readability-string-compare.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-string-compare.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-uniqueptr-delete-release.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-uniqueptr-delete-release.cpp
index bd51bc62dba..bd51bc62dba 100644
--- a/clang-tools-extra/test/clang-tidy/readability-uniqueptr-delete-release.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-uniqueptr-delete-release.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-float16.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-float16.cpp
index b2b858f9345..b2b858f9345 100644
--- a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-float16.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-float16.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-floating-point-opencl-half.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-floating-point-opencl-half.cpp
index 8cea2a4d827..8cea2a4d827 100644
--- a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-floating-point-opencl-half.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-floating-point-opencl-half.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-floating-point.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-floating-point.cpp
index 50e75fae6ae..50e75fae6ae 100644
--- a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-floating-point.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-floating-point.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-hexadecimal-floating-point.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-hexadecimal-floating-point.cpp
index 415c6d8e791..415c6d8e791 100644
--- a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-hexadecimal-floating-point.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-hexadecimal-floating-point.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-integer-custom-list.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer-custom-list.cpp
index ff67a336b25..ff67a336b25 100644
--- a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-integer-custom-list.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer-custom-list.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-integer-macro.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer-macro.cpp
index 40a9c26584f..40a9c26584f 100644
--- a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-integer-macro.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer-macro.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-integer-ms.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer-ms.cpp
index 1ec3211e58d..1ec3211e58d 100644
--- a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-integer-ms.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer-ms.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-integer.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer.cpp
index a6f38a8e7f2..a6f38a8e7f2 100644
--- a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix-integer.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix.h b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix.h
index 680321e734c..680321e734c 100644
--- a/clang-tools-extra/test/clang-tidy/readability-uppercase-literal-suffix.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix.h
diff --git a/clang-tools-extra/test/clang-tidy/zircon-temporary-objects.cpp b/clang-tools-extra/test/clang-tidy/checkers/zircon-temporary-objects.cpp
index 6090fe9e9ac..6090fe9e9ac 100644
--- a/clang-tools-extra/test/clang-tidy/zircon-temporary-objects.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/zircon-temporary-objects.cpp
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/Headers/a.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/Headers/a.h
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/Headers/a.h
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/Headers/b.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/Headers/b.h
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/Headers/b.h
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/Headers/s.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/Headers/s.h
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/Headers/s.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/Headers/stdio.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/Headers/stdio.h
index eebe9fd914a..eebe9fd914a 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/Headers/stdio.h
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/Headers/stdio.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/compilation-database/template.json b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/compilation-database/template.json
index 74275d95372..74275d95372 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/compilation-database/template.json
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/compilation-database/template.json
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/config-files/.clang-tidy b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/config-files/.clang-tidy
index 942169f2ec4..942169f2ec4 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/config-files/.clang-tidy
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/config-files/.clang-tidy
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/config-files/1/.clang-tidy b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/config-files/1/.clang-tidy
index 800fd4e8eb2..800fd4e8eb2 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/config-files/1/.clang-tidy
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/config-files/1/.clang-tidy
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/empty-database/compile_commands.json b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/empty-database/compile_commands.json
index 395d13dc090..395d13dc090 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/empty-database/compile_commands.json
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/empty-database/compile_commands.json
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/expand-modular-headers-ppcallbacks/a.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/expand-modular-headers-ppcallbacks/a.h
index 6651b4fa913..6651b4fa913 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/expand-modular-headers-ppcallbacks/a.h
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/expand-modular-headers-ppcallbacks/a.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/expand-modular-headers-ppcallbacks/b.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/expand-modular-headers-ppcallbacks/b.h
index 446eda1abd0..446eda1abd0 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/expand-modular-headers-ppcallbacks/b.h
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/expand-modular-headers-ppcallbacks/b.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/expand-modular-headers-ppcallbacks/c.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/expand-modular-headers-ppcallbacks/c.h
index 0d4c60df04b..0d4c60df04b 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/expand-modular-headers-ppcallbacks/c.h
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/expand-modular-headers-ppcallbacks/c.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/expand-modular-headers-ppcallbacks/module.modulemap b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/expand-modular-headers-ppcallbacks/module.modulemap
index d04240aff35..d04240aff35 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/expand-modular-headers-ppcallbacks/module.modulemap
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/expand-modular-headers-ppcallbacks/module.modulemap
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/explain-config/.clang-tidy b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/explain-config/.clang-tidy
index 4fbd09c3ef7..4fbd09c3ef7 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/explain-config/.clang-tidy
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/explain-config/.clang-tidy
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/file-filter/header1.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/file-filter/header1.h
index ba9e3d153ee..ba9e3d153ee 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/file-filter/header1.h
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/file-filter/header1.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/file-filter/header2.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/file-filter/header2.h
index 09bfeabc872..09bfeabc872 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/file-filter/header2.h
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/file-filter/header2.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/file-filter/system/system-header.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/file-filter/system/system-header.h
index 98482c4277d..98482c4277d 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/file-filter/system/system-header.h
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/file-filter/system/system-header.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/line-filter/header1.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/line-filter/header1.h
index 35d59ce5176..35d59ce5176 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/line-filter/header1.h
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/line-filter/header1.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/line-filter/header2.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/line-filter/header2.h
index bb12598959c..bb12598959c 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/line-filter/header2.h
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/line-filter/header2.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/line-filter/header3.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/line-filter/header3.h
index b5198ca08a4..b5198ca08a4 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/line-filter/header3.h
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/line-filter/header3.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/mock-libcxx/bin/clang b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/mock-libcxx/bin/clang
index ed34c1f8186..ed34c1f8186 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/mock-libcxx/bin/clang
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/mock-libcxx/bin/clang
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/mock-libcxx/include/c++/v1/mock_vector b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/mock-libcxx/include/c++/v1/mock_vector
index 35395267226..35395267226 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/mock-libcxx/include/c++/v1/mock_vector
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/mock-libcxx/include/c++/v1/mock_vector
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/nolint/trigger_warning.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/nolint/trigger_warning.h
index e8ebed25d38..e8ebed25d38 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/nolint/trigger_warning.h
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/nolint/trigger_warning.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/overlapping/o.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/overlapping/o.h
index bfa7a0a9b39..bfa7a0a9b39 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/overlapping/o.h
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/overlapping/o.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/vfsoverlay/actual_header.h b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/vfsoverlay/actual_header.h
index 8e1b9aef633..8e1b9aef633 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/vfsoverlay/actual_header.h
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/vfsoverlay/actual_header.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/vfsoverlay/vfsoverlay.yaml b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/vfsoverlay/vfsoverlay.yaml
index 80d8fbad562..80d8fbad562 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/vfsoverlay/vfsoverlay.yaml
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/vfsoverlay/vfsoverlay.yaml
diff --git a/clang-tools-extra/test/clang-tidy/alternative-fixes.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/alternative-fixes.cpp
index d5cee68d9b1..d5cee68d9b1 100644
--- a/clang-tools-extra/test/clang-tidy/alternative-fixes.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/alternative-fixes.cpp
diff --git a/clang-tools-extra/test/clang-tidy/basic.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/basic.cpp
index 12eb6febbac..12eb6febbac 100644
--- a/clang-tools-extra/test/clang-tidy/basic.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/basic.cpp
diff --git a/clang-tools-extra/test/clang-tidy/check_clang_tidy.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/check_clang_tidy.cpp
index 0e4c45d3950..0e4c45d3950 100644
--- a/clang-tools-extra/test/clang-tidy/check_clang_tidy.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/check_clang_tidy.cpp
diff --git a/clang-tools-extra/test/clang-tidy/clang-tidy-__clang_analyzer__macro.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-__clang_analyzer__macro.cpp
index 0fda1a393b2..0fda1a393b2 100644
--- a/clang-tools-extra/test/clang-tidy/clang-tidy-__clang_analyzer__macro.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-__clang_analyzer__macro.cpp
diff --git a/clang-tools-extra/test/clang-tidy/clang-tidy-diff.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-diff.cpp
index 2e18a43c8e9..2e18a43c8e9 100644
--- a/clang-tools-extra/test/clang-tidy/clang-tidy-diff.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-diff.cpp
diff --git a/clang-tools-extra/test/clang-tidy/clang-tidy-enable-check-profile-one-tu.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-enable-check-profile-one-tu.cpp
index df4cb93f2ce..df4cb93f2ce 100644
--- a/clang-tools-extra/test/clang-tidy/clang-tidy-enable-check-profile-one-tu.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-enable-check-profile-one-tu.cpp
diff --git a/clang-tools-extra/test/clang-tidy/clang-tidy-enable-check-profile-two-tu.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-enable-check-profile-two-tu.cpp
index 30603a2aa58..30603a2aa58 100644
--- a/clang-tools-extra/test/clang-tidy/clang-tidy-enable-check-profile-two-tu.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-enable-check-profile-two-tu.cpp
diff --git a/clang-tools-extra/test/clang-tidy/clang-tidy-mac-libcxx.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-mac-libcxx.cpp
index d124a344ec7..d124a344ec7 100644
--- a/clang-tools-extra/test/clang-tidy/clang-tidy-mac-libcxx.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-mac-libcxx.cpp
diff --git a/clang-tools-extra/test/clang-tidy/clang-tidy-run-with-database.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-run-with-database.cpp
index f8c05a3f69e..f8c05a3f69e 100644
--- a/clang-tools-extra/test/clang-tidy/clang-tidy-run-with-database.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-run-with-database.cpp
diff --git a/clang-tools-extra/test/clang-tidy/clang-tidy-store-check-profile-one-tu.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-store-check-profile-one-tu.cpp
index 832723ba4ab..832723ba4ab 100644
--- a/clang-tools-extra/test/clang-tidy/clang-tidy-store-check-profile-one-tu.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-store-check-profile-one-tu.cpp
diff --git a/clang-tools-extra/test/clang-tidy/clean-up-code.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/clean-up-code.cpp
index 15873ed168d..15873ed168d 100644
--- a/clang-tools-extra/test/clang-tidy/clean-up-code.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/clean-up-code.cpp
diff --git a/clang-tools-extra/test/clang-tidy/config-files.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/config-files.cpp
index 65ac54a85d6..65ac54a85d6 100644
--- a/clang-tools-extra/test/clang-tidy/config-files.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/config-files.cpp
diff --git a/clang-tools-extra/test/clang-tidy/custom-diagnostics.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/custom-diagnostics.cpp
index 81837702c4e..81837702c4e 100644
--- a/clang-tools-extra/test/clang-tidy/custom-diagnostics.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/custom-diagnostics.cpp
diff --git a/clang-tools-extra/test/clang-tidy/deduplication.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/deduplication.cpp
index 056fe4e5735..056fe4e5735 100644
--- a/clang-tools-extra/test/clang-tidy/deduplication.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/deduplication.cpp
diff --git a/clang-tools-extra/test/clang-tidy/diagnostic.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/diagnostic.cpp
index 0df6e2ab573..0df6e2ab573 100644
--- a/clang-tools-extra/test/clang-tidy/diagnostic.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/diagnostic.cpp
diff --git a/clang-tools-extra/test/clang-tidy/duplicate-reports.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/duplicate-reports.cpp
index 393c91566de..393c91566de 100644
--- a/clang-tools-extra/test/clang-tidy/duplicate-reports.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/duplicate-reports.cpp
diff --git a/clang-tools-extra/test/clang-tidy/empty-database.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/empty-database.cpp
index b8707d6caae..b8707d6caae 100644
--- a/clang-tools-extra/test/clang-tidy/empty-database.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/empty-database.cpp
diff --git a/clang-tools-extra/test/clang-tidy/enable-alpha-checks.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/enable-alpha-checks.cpp
index 74bdfdb5dd0..74bdfdb5dd0 100644
--- a/clang-tools-extra/test/clang-tidy/enable-alpha-checks.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/enable-alpha-checks.cpp
diff --git a/clang-tools-extra/test/clang-tidy/expand-modular-headers-ppcallbacks.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/expand-modular-headers-ppcallbacks.cpp
index c9b05517d21..c9b05517d21 100644
--- a/clang-tools-extra/test/clang-tidy/expand-modular-headers-ppcallbacks.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/expand-modular-headers-ppcallbacks.cpp
diff --git a/clang-tools-extra/test/clang-tidy/explain-checks.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/explain-checks.cpp
index 9bff30c2090..9bff30c2090 100644
--- a/clang-tools-extra/test/clang-tidy/explain-checks.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/explain-checks.cpp
diff --git a/clang-tools-extra/test/clang-tidy/export-diagnostics.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-diagnostics.cpp
index eb77be8fbdb..eb77be8fbdb 100644
--- a/clang-tools-extra/test/clang-tidy/export-diagnostics.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-diagnostics.cpp
diff --git a/clang-tools-extra/test/clang-tidy/export-relpath.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/export-relpath.cpp
index 5bfd41fae98..5bfd41fae98 100644
--- a/clang-tools-extra/test/clang-tidy/export-relpath.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/export-relpath.cpp
diff --git a/clang-tools-extra/test/clang-tidy/extra-args.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/extra-args.cpp
index d65aacc910e..d65aacc910e 100644
--- a/clang-tools-extra/test/clang-tidy/extra-args.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/extra-args.cpp
diff --git a/clang-tools-extra/test/clang-tidy/file-filter-symlinks.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/file-filter-symlinks.cpp
index 7efa7d070f6..7efa7d070f6 100644
--- a/clang-tools-extra/test/clang-tidy/file-filter-symlinks.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/file-filter-symlinks.cpp
diff --git a/clang-tools-extra/test/clang-tidy/file-filter.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/file-filter.cpp
index 9ee5cad979f..9ee5cad979f 100644
--- a/clang-tools-extra/test/clang-tidy/file-filter.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/file-filter.cpp
diff --git a/clang-tools-extra/test/clang-tidy/fix-errors.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/fix-errors.cpp
index 0c026163203..0c026163203 100644
--- a/clang-tools-extra/test/clang-tidy/fix-errors.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/fix-errors.cpp
diff --git a/clang-tools-extra/test/clang-tidy/fix.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/fix.cpp
index db6bc225ad2..db6bc225ad2 100644
--- a/clang-tools-extra/test/clang-tidy/fix.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/fix.cpp
diff --git a/clang-tools-extra/test/clang-tidy/line-filter.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/line-filter.cpp
index ad980cfa478..ad980cfa478 100644
--- a/clang-tools-extra/test/clang-tidy/line-filter.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/line-filter.cpp
diff --git a/clang-tools-extra/test/clang-tidy/list-checks.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/list-checks.cpp
index 674c118c179..674c118c179 100644
--- a/clang-tools-extra/test/clang-tidy/list-checks.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/list-checks.cpp
diff --git a/clang-tools-extra/test/clang-tidy/macros.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/macros.cpp
index fa4f32a897b..fa4f32a897b 100644
--- a/clang-tools-extra/test/clang-tidy/macros.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/macros.cpp
diff --git a/clang-tools-extra/test/clang-tidy/nolint-plugin.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/nolint-plugin.cpp
index 671c350828b..671c350828b 100644
--- a/clang-tools-extra/test/clang-tidy/nolint-plugin.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/nolint-plugin.cpp
diff --git a/clang-tools-extra/test/clang-tidy/nolint.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/nolint.cpp
index a2d2c10af4e..a2d2c10af4e 100644
--- a/clang-tools-extra/test/clang-tidy/nolint.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/nolint.cpp
diff --git a/clang-tools-extra/test/clang-tidy/nolintnextline-plugin.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/nolintnextline-plugin.cpp
index 0c84b9340aa..0c84b9340aa 100644
--- a/clang-tools-extra/test/clang-tidy/nolintnextline-plugin.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/nolintnextline-plugin.cpp
diff --git a/clang-tools-extra/test/clang-tidy/nolintnextline.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/nolintnextline.cpp
index a97928ae0ac..a97928ae0ac 100644
--- a/clang-tools-extra/test/clang-tidy/nolintnextline.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/nolintnextline.cpp
diff --git a/clang-tools-extra/test/clang-tidy/nonstandard-file-extension.test b/clang-tools-extra/test/clang-tidy/infrastructure/nonstandard-file-extension.test
index 4cb4d117119..4cb4d117119 100644
--- a/clang-tools-extra/test/clang-tidy/nonstandard-file-extension.test
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/nonstandard-file-extension.test
diff --git a/clang-tools-extra/test/clang-tidy/objc-arc-and-properties.m b/clang-tools-extra/test/clang-tidy/infrastructure/objc-arc-and-properties.m
index 7fbd7963b44..7fbd7963b44 100644
--- a/clang-tools-extra/test/clang-tidy/objc-arc-and-properties.m
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/objc-arc-and-properties.m
diff --git a/clang-tools-extra/test/clang-tidy/objc-no-arc-or-properties.m b/clang-tools-extra/test/clang-tidy/infrastructure/objc-no-arc-or-properties.m
index 596e8737ddc..596e8737ddc 100644
--- a/clang-tools-extra/test/clang-tidy/objc-no-arc-or-properties.m
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/objc-no-arc-or-properties.m
diff --git a/clang-tools-extra/test/clang-tidy/overlapping.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/overlapping.cpp
index f970a136892..f970a136892 100644
--- a/clang-tools-extra/test/clang-tidy/overlapping.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/overlapping.cpp
diff --git a/clang-tools-extra/test/clang-tidy/pr37091.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/pr37091.cpp
index e56115a5fe8..e56115a5fe8 100644
--- a/clang-tools-extra/test/clang-tidy/pr37091.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/pr37091.cpp
diff --git a/clang-tools-extra/test/clang-tidy/read_file_config.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/read_file_config.cpp
index 3e39b4d630e..3e39b4d630e 100644
--- a/clang-tools-extra/test/clang-tidy/read_file_config.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/read_file_config.cpp
diff --git a/clang-tools-extra/test/clang-tidy/run-clang-tidy.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/run-clang-tidy.cpp
index 31c4d681ebc..31c4d681ebc 100644
--- a/clang-tools-extra/test/clang-tidy/run-clang-tidy.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/run-clang-tidy.cpp
diff --git a/clang-tools-extra/test/clang-tidy/select-checks.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/select-checks.cpp
index 46bf43ca0c3..46bf43ca0c3 100644
--- a/clang-tools-extra/test/clang-tidy/select-checks.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/select-checks.cpp
diff --git a/clang-tools-extra/test/clang-tidy/serialize-diagnostics.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/serialize-diagnostics.cpp
index 8b0895af795..8b0895af795 100644
--- a/clang-tools-extra/test/clang-tidy/serialize-diagnostics.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/serialize-diagnostics.cpp
diff --git a/clang-tools-extra/test/clang-tidy/static-analyzer-config.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/static-analyzer-config.cpp
index d07c0c3aa2d..d07c0c3aa2d 100644
--- a/clang-tools-extra/test/clang-tidy/static-analyzer-config.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/static-analyzer-config.cpp
diff --git a/clang-tools-extra/test/clang-tidy/static-analyzer.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/static-analyzer.cpp
index af9693ad099..af9693ad099 100644
--- a/clang-tools-extra/test/clang-tidy/static-analyzer.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/static-analyzer.cpp
diff --git a/clang-tools-extra/test/clang-tidy/temporaries.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/temporaries.cpp
index 0aa60ed3f62..0aa60ed3f62 100644
--- a/clang-tools-extra/test/clang-tidy/temporaries.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/temporaries.cpp
diff --git a/clang-tools-extra/test/clang-tidy/validate-check-names.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/validate-check-names.cpp
index 35bfb09de8e..35bfb09de8e 100644
--- a/clang-tools-extra/test/clang-tidy/validate-check-names.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/validate-check-names.cpp
diff --git a/clang-tools-extra/test/clang-tidy/vfsoverlay.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/vfsoverlay.cpp
index 5704b71fd10..5704b71fd10 100644
--- a/clang-tools-extra/test/clang-tidy/vfsoverlay.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/vfsoverlay.cpp
diff --git a/clang-tools-extra/test/clang-tidy/warnings-as-errors-diagnostics.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/warnings-as-errors-diagnostics.cpp
index 9f90b62256e..9f90b62256e 100644
--- a/clang-tools-extra/test/clang-tidy/warnings-as-errors-diagnostics.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/warnings-as-errors-diagnostics.cpp
diff --git a/clang-tools-extra/test/clang-tidy/warnings-as-errors-plural.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/warnings-as-errors-plural.cpp
index a14759da284..a14759da284 100644
--- a/clang-tools-extra/test/clang-tidy/warnings-as-errors-plural.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/warnings-as-errors-plural.cpp
diff --git a/clang-tools-extra/test/clang-tidy/warnings-as-errors.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/warnings-as-errors.cpp
index 44afb837c23..44afb837c23 100644
--- a/clang-tools-extra/test/clang-tidy/warnings-as-errors.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/warnings-as-errors.cpp