From f0567032d3d59cf1c2282862a02904c307f271db Mon Sep 17 00:00:00 2001 From: harupy Date: Sat, 15 Jul 2023 20:17:27 +0900 Subject: [PATCH 1/3] Ignore directories when collecting files to lint --- crates/ruff/src/resolver.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/crates/ruff/src/resolver.rs b/crates/ruff/src/resolver.rs index 0ad0fa244ed86..0e1157bd3ea6e 100644 --- a/crates/ruff/src/resolver.rs +++ b/crates/ruff/src/resolver.rs @@ -330,9 +330,13 @@ pub fn python_files_in_path( } if result.as_ref().map_or(true, |entry| { + // Ignore directories + if entry.file_type().map_or(true, |ft| ft.is_dir()) { + return false; + } if entry.depth() == 0 { // Accept all files that are passed-in directly. - entry.file_type().map_or(false, |ft| ft.is_file()) + true } else { // Otherwise, check if the file is included. let path = entry.path(); From d898ffaf7ae1f429e87d25a7aa4dde9be4e476a1 Mon Sep 17 00:00:00 2001 From: harupy Date: Sat, 15 Jul 2023 20:29:12 +0900 Subject: [PATCH 2/3] Fix clippy error --- crates/ruff/src/resolver.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/crates/ruff/src/resolver.rs b/crates/ruff/src/resolver.rs index 0e1157bd3ea6e..4522296cca639 100644 --- a/crates/ruff/src/resolver.rs +++ b/crates/ruff/src/resolver.rs @@ -329,7 +329,7 @@ pub fn python_files_in_path( } } - if result.as_ref().map_or(true, |entry| { + let should_include = result.as_ref().map_or(true, |entry| { // Ignore directories if entry.file_type().map_or(true, |ft| ft.is_dir()) { return false; @@ -352,7 +352,8 @@ pub fn python_files_in_path( false } } - }) { + }); + if should_include { files.lock().unwrap().push(result); } From 66a7eda0e6dc6683c6f1718f4d6d18ee889bd493 Mon Sep 17 00:00:00 2001 From: harupy Date: Sat, 15 Jul 2023 23:12:38 +0900 Subject: [PATCH 3/3] Apply suggestion --- crates/ruff/src/resolver.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/crates/ruff/src/resolver.rs b/crates/ruff/src/resolver.rs index 4522296cca639..ccbd7ecc31092 100644 --- a/crates/ruff/src/resolver.rs +++ b/crates/ruff/src/resolver.rs @@ -329,12 +329,11 @@ pub fn python_files_in_path( } } - let should_include = result.as_ref().map_or(true, |entry| { + if result.as_ref().map_or(true, |entry| { // Ignore directories if entry.file_type().map_or(true, |ft| ft.is_dir()) { - return false; - } - if entry.depth() == 0 { + false + } else if entry.depth() == 0 { // Accept all files that are passed-in directly. true } else { @@ -352,8 +351,7 @@ pub fn python_files_in_path( false } } - }); - if should_include { + }) { files.lock().unwrap().push(result); }