From 80df9aec1db449e6cc0f4513103aa442b8d43de3 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Fri, 5 Jul 2024 17:53:09 -0400 Subject: refactor: move `FileCollector` to deno_config (#24433) --- cli/tools/registry/paths.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'cli/tools/registry') diff --git a/cli/tools/registry/paths.rs b/cli/tools/registry/paths.rs index 721ef6ece..1fe8830dd 100644 --- a/cli/tools/registry/paths.rs +++ b/cli/tools/registry/paths.rs @@ -8,12 +8,12 @@ use std::path::PathBuf; use deno_ast::MediaType; use deno_ast::ModuleSpecifier; +use deno_config::glob::FileCollector; use deno_config::glob::FilePatterns; use deno_core::error::AnyError; use thiserror::Error; use crate::args::CliOptions; -use crate::util::fs::FileCollector; use super::diagnostics::PublishDiagnostic; use super::diagnostics::PublishDiagnosticsCollector; @@ -319,14 +319,14 @@ fn collect_paths( file_patterns: FilePatterns, ) -> Result, AnyError> { FileCollector::new(|e| { - if !e.file_type.is_file() { + if !e.metadata.is_file { if let Ok(specifier) = ModuleSpecifier::from_file_path(e.path) { diagnostics_collector.push(PublishDiagnostic::UnsupportedFileType { specifier, - kind: if e.file_type.is_symlink() { - "symlink".to_owned() + kind: if e.metadata.is_symlink { + "symlink".to_string() } else { - format!("{:?}", e.file_type) + "Unknown".to_string() }, }); } @@ -341,5 +341,5 @@ fn collect_paths( .ignore_node_modules() .set_vendor_folder(cli_options.vendor_dir_path().map(ToOwned::to_owned)) .use_gitignore() - .collect_file_patterns(file_patterns) + .collect_file_patterns(&deno_config::fs::RealDenoConfigFs, file_patterns) } -- cgit v1.2.3