4 files changed, 37 insertions, 14 deletions

diff --git a/xtask/src/codegen/gen_assists_docs.rs b/xtask/src/codegen/gen_assists_docs.rs
index 6da5ca89e..31d606535 100644
--- a/xtask/src/codegen/gen_assists_docs.rs
+++ b/xtask/src/codegen/gen_assists_docs.rs
@@ -4,7 +4,7 @@ use std::{fs, path::Path};
 
 use crate::{
     codegen::{self, extract_comment_blocks_with_empty_lines, Mode},
-    project_root, Result,
+    project_root, rust_files, Result,
 };
 
 pub fn generate_assists_docs(mode: Mode) -> Result<()> {
@@ -46,12 +46,8 @@ fn reveal_hash_comments(text: &str) -> String {
 
 fn collect_assists() -> Result<Vec<Assist>> {
     let mut res = Vec::new();
-    for entry in fs::read_dir(project_root().join(codegen::ASSISTS_DIR))? {
-        let entry = entry?;
-        let path = entry.path();
-        if path.is_file() {
-            collect_file(&mut res, path.as_path())?;
-        }
+    for path in rust_files(&project_root().join(codegen::ASSISTS_DIR)) {
+        collect_file(&mut res, path.as_path())?;
     }
     res.sort_by(|lhs, rhs| lhs.id.cmp(&rhs.id));
     return Ok(res);
diff --git a/xtask/src/dist.rs b/xtask/src/dist.rs
index 2002d3e2a..3255eefb9 100644
--- a/xtask/src/dist.rs
+++ b/xtask/src/dist.rs
@@ -7,13 +7,18 @@ use crate::{
     project_root,
 };
 
-pub fn run_dist(version: &str, release_tag: &str) -> Result<()> {
+pub struct ClientOpts {
+    pub version: String,
+    pub release_tag: String,
+}
+
+pub fn run_dist(client_opts: Option<ClientOpts>) -> Result<()> {
     let dist = project_root().join("dist");
     rm_rf(&dist)?;
     fs2::create_dir_all(&dist)?;
 
-    if cfg!(target_os = "linux") {
-        dist_client(version, release_tag)?;
+    if let Some(ClientOpts { version, release_tag }) = client_opts {
+        dist_client(&version, &release_tag)?;
     }
     dist_server()?;
     Ok(())
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index e1472e85d..4f01f84fb 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -17,6 +17,7 @@ use std::{
     path::{Path, PathBuf},
     process::{Command, Stdio},
 };
+use walkdir::{DirEntry, WalkDir};
 
 use crate::{
     codegen::Mode,
@@ -37,6 +38,21 @@ pub fn project_root() -> PathBuf {
     .to_path_buf()
 }
 
+pub fn rust_files(path: &Path) -> impl Iterator<Item = PathBuf> {
+    let iter = WalkDir::new(path);
+    return iter
+        .into_iter()
+        .filter_entry(|e| !is_hidden(e))
+        .map(|e| e.unwrap())
+        .filter(|e| !e.file_type().is_dir())
+        .map(|e| e.into_path())
+        .filter(|path| path.extension().map(|it| it == "rs").unwrap_or(false));
+
+    fn is_hidden(entry: &DirEntry) -> bool {
+        entry.file_name().to_str().map(|s| s.starts_with('.')).unwrap_or(false)
+    }
+}
+
 pub fn run_rustfmt(mode: Mode) -> Result<()> {
     let _dir = pushd(project_root());
     ensure_rustfmt()?;
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index aafa73610..a9adcfba4 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -13,7 +13,7 @@ use std::env;
 use pico_args::Arguments;
 use xtask::{
     codegen::{self, Mode},
-    dist::run_dist,
+    dist::{run_dist, ClientOpts},
     install::{ClientOpt, InstallCmd, ServerOpt},
     not_bash::pushd,
     pre_commit, project_root, run_clippy, run_fuzzer, run_pre_cache, run_release, run_rustfmt,
@@ -103,10 +103,16 @@ FLAGS:
             run_release(dry_run)
         }
         "dist" => {
-            let version: String = args.value_from_str("--version")?;
-            let release_tag: String = args.value_from_str("--tag")?;
+            let client_opts = if args.contains("--client") {
+                Some(ClientOpts {
+                    version: args.value_from_str("--version")?,
+                    release_tag: args.value_from_str("--tag")?,
+                })
+            } else {
+                None
+            };
             args.finish()?;
-            run_dist(&version, &release_tag)
+            run_dist(client_opts)
         }
         _ => {
             eprintln!(