remove get_globs in favor of get_normalized_sources

Author: RobinMalfait

crates/node/src/lib.rs

@@ -169,7 +169,7 @@ impl Scanner {
   pub fn globs(&mut self) -> Vec<GlobEntry> {
     self
       .scanner
-      .get_globs()
+      .get_normalized_sources()
       .into_iter()
       .map(Into::into)
       .collect()

crates/oxide/src/scanner/detect_sources.rs

@@ -1,10 +1,7 @@
 pub mod auto_source_detection;
-pub mod detect_sources;
 pub mod sources;
 
 use crate::extractor::{Extracted, Extractor};
-use crate::glob::optimize_patterns;
-use crate::scanner::detect_sources::resolve_globs;
 use crate::scanner::sources::{
     public_source_entries_to_private_source_entries, PublicSourceEntry, SourceEntry, Sources,
 };
@@ -92,9 +89,6 @@ pub struct Scanner {
     /// All directories, sub-directories, etc… we saw during source detection
     dirs: Vec<PathBuf>,
 
-    /// All generated globs, used for setting up watchers
-    globs: Vec<GlobEntry>,
-
     /// Track unique set of candidates
     candidates: FxHashSet<String>,
 }
@@ -294,32 +288,6 @@ impl Scanner {
             .collect()
     }
 
-    #[tracing::instrument(skip_all)]
-    pub fn get_globs(&mut self) -> Vec<GlobEntry> {
-        self.scan_sources();
-
-        for source in self.sources.iter() {
-            match source {
-                SourceEntry::Auto { base } | SourceEntry::External { base } => {
-                    let globs = resolve_globs((base).to_path_buf(), &self.dirs, &self.extensions);
-                    self.globs.extend(globs);
-                }
-                SourceEntry::Pattern { base, pattern } => {
-                    self.globs.push(GlobEntry {
-                        base: base.to_string_lossy().to_string(),
-                        pattern: pattern.to_string(),
-                    });
-                }
-                _ => {}
-            }
-        }
-
-        // Re-optimize the globs to reduce the number of patterns we have to scan.
-        self.globs = optimize_patterns(&self.globs);
-
-        self.globs.clone()
-    }
-
     #[tracing::instrument(skip_all)]
     pub fn get_normalized_sources(&mut self) -> Vec<GlobEntry> {
         self.sources