43 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt
index 51af8898470..dd45d00f935 100644
--- a/src/tools/tidy/src/issues.txt
+++ b/src/tools/tidy/src/issues.txt
@@ -3797,9 +3797,9 @@
 "ui/rust-2018/uniform-paths/issue-56596-2.rs",
 "ui/rust-2018/uniform-paths/issue-56596.rs",
 "ui/rust-2018/uniform-paths/issue-87932.rs",
-"ui/sanitize/issue-111184-coroutine-witness.rs",
-"ui/sanitize/issue-114275-cfi-const-expr-in-arry-len.rs",
-"ui/sanitize/issue-72154-lifetime-markers.rs",
+"ui/sanitizer/issue-111184-cfi-coroutine-witness.rs",
+"ui/sanitizer/issue-114275-cfi-const-expr-in-arry-len.rs",
+"ui/sanitizer/issue-72154-address-lifetime-markers.rs",
 "ui/self/issue-61882-2.rs",
 "ui/self/issue-61882.rs",
 "ui/simd/intrinsic/issue-85855.rs",
diff --git a/tests/ui/sanitize/address.rs b/tests/ui/sanitizer/address.rs
index 7a5e767687c..7a5e767687c 100644
--- a/tests/ui/sanitize/address.rs
+++ b/tests/ui/sanitizer/address.rs
diff --git a/tests/ui/sanitize/badfree.rs b/tests/ui/sanitizer/badfree.rs
index ecbb58eba00..ecbb58eba00 100644
--- a/tests/ui/sanitize/badfree.rs
+++ b/tests/ui/sanitizer/badfree.rs
diff --git a/tests/ui/sanitize/cfg-kasan.rs b/tests/ui/sanitizer/cfg-kasan.rs
index 394bf216581..394bf216581 100644
--- a/tests/ui/sanitize/cfg-kasan.rs
+++ b/tests/ui/sanitizer/cfg-kasan.rs
diff --git a/tests/ui/sanitize/cfg.rs b/tests/ui/sanitizer/cfg.rs
index 942141bd3fe..942141bd3fe 100644
--- a/tests/ui/sanitize/cfg.rs
+++ b/tests/ui/sanitizer/cfg.rs
diff --git a/tests/ui/sanitize/sanitizer-cfi-canonical-jump-tables-require-cfi.rs b/tests/ui/sanitizer/cfi-canonical-jump-tables-requires-cfi.rs
index 10c5bf6ea5e..10c5bf6ea5e 100644
--- a/tests/ui/sanitize/sanitizer-cfi-canonical-jump-tables-require-cfi.rs
+++ b/tests/ui/sanitizer/cfi-canonical-jump-tables-requires-cfi.rs
diff --git a/tests/ui/sanitize/sanitizer-cfi-canonical-jump-tables-require-cfi.stderr b/tests/ui/sanitizer/cfi-canonical-jump-tables-requires-cfi.stderr
index de67d6a6b7f..de67d6a6b7f 100644
--- a/tests/ui/sanitize/sanitizer-cfi-canonical-jump-tables-require-cfi.stderr
+++ b/tests/ui/sanitizer/cfi-canonical-jump-tables-requires-cfi.stderr
diff --git a/tests/ui/sanitize/sanitizer-cfi-generalize-pointers-attr-cfg.rs b/tests/ui/sanitizer/cfi-generalize-pointers-attr-cfg.rs
index d46002c69fd..d46002c69fd 100644
--- a/tests/ui/sanitize/sanitizer-cfi-generalize-pointers-attr-cfg.rs
+++ b/tests/ui/sanitizer/cfi-generalize-pointers-attr-cfg.rs
diff --git a/tests/ui/sanitize/sanitizer-cfi-generalize-pointers-require-cfi.rs b/tests/ui/sanitizer/cfi-generalize-pointers-requires-cfi.rs
index 8ba13bd3639..8ba13bd3639 100644
--- a/tests/ui/sanitize/sanitizer-cfi-generalize-pointers-require-cfi.rs
+++ b/tests/ui/sanitizer/cfi-generalize-pointers-requires-cfi.rs
diff --git a/tests/ui/sanitize/sanitizer-cfi-generalize-pointers-require-cfi.stderr b/tests/ui/sanitizer/cfi-generalize-pointers-requires-cfi.stderr
index 621708de241..621708de241 100644
--- a/tests/ui/sanitize/sanitizer-cfi-generalize-pointers-require-cfi.stderr
+++ b/tests/ui/sanitizer/cfi-generalize-pointers-requires-cfi.stderr
diff --git a/tests/ui/sanitize/sanitizer-cfi-invalid-attr-cfi-encoding.rs b/tests/ui/sanitizer/cfi-invalid-attr-cfi-encoding.rs
index 7ef6bd2f0ac..7ef6bd2f0ac 100644
--- a/tests/ui/sanitize/sanitizer-cfi-invalid-attr-cfi-encoding.rs
+++ b/tests/ui/sanitizer/cfi-invalid-attr-cfi-encoding.rs
diff --git a/tests/ui/sanitize/sanitizer-cfi-invalid-attr-cfi-encoding.stderr b/tests/ui/sanitizer/cfi-invalid-attr-cfi-encoding.stderr
index b9e9722da23..93ec134241e 100644
--- a/tests/ui/sanitize/sanitizer-cfi-invalid-attr-cfi-encoding.stderr
+++ b/tests/ui/sanitizer/cfi-invalid-attr-cfi-encoding.stderr
@@ -1,5 +1,5 @@
 error: malformed `cfi_encoding` attribute input
