54 files changed, 2 insertions, 37 deletions
diff --git a/src/test/ui/issues/issue-19883.rs b/src/test/ui/associated-types/issue-19883.rs
index 5cf422043a5..5cf422043a5 100644
--- a/src/test/ui/issues/issue-19883.rs
+++ b/src/test/ui/associated-types/issue-19883.rs
diff --git a/src/test/ui/issues/issue-19883.stderr b/src/test/ui/associated-types/issue-19883.stderr
index bd6a86b7420..bd6a86b7420 100644
--- a/src/test/ui/issues/issue-19883.stderr
+++ b/src/test/ui/associated-types/issue-19883.stderr
diff --git a/src/test/ui/issues/issue-21363.rs b/src/test/ui/associated-types/issue-21363.rs
index acc28cb430b..acc28cb430b 100644
--- a/src/test/ui/issues/issue-21363.rs
+++ b/src/test/ui/associated-types/issue-21363.rs
diff --git a/src/test/ui/auxiliary/issue-72470-lib.rs b/src/test/ui/async-await/auxiliary/issue-72470-lib.rs
index 8383eba8912..8383eba8912 100644
--- a/src/test/ui/auxiliary/issue-72470-lib.rs
+++ b/src/test/ui/async-await/auxiliary/issue-72470-lib.rs
diff --git a/src/test/ui/issue-72470-llvm-dominate.rs b/src/test/ui/async-await/issue-72470-llvm-dominate.rs
index 5bb69a07305..5bb69a07305 100644
--- a/src/test/ui/issue-72470-llvm-dominate.rs
+++ b/src/test/ui/async-await/issue-72470-llvm-dominate.rs
diff --git a/src/test/ui/issues/issue-78720.rs b/src/test/ui/closures/issue-78720.rs
index 4cdb9f49113..4cdb9f49113 100644
--- a/src/test/ui/issues/issue-78720.rs
+++ b/src/test/ui/closures/issue-78720.rs
diff --git a/src/test/ui/issues/issue-78720.stderr b/src/test/ui/closures/issue-78720.stderr
index 3dd13877298..3dd13877298 100644
--- a/src/test/ui/issues/issue-78720.stderr
+++ b/src/test/ui/closures/issue-78720.stderr
diff --git a/src/test/ui/issues/issue-23833.rs b/src/test/ui/consts/issue-23833.rs
index d4128fa54e3..d4128fa54e3 100644
--- a/src/test/ui/issues/issue-23833.rs
+++ b/src/test/ui/consts/issue-23833.rs
diff --git a/src/test/ui/issues/issue-34784.rs b/src/test/ui/consts/issue-34784.rs
index 98d943470a7..98d943470a7 100644
--- a/src/test/ui/issues/issue-34784.rs
+++ b/src/test/ui/consts/issue-34784.rs
diff --git a/src/test/ui/issues/issue-3935.rs b/src/test/ui/deriving/issue-3935.rs
index e98d68e0eb2..e98d68e0eb2 100644
--- a/src/test/ui/issues/issue-3935.rs
+++ b/src/test/ui/deriving/issue-3935.rs
diff --git a/src/test/ui/mid-path-type-params.rs b/src/test/ui/generics/mid-path-type-params.rs
index a8128207c80..a8128207c80 100644
--- a/src/test/ui/mid-path-type-params.rs
+++ b/src/test/ui/generics/mid-path-type-params.rs
diff --git a/src/test/ui/issues/type-arg-mismatch-due-to-impl-trait.rs b/src/test/ui/impl-trait/type-arg-mismatch-due-to-impl-trait.rs
index ecfa5c69e2f..ecfa5c69e2f 100644
--- a/src/test/ui/issues/type-arg-mismatch-due-to-impl-trait.rs
+++ b/src/test/ui/impl-trait/type-arg-mismatch-due-to-impl-trait.rs
diff --git a/src/test/ui/issues/type-arg-mismatch-due-to-impl-trait.stderr b/src/test/ui/impl-trait/type-arg-mismatch-due-to-impl-trait.stderr
index 30322f88cca..30322f88cca 100644
--- a/src/test/ui/issues/type-arg-mismatch-due-to-impl-trait.stderr
+++ b/src/test/ui/impl-trait/type-arg-mismatch-due-to-impl-trait.stderr
diff --git a/src/test/ui/issues/issue-5791.rs b/src/test/ui/issues/issue-5791.rs
deleted file mode 100644
index 3544160f094..00000000000
--- a/src/test/ui/issues/issue-5791.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// run-pass
-#![allow(dead_code)]
-#![warn(clashing_extern_declarations)]
-// pretty-expanded FIXME #23616
-
-extern "C" {
-    #[link_name = "malloc"]
-    fn malloc1(len: i32) -> *const u8;
-    #[link_name = "malloc"]
-    //~^ WARN `malloc2` redeclares `malloc` with a different signature
-    fn malloc2(len: i32, foo: i32) -> *const u8;
-}
-
-pub fn main() {}
diff --git a/src/test/ui/issues/issue-5791.stderr b/src/test/ui/issues/issue-5791.stderr
deleted file mode 100644
index cf60e609deb..00000000000
--- a/src/test/ui/issues/issue-5791.stderr
+++ /dev/null
@@ -1,21 +0,0 @@
-warning: `malloc2` redeclares `malloc` with a different signature
-  --> $DIR/issue-5791.rs:9:5
-   |
-LL | /     #[link_name = "malloc"]
-LL | |     fn malloc1(len: i32) -> *const u8;
-   | |______________________________________- `malloc` previously declared here
-LL | /     #[link_name = "malloc"]
-LL | |
-LL | |     fn malloc2(len: i32, foo: i32) -> *const u8;
-   | |________________________________________________^ this signature doesn't match the previous declaration
-   |
-note: the lint level is defined here
-  --> $DIR/issue-5791.rs:3:9
-   |
-LL | #![warn(clashing_extern_declarations)]
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   = note: expected `unsafe extern "C" fn(i32) -> *const u8`
-              found `unsafe extern "C" fn(i32, i32) -> *const u8`
-
-warning: 1 warning emitted
-
diff --git a/src/test/ui/enable-unstable-lib-feature.rs b/src/test/ui/lint/enable-unstable-lib-feature.rs
index aa6a973d7bd..aa6a973d7bd 100644
--- a/src/test/ui/enable-unstable-lib-feature.rs
+++ b/src/test/ui/lint/enable-unstable-lib-feature.rs
diff --git a/src/test/ui/enable-unstable-lib-feature.stderr b/src/test/ui/lint/enable-unstable-lib-feature.stderr
index bb4e928ad15..bb4e928ad15 100644
--- a/src/test/ui/enable-unstable-lib-feature.stderr
+++ b/src/test/ui/lint/enable-unstable-lib-feature.stderr
diff --git a/src/test/ui/issues/issue-57410.rs b/src/test/ui/lint/issue-57410.rs
index 0cf4b8068e4..0cf4b8068e4 100644
--- a/src/test/ui/issues/issue-57410.rs
+++ b/src/test/ui/lint/issue-57410.rs
diff --git a/src/test/ui/issues/issue-79744.rs b/src/test/ui/lint/issue-79744.rs
index e9725a027d3..e9725a027d3 100644
--- a/src/test/ui/issues/issue-79744.rs
+++ b/src/test/ui/lint/issue-79744.rs
diff --git a/src/test/ui/issues/issue-79744.stderr b/src/test/ui/lint/issue-79744.stderr
index 6f6dd44d236..6f6dd44d236 100644
--- a/src/test/ui/issues/issue-79744.stderr
+++ b/src/test/ui/lint/issue-79744.stderr
diff --git a/src/test/ui/issues/issue-37433.rs b/src/test/ui/llvm-asm/issue-37433.rs
index 1c362e8aba0..1c362e8aba0 100644
--- a/src/test/ui/issues/issue-37433.rs
+++ b/src/test/ui/llvm-asm/issue-37433.rs
diff --git a/src/test/ui/issues/issue-37433.stderr b/src/test/ui/llvm-asm/issue-37433.stderr
index 44a8eb32b7c..44a8eb32b7c 100644
--- a/src/test/ui/issues/issue-37433.stderr
+++ b/src/test/ui/llvm-asm/issue-37433.stderr
diff --git a/src/test/ui/auxiliary/define-macro.rs b/src/test/ui/macros/auxiliary/define-macro.rs
index 4956907c55e..4956907c55e 100644
--- a/src/test/ui/auxiliary/define-macro.rs
+++ b/src/test/ui/macros/auxiliary/define-macro.rs
diff --git a/src/test/ui/out-of-order-shadowing.rs b/src/test/ui/macros/out-of-order-shadowing.rs
index a0d1a973764..a0d1a973764 100644
--- a/src/test/ui/out-of-order-shadowing.rs
+++ b/src/test/ui/macros/out-of-order-shadowing.rs
diff --git a/src/test/ui/out-of-order-shadowing.stderr b/src/test/ui/macros/out-of-order-shadowing.stderr
index 1db31e0272c..1db31e0272c 100644
--- a/src/test/ui/out-of-order-shadowing.stderr
+++ b/src/test/ui/macros/out-of-order-shadowing.stderr
diff --git a/src/test/ui/guards.rs b/src/test/ui/match/guards.rs
index 10a4bb67387..10a4bb67387 100644
--- a/src/test/ui/guards.rs
+++ b/src/test/ui/match/guards.rs
diff --git a/src/test/ui/issues/issue-33498.rs b/src/test/ui/match/issue-33498.rs
index 9c8a97e7e6b..9c8a97e7e6b 100644
--- a/src/test/ui/issues/issue-33498.rs
+++ b/src/test/ui/match/issue-33498.rs
diff --git a/src/test/ui/issues/issue-41255.rs b/src/test/ui/match/issue-41255.rs
index 9d7072f1665..9d7072f1665 100644
--- a/src/test/ui/issues/issue-41255.rs
+++ b/src/test/ui/match/issue-41255.rs
diff --git a/src/test/ui/issues/issue-41255.stderr b/src/test/ui/match/issue-41255.stderr
index bf81c8d371c..bf81c8d371c 100644
--- a/src/test/ui/issues/issue-41255.stderr
+++ b/src/test/ui/match/issue-41255.stderr
diff --git a/src/test/ui/issues/issue-56685.rs b/src/test/ui/match/issue-56685.rs
index f320c99ed15..f320c99ed15 100644
--- a/src/test/ui/issues/issue-56685.rs
+++ b/src/test/ui/match/issue-56685.rs
diff --git a/src/test/ui/issues/issue-56685.stderr b/src/test/ui/match/issue-56685.stderr
index ccf357d4aa0..ccf357d4aa0 100644
--- a/src/test/ui/issues/issue-56685.stderr
+++ b/src/test/ui/match/issue-56685.stderr
diff --git a/src/test/ui/expr-empty-ret.rs b/src/test/ui/never_type/expr-empty-ret.rs
index ce8ffaf94d0..ce8ffaf94d0 100644
--- a/src/test/ui/expr-empty-ret.rs
+++ b/src/test/ui/never_type/expr-empty-ret.rs
diff --git a/src/test/ui/issues/issue-74614.rs b/src/test/ui/polymorphization/issue-74614.rs
index 8b0c00b1355..8b0c00b1355 100644
--- a/src/test/ui/issues/issue-74614.rs
+++ b/src/test/ui/polymorphization/issue-74614.rs
diff --git a/src/test/ui/issues/issue-79593.rs b/src/test/ui/privacy/issue-79593.rs
index b94278bfdd2..b94278bfdd2 100644
--- a/src/test/ui/issues/issue-79593.rs
+++ b/src/test/ui/privacy/issue-79593.rs
diff --git a/src/test/ui/issues/issue-79593.stderr b/src/test/ui/privacy/issue-79593.stderr
index b8c7d4f23a2..b8c7d4f23a2 100644
--- a/src/test/ui/issues/issue-79593.stderr
+++ b/src/test/ui/privacy/issue-79593.stderr
diff --git a/src/test/ui/issues/issue-42944.rs b/src/test/ui/resolve/issue-42944.rs
index a4404857a56..a4404857a56 100644
--- a/src/test/ui/issues/issue-42944.rs
+++ b/src/test/ui/resolve/issue-42944.rs
diff --git a/src/test/ui/issues/issue-42944.stderr b/src/test/ui/resolve/issue-42944.stderr
index 008492529d1..008492529d1 100644
--- a/src/test/ui/issues/issue-42944.stderr
+++ b/src/test/ui/resolve/issue-42944.stderr
diff --git a/src/test/ui/use-self-in-inner-fn.rs b/src/test/ui/resolve/use-self-in-inner-fn.rs
index eccb315feb1..eccb315feb1 100644
--- a/src/test/ui/use-self-in-inner-fn.rs
+++ b/src/test/ui/resolve/use-self-in-inner-fn.rs
diff --git a/src/test/ui/use-self-in-inner-fn.stderr b/src/test/ui/resolve/use-self-in-inner-fn.stderr
index 96609349924..96609349924 100644
--- a/src/test/ui/use-self-in-inner-fn.stderr
+++ b/src/test/ui/resolve/use-self-in-inner-fn.stderr
diff --git a/src/test/ui/issues/issue-35376.rs b/src/test/ui/specialization/issue-35376.rs
index cc35213b93d..cc35213b93d 100644
--- a/src/test/ui/issues/issue-35376.rs
+++ b/src/test/ui/specialization/issue-35376.rs
diff --git a/src/test/ui/issues/issue-35376.stderr b/src/test/ui/specialization/issue-35376.stderr
index 835277d408e..835277d408e 100644
--- a/src/test/ui/issues/issue-35376.stderr
+++ b/src/test/ui/specialization/issue-35376.stderr
diff --git a/src/test/ui/issues/issue-34194.rs b/src/test/ui/static/issue-34194.rs
index 6dce556e9e3..6dce556e9e3 100644
--- a/src/test/ui/issues/issue-34194.rs
+++ b/src/test/ui/static/issue-34194.rs
diff --git a/src/test/ui/issues/issue-38002.rs b/src/test/ui/structs-enums/issue-38002.rs
index fdb31fc44a1..fdb31fc44a1 100644
--- a/src/test/ui/issues/issue-38002.rs
+++ b/src/test/ui/structs-enums/issue-38002.rs
diff --git a/src/test/ui/issues/issue-53912.rs b/src/test/ui/symbol-names/issue-53912.rs
index 65b6825a832..65b6825a832 100644
--- a/src/test/ui/issues/issue-53912.rs
+++ b/src/test/ui/symbol-names/issue-53912.rs
diff --git a/src/test/ui/issues/issue-36768.rs b/src/test/ui/test-attrs/issue-36768.rs
index f671cbc8205..f671cbc8205 100644
--- a/src/test/ui/issues/issue-36768.rs
+++ b/src/test/ui/test-attrs/issue-36768.rs
diff --git a/src/test/ui/tls.rs b/src/test/ui/thread-local/tls.rs
index fbd3413885f..fbd3413885f 100644
--- a/src/test/ui/tls.rs
+++ b/src/test/ui/thread-local/tls.rs
diff --git a/src/test/ui/bug-7183-generics.rs b/src/test/ui/traits/bug-7183-generics.rs
index f53a1736127..f53a1736127 100644
--- a/src/test/ui/bug-7183-generics.rs
+++ b/src/test/ui/traits/bug-7183-generics.rs
diff --git a/src/test/ui/issues/issue-20692.rs b/src/test/ui/traits/issue-20692.rs
index 1cb2d8c7302..1cb2d8c7302 100644
--- a/src/test/ui/issues/issue-20692.rs
+++ b/src/test/ui/traits/issue-20692.rs
diff --git a/src/test/ui/issues/issue-20692.stderr b/src/test/ui/traits/issue-20692.stderr
index 1d7f252e556..1d7f252e556 100644
--- a/src/test/ui/issues/issue-20692.stderr
+++ b/src/test/ui/traits/issue-20692.stderr
diff --git a/src/test/ui/issues/issue-23825.rs b/src/test/ui/traits/issue-23825.rs
index a9f0095d2e2..a9f0095d2e2 100644
--- a/src/test/ui/issues/issue-23825.rs
+++ b/src/test/ui/traits/issue-23825.rs
diff --git a/src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.mir.stderr b/src/test/ui/unsafe/issue-45107-unnecessary-unsafe-in-closure.mir.stderr
index 9e9cbcf33ae..9e9cbcf33ae 100644
--- a/src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.mir.stderr
+++ b/src/test/ui/unsafe/issue-45107-unnecessary-unsafe-in-closure.mir.stderr
diff --git a/src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.rs b/src/test/ui/unsafe/issue-45107-unnecessary-unsafe-in-closure.rs
index ac1cfd62a05..ac1cfd62a05 100644
--- a/src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.rs
+++ b/src/test/ui/unsafe/issue-45107-unnecessary-unsafe-in-closure.rs
diff --git a/src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.thir.stderr b/src/test/ui/unsafe/issue-45107-unnecessary-unsafe-in-closure.thir.stderr
index 9e9cbcf33ae..9e9cbcf33ae 100644
--- a/src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.thir.stderr
+++ b/src/test/ui/unsafe/issue-45107-unnecessary-unsafe-in-closure.thir.stderr
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index 46b5b877b4c..a341527c84c 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -7,8 +7,8 @@ use std::path::Path;
 
 const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
-const ROOT_ENTRY_LIMIT: usize = 1345;
-const ISSUES_ENTRY_LIMIT: usize = 2525;
+const ROOT_ENTRY_LIMIT: usize = 1330;
+const ISSUES_ENTRY_LIMIT: usize = 2488;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))