about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <476013+matthiaskrgr@users.noreply.github.com>2025-09-04 17:45:48 +0200
committerGitHub <noreply@github.com>2025-09-04 17:45:48 +0200
commitbdfa97b648f5e5ff3d70842042dd74488df28e6b (patch)
treecfb9cadf58f7ef58f0e7c676ece27478754b6008
parent7260704178ee1156194acc5e659416a5492ea271 (diff)
parent858414b6bb223b4f22c2c9748a7ef05a000c3bad (diff)
downloadrust-bdfa97b648f5e5ff3d70842042dd74488df28e6b.tar.gz
rust-bdfa97b648f5e5ff3d70842042dd74488df28e6b.zip
Rollup merge of #146151 - FrancescoV1985:issue-146047-fix, r=Kobzol
fixes auto-run js checks in tidy

Modified is_non_auto_or_matches function in src/tools/tidy/src/extra_checks/mod.rs so that .ts extension is considered.
Tested locally with
`./x.py test tidy --extra-checks=auto:js`
-rw-r--r--src/tools/tidy/src/extra_checks/mod.rs20
1 files changed, 9 insertions, 11 deletions
diff --git a/src/tools/tidy/src/extra_checks/mod.rs b/src/tools/tidy/src/extra_checks/mod.rs
index 31169ec5967..34d9ea92629 100644
--- a/src/tools/tidy/src/extra_checks/mod.rs
+++ b/src/tools/tidy/src/extra_checks/mod.rs
@@ -720,21 +720,19 @@ impl ExtraCheckArg {
         if !self.auto {
             return true;
         }
-        let ext = match self.lang {
-            ExtraCheckLang::Py => ".py",
-            ExtraCheckLang::Cpp => ".cpp",
-            ExtraCheckLang::Shell => ".sh",
-            ExtraCheckLang::Js => ".js",
+        let exts: &[&str] = match self.lang {
+            ExtraCheckLang::Py => &[".py"],
+            ExtraCheckLang::Cpp => &[".cpp"],
+            ExtraCheckLang::Shell => &[".sh"],
+            ExtraCheckLang::Js => &[".js", ".ts"],
             ExtraCheckLang::Spellcheck => {
-                for dir in SPELLCHECK_DIRS {
-                    if Path::new(filepath).starts_with(dir) {
-                        return true;
-                    }
+                if SPELLCHECK_DIRS.iter().any(|dir| Path::new(filepath).starts_with(dir)) {
+                    return true;
                 }
-                return false;
+                &[]
             }
         };
-        filepath.ends_with(ext)
+        exts.iter().any(|ext| filepath.ends_with(ext))
     }
 
     fn has_supported_kind(&self) -> bool {