From ec80e6bd37d23ed8ac6b3b92f354a8eec892aa0d Mon Sep 17 00:00:00 2001 From: Jonathan Kelley Date: Thu, 19 Jun 2025 21:07:07 -0700 Subject: [PATCH] switch to ignore::walk for fmt/check --- packages/cli/src/cli/check.rs | 4 +--- packages/cli/src/workspace.rs | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/packages/cli/src/cli/check.rs b/packages/cli/src/cli/check.rs index 14c4f89c6..4a04fc97a 100644 --- a/packages/cli/src/cli/check.rs +++ b/packages/cli/src/cli/check.rs @@ -8,7 +8,6 @@ use crate::BuildRequest; use anyhow::Context; use futures_util::{stream::FuturesUnordered, StreamExt}; use std::path::Path; -use walkdir::WalkDir; /// Check the Rust files in the project for issues. #[derive(Clone, Debug, Parser)] @@ -125,8 +124,7 @@ async fn check_files_and_report(files_to_check: Vec) -> Result<()> { } pub(crate) fn collect_rs_files(folder: &Path, files: &mut Vec) { - let dir = WalkDir::new(folder).follow_links(true).into_iter(); - for entry in dir.flatten() { + for entry in ignore::Walk::new(folder).flatten() { if entry.path().extension() == Some("rs".as_ref()) { files.push(entry.path().to_path_buf()); } diff --git a/packages/cli/src/workspace.rs b/packages/cli/src/workspace.rs index 4e783b518..d72303b75 100644 --- a/packages/cli/src/workspace.rs +++ b/packages/cli/src/workspace.rs @@ -348,10 +348,6 @@ impl Workspace { let mut ignore_builder = ignore::gitignore::GitignoreBuilder::new(workspace_dir); ignore_builder.add(workspace_dir.join(".gitignore")); - // todo!() - // let workspace_dir = self.workspace_dir(); - // ignore_builder.add(workspace_dir.join(".gitignore")); - for path in Self::default_ignore_list() { ignore_builder .add_line(None, path)