Rollup merge of #125339 - tbu-:pr_tidy_ui_tests_u32, r=clubby789 · rust-lang/rust@8bd1587 (original) (raw)

Original file line number Diff line number Diff line change
@@ -12,10 +12,10 @@ use std::path::{Path, PathBuf};
12 12 // should all be 1000 or lower. Limits significantly smaller than 1000 are also
13 13 // desirable, because large numbers of files are unwieldy in general. See issue
14 14 // #73494.
15 -const ENTRY_LIMIT: usize = 900;
15 +const ENTRY_LIMIT: u32 = 900;
16 16 // FIXME: The following limits should be reduced eventually.
17 17
18 -const ISSUES_ENTRY_LIMIT: usize = 1676;
18 +const ISSUES_ENTRY_LIMIT: u32 = 1676;
19 19
20 20 const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
21 21 "rs", // test source files
@@ -53,7 +53,7 @@ const EXTENSION_EXCEPTION_PATHS: &[&str] = &[
53 53 ];
54 54
55 55 fn check_entries(tests_path: &Path, bad: &mut bool) {
56 -let mut directories: HashMap<PathBuf, usize> = HashMap::new();
56 +let mut directories: HashMap<PathBuf, u32> = HashMap::new();
57 57
58 58 for dir in Walk::new(&tests_path.join("ui")) {
59 59 if let Ok(entry) = dir {
@@ -62,7 +62,7 @@ fn check_entries(tests_path: &Path, bad: &mut bool) {
62 62 }
63 63 }
64 64
65 -let (mut max, mut max_issues) = (0usize, 0usize);
65 +let (mut max, mut max_issues) = (0, 0);
66 66 for (dir_path, count) in directories {
67 67 let is_issues_dir = tests_path.join("ui/issues") == dir_path;
68 68 let (limit, maxcnt) = if is_issues_dir {