-  --> $DIR/sanitizer-cfi-invalid-attr-cfi-encoding.rs:10:1
+  --> $DIR/cfi-invalid-attr-cfi-encoding.rs:10:1
    |
 LL | #[cfi_encoding]
    | ^^^^^^^^^^^^^^^ help: must be of the form: `#[cfi_encoding = "encoding"]`
diff --git a/tests/ui/sanitize/sanitizer-cfi-is-incompatible-with-sanitizer-kcfi.aarch64.stderr b/tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.aarch64.stderr
index 1006c3bc17e..1006c3bc17e 100644
--- a/tests/ui/sanitize/sanitizer-cfi-is-incompatible-with-sanitizer-kcfi.aarch64.stderr
+++ b/tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.aarch64.stderr
diff --git a/tests/ui/sanitize/sanitizer-cfi-is-incompatible-with-sanitizer-kcfi.rs b/tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.rs
index c628709d7a1..c628709d7a1 100644
--- a/tests/ui/sanitize/sanitizer-cfi-is-incompatible-with-sanitizer-kcfi.rs
+++ b/tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.rs
diff --git a/tests/ui/sanitize/sanitizer-cfi-is-incompatible-with-sanitizer-kcfi.x86_64.stderr b/tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.x86_64.stderr
index 1006c3bc17e..1006c3bc17e 100644
--- a/tests/ui/sanitize/sanitizer-cfi-is-incompatible-with-sanitizer-kcfi.x86_64.stderr
+++ b/tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.x86_64.stderr
diff --git a/tests/ui/sanitize/sanitizer-cfi-normalize-integers-attr-cfg.rs b/tests/ui/sanitizer/cfi-normalize-integers-attr-cfg.rs
index 24c2c2c13da..24c2c2c13da 100644
--- a/tests/ui/sanitize/sanitizer-cfi-normalize-integers-attr-cfg.rs
+++ b/tests/ui/sanitizer/cfi-normalize-integers-attr-cfg.rs
diff --git a/tests/ui/sanitize/sanitizer-cfi-normalize-integers-require-cfi.rs b/tests/ui/sanitizer/cfi-normalize-integers-requires-cfi.rs
index a7ecefbf7ef..a7ecefbf7ef 100644
--- a/tests/ui/sanitize/sanitizer-cfi-normalize-integers-require-cfi.rs
+++ b/tests/ui/sanitizer/cfi-normalize-integers-requires-cfi.rs
diff --git a/tests/ui/sanitize/sanitizer-cfi-normalize-integers-require-cfi.stderr b/tests/ui/sanitizer/cfi-normalize-integers-requires-cfi.stderr
index 748fb60dad9..748fb60dad9 100644
--- a/tests/ui/sanitize/sanitizer-cfi-normalize-integers-require-cfi.stderr
+++ b/tests/ui/sanitizer/cfi-normalize-integers-requires-cfi.stderr
diff --git a/tests/ui/sanitize/sanitizer-cfi-requires-lto.rs b/tests/ui/sanitizer/cfi-requires-lto.rs
index 5a34f696e05..5a34f696e05 100644
--- a/tests/ui/sanitize/sanitizer-cfi-requires-lto.rs
+++ b/tests/ui/sanitizer/cfi-requires-lto.rs
diff --git a/tests/ui/sanitize/sanitizer-cfi-requires-lto.stderr b/tests/ui/sanitizer/cfi-requires-lto.stderr
index efc0c43138e..efc0c43138e 100644
--- a/tests/ui/sanitize/sanitizer-cfi-requires-lto.stderr
+++ b/tests/ui/sanitizer/cfi-requires-lto.stderr
diff --git a/tests/ui/sanitize/sanitizer-cfi-with-rustc-lto-requires-single-codegen-unit.rs b/tests/ui/sanitizer/cfi-with-rustc-lto-requires-single-codegen-unit.rs
index 954e4ec3b85..954e4ec3b85 100644
--- a/tests/ui/sanitize/sanitizer-cfi-with-rustc-lto-requires-single-codegen-unit.rs
+++ b/tests/ui/sanitizer/cfi-with-rustc-lto-requires-single-codegen-unit.rs
diff --git a/tests/ui/sanitize/sanitizer-cfi-with-rustc-lto-requires-single-codegen-unit.stderr b/tests/ui/sanitizer/cfi-with-rustc-lto-requires-single-codegen-unit.stderr
index 8d6dc1d8f1e..8d6dc1d8f1e 100644
--- a/tests/ui/sanitize/sanitizer-cfi-with-rustc-lto-requires-single-codegen-unit.stderr
+++ b/tests/ui/sanitizer/cfi-with-rustc-lto-requires-single-codegen-unit.stderr
diff --git a/tests/ui/sanitize/crt-static.rs b/tests/ui/sanitizer/crt-static.rs
index c24faeca3dc..c24faeca3dc 100644
--- a/tests/ui/sanitize/crt-static.rs
+++ b/tests/ui/sanitizer/crt-static.rs
diff --git a/tests/ui/sanitize/crt-static.stderr b/tests/ui/sanitizer/crt-static.stderr
index 98b0ed82e80..98b0ed82e80 100644
--- a/tests/ui/sanitize/crt-static.stderr
+++ b/tests/ui/sanitizer/crt-static.stderr
diff --git a/tests/ui/sanitize/hwaddress.rs b/tests/ui/sanitizer/hwaddress.rs
index e5939eb734b..e5939eb734b 100644
--- a/tests/ui/sanitize/hwaddress.rs
+++ b/tests/ui/sanitizer/hwaddress.rs
diff --git a/tests/ui/sanitize/incompatible.rs b/tests/ui/sanitizer/incompatible.rs
index d000abb26ac..d000abb26ac 100644
--- a/tests/ui/sanitize/incompatible.rs
+++ b/tests/ui/sanitizer/incompatible.rs
diff --git a/tests/ui/sanitize/incompatible.stderr b/tests/ui/sanitizer/incompatible.stderr
index 4dff813ee1b..4dff813ee1b 100644
--- a/tests/ui/sanitize/incompatible.stderr
+++ b/tests/ui/sanitizer/incompatible.stderr
diff --git a/tests/ui/sanitize/inline-always.rs b/tests/ui/sanitizer/inline-always.rs
index d92daee3026..d92daee3026 100644
--- a/tests/ui/sanitize/inline-always.rs
+++ b/tests/ui/sanitizer/inline-always.rs
diff --git a/tests/ui/sanitize/inline-always.stderr b/tests/ui/sanitizer/inline-always.stderr
index 74fba3c0e0e..74fba3c0e0e 100644
--- a/tests/ui/sanitize/inline-always.stderr
+++ b/tests/ui/sanitizer/inline-always.stderr
diff --git a/tests/ui/sanitize/issue-111184-coroutine-witness.rs b/tests/ui/sanitizer/issue-111184-cfi-coroutine-witness.rs
index e5b1e032257..e5b1e032257 100644
--- a/tests/ui/sanitize/issue-111184-coroutine-witness.rs
+++ b/tests/ui/sanitizer/issue-111184-cfi-coroutine-witness.rs
diff --git a/tests/ui/sanitize/issue-114275-cfi-const-expr-in-arry-len.rs b/tests/ui/sanitizer/issue-114275-cfi-const-expr-in-arry-len.rs
index b1b7487fa2a..b1b7487fa2a 100644
--- a/tests/ui/sanitize/issue-114275-cfi-const-expr-in-arry-len.rs
+++ b/tests/ui/sanitizer/issue-114275-cfi-const-expr-in-arry-len.rs
diff --git a/tests/ui/sanitize/issue-72154-lifetime-markers.rs b/tests/ui/sanitizer/issue-72154-address-lifetime-markers.rs
index aa0c19db9a1..aa0c19db9a1 100644
--- a/tests/ui/sanitize/issue-72154-lifetime-markers.rs
+++ b/tests/ui/sanitizer/issue-72154-address-lifetime-markers.rs
diff --git a/tests/ui/sanitize/leak.rs b/tests/ui/sanitizer/leak.rs
index 65915ec24b7..65915ec24b7 100644
--- a/tests/ui/sanitize/leak.rs
+++ b/tests/ui/sanitizer/leak.rs
diff --git a/tests/ui/sanitize/memory-eager.rs b/tests/ui/sanitizer/memory-eager.rs
index 9e7889fa1bc..9e7889fa1bc 100644
--- a/tests/ui/sanitize/memory-eager.rs
+++ b/tests/ui/sanitizer/memory-eager.rs
diff --git a/tests/ui/sanitize/memory-passing.rs b/tests/ui/sanitizer/memory-passing.rs
index c8ab64bfaf8..c8ab64bfaf8 100644
--- a/tests/ui/sanitize/memory-passing.rs
+++ b/tests/ui/sanitizer/memory-passing.rs
diff --git a/tests/ui/sanitize/memory.rs b/tests/ui/sanitizer/memory.rs
index bd2d6771749..bd2d6771749 100644
--- a/tests/ui/sanitize/memory.rs
+++ b/tests/ui/sanitizer/memory.rs
diff --git a/tests/ui/sanitize/new-llvm-pass-manager-thin-lto.rs b/tests/ui/sanitizer/new-llvm-pass-manager-thin-lto.rs
index b7dd4a43782..b7dd4a43782 100644
--- a/tests/ui/sanitize/new-llvm-pass-manager-thin-lto.rs
+++ b/tests/ui/sanitizer/new-llvm-pass-manager-thin-lto.rs
diff --git a/tests/ui/sanitize/split-lto-unit-requires-lto.rs b/tests/ui/sanitizer/split-lto-unit-requires-lto.rs
index 35e610f0307..35e610f0307 100644
--- a/tests/ui/sanitize/split-lto-unit-requires-lto.rs
+++ b/tests/ui/sanitizer/split-lto-unit-requires-lto.rs
diff --git a/tests/ui/sanitize/split-lto-unit-requires-lto.stderr b/tests/ui/sanitizer/split-lto-unit-requires-lto.stderr
index 0da06b7f8b1..0da06b7f8b1 100644
--- a/tests/ui/sanitize/split-lto-unit-requires-lto.stderr
+++ b/tests/ui/sanitizer/split-lto-unit-requires-lto.stderr
diff --git a/tests/ui/sanitize/thread.rs b/tests/ui/sanitizer/thread.rs
index 9d9ad6ee518..9d9ad6ee518 100644
--- a/tests/ui/sanitize/thread.rs
+++ b/tests/ui/sanitizer/thread.rs
diff --git a/tests/ui/sanitize/unsupported-target.rs b/tests/ui/sanitizer/unsupported-target.rs
index 7c7dc24b5d9..7c7dc24b5d9 100644
--- a/tests/ui/sanitize/unsupported-target.rs
+++ b/tests/ui/sanitizer/unsupported-target.rs
diff --git a/tests/ui/sanitize/unsupported-target.stderr b/tests/ui/sanitizer/unsupported-target.stderr
index bebbf3884ae..bebbf3884ae 100644
--- a/tests/ui/sanitize/unsupported-target.stderr
+++ b/tests/ui/sanitizer/unsupported-target.stderr
diff --git a/tests/ui/sanitize/use-after-scope.rs b/tests/ui/sanitizer/use-after-scope.rs
index 4d7f6f6c2f2..4d7f6f6c2f2 100644
--- a/tests/ui/sanitize/use-after-scope.rs
+++ b/tests/ui/sanitizer/use-after-scope.rs