Delete the FileList trait

Summary: We only ever use one instance, so just use a concrete type.

Reviewed By: yangdanny97

Differential Revision: D73776791

fbshipit-source-id: 9d261298011f9a7fc942723dd41a2dc59c50a068

Author: ndmitchell

pyrefly/lib/commands/check.rs

@@ -53,7 +53,7 @@ use crate::util::display;
 use crate::util::display::number_thousands;
 use crate::util::forgetter::Forgetter;
 use crate::util::fs_anyhow;
-use crate::util::listing::FileList;
+use crate::util::globs::FilteredGlobs;
 use crate::util::memory::MemoryUsageTrace;
 use crate::util::prelude::SliceExt;
 use crate::util::watcher::CategorizedEvents;
@@ -262,7 +262,7 @@ async fn get_watcher_events(watcher: &mut impl Watcher) -> anyhow::Result<Catego
 impl Args {
     pub fn run_once(
         self,
-        files_to_check: impl FileList,
+        files_to_check: FilteredGlobs,
         config_finder: ConfigFinder,
         allow_forget: bool,
     ) -> anyhow::Result<CommandExitStatus> {
@@ -286,7 +286,7 @@ impl Args {
     pub async fn run_watch(
         self,
         mut watcher: impl Watcher,
-        files_to_check: impl FileList,
+        files_to_check: FilteredGlobs,
         config_finder: ConfigFinder,
     ) -> anyhow::Result<()> {
         // TODO: We currently make 1 unrealistic assumptions, which should be fixed in the future:

pyrefly/lib/lib.rs

@@ -77,7 +77,6 @@ pub mod library {
                 pub use crate::util::args::clap_env;
                 pub use crate::util::args::get_args_expanded;
                 pub use crate::util::globs;
-                pub use crate::util::listing::FileList;
                 pub use crate::util::notify_watcher::NotifyWatcher;
                 pub use crate::util::thread_pool::init_thread_pool;
                 pub use crate::util::trace::init_tracing;

pyrefly/lib/util/globs.rs

@@ -28,7 +28,6 @@ use starlark_map::small_set::SmallSet;
 use tracing::debug;
 
 use crate::util::fs_anyhow;
-use crate::util::listing::FileList;
 use crate::util::prelude::SliceExt;
 use crate::util::prelude::VecExt;
 
@@ -348,10 +347,8 @@ impl FilteredGlobs {
     pub fn roots(&self) -> Vec<PathBuf> {
         self.includes.roots()
     }
-}
 
-impl FileList for FilteredGlobs {
-    fn files(&self) -> anyhow::Result<Vec<PathBuf>> {
+    pub fn files(&self) -> anyhow::Result<Vec<PathBuf>> {
         let mut result = Vec::new();
         for file in self.includes.files()? {
             if !self.excludes.matches(&file)? {
@@ -368,7 +365,7 @@ impl FileList for FilteredGlobs {
         Ok(result)
     }
 
-    fn covers(&self, path: &Path) -> bool {
+    pub fn covers(&self, path: &Path) -> bool {
         self.includes.covers(path) && !self.excludes.covers(path)
     }
 }

pyrefly/lib/util/listing.rs

@@ -16,7 +16,6 @@ pub mod forgetter;
 pub mod fs_anyhow;
 pub mod gas;
 pub mod globs;
-pub mod listing;
 pub mod lock;
 pub mod locked_map;
 pub mod memory;