null entry

Author: perryqh

src/main.rs

@@ -61,11 +61,11 @@ struct Args {
     project_root: PathBuf,
 
     /// Walk type
-    #[arg(long, default_value = "jwalk")]
+    #[arg(long, default_value = "ignore")]
     walk_type: String,
 
     /// Entry processor type
-    #[arg(long, default_value = "parallel")]
+    #[arg(long, default_value = "serial")]
     entry_processor_type: String,
 }
 
@@ -124,12 +124,12 @@ fn cli() -> Result<(), Error> {
 
     let config = serde_yaml::from_reader(config_file).change_context(Error::Io)?;
     let walk_type = match args.walk_type.as_str() {
-        "jwalk" => WalkType::JWalk,
-        _ => WalkType::Ignore,
+        "ignore" => WalkType::Ignore,
+        _ => WalkType::JWalk,
     };
     let entry_processor_type = match args.entry_processor_type.as_str() {
-        "parallel" => EntryProcessorType::Parallel,
-        _ => EntryProcessorType::Serial,
+        "serial" => EntryProcessorType::Serial,
+        _ => EntryProcessorType::Parallel,
     };
 
     dbg!(&walk_type, &entry_processor_type);

src/project_builder.rs

@@ -25,7 +25,8 @@ enum EntryType {
     JavascriptPackage(AbsolutePath, RelativePath),
     CodeownerFile(AbsolutePath, RelativePath),
     TeamFile(AbsolutePath, RelativePath),
-    PossiblyOwnedFile(AbsolutePath, RelativePath),
+    OwnedFile(AbsolutePath, RelativePath),
+    NullEntry(),
 }
 
 #[derive(Debug)]
@@ -142,7 +143,12 @@ impl<'a> ProjectBuilder<'a> {
                 _ if matches_globs(&relative_path, &self.config.team_file_glob) => {
                     Ok(EntryType::TeamFile(absolute_path.to_owned(), relative_path.to_owned()))
                 }
-                _ => Ok(EntryType::PossiblyOwnedFile(absolute_path.to_owned(), relative_path.to_owned())),
+                _ if matches_globs(&relative_path, &self.config.owned_globs)
+                    && !matches_globs(&relative_path, &self.config.unowned_globs) =>
+                {
+                    Ok(EntryType::OwnedFile(absolute_path.to_owned(), relative_path.to_owned()))
+                }
+                _ => Ok(EntryType::NullEntry()),
             }
         }
     }
@@ -164,11 +170,8 @@ impl<'a> ProjectBuilder<'a> {
         let mut owned_files_vec = Vec::new();
         for entry_type in entry_types {
             match entry_type {
-                EntryType::PossiblyOwnedFile(absolute_path, relative_path) => {
-                    if matches_globs(&relative_path, &self.config.owned_globs) && !matches_globs(&relative_path, &self.config.unowned_globs)
-                    {
-                        owned_files_vec.push(absolute_path);
-                    }
+                EntryType::OwnedFile(absolute_path, _relative_path) => {
+                    owned_files_vec.push(absolute_path);
                 }
                 EntryType::Directory(absolute_path, relative_path) => {
                     if relative_path.parent() == Some(Path::new(&self.config.vendored_gems_path)) {
@@ -217,6 +220,7 @@ impl<'a> ProjectBuilder<'a> {
                         avoid_ownership: deserializer.github.do_not_add_to_codeowners_file,
                     });
                 }
+                EntryType::NullEntry() => {}
             }
         }
         let owned_files = owned_files(owned_files_vec);
@@ -240,12 +244,8 @@ impl<'a> ProjectBuilder<'a> {
                 || (Vec::new(), Vec::new(), Vec::new(), Vec::new(), Vec::new()),
                 |(mut owned_paths, mut pkgs, mut gems, mut codeowners, mut team_files), entry_type| {
                     match entry_type {
-                        EntryType::PossiblyOwnedFile(absolute_path, relative_path) => {
-                            if matches_globs(&relative_path, &self.config.owned_globs)
-                                && !matches_globs(&relative_path, &self.config.unowned_globs)
-                            {
-                                owned_paths.push(absolute_path);
-                            }
+                        EntryType::OwnedFile(absolute_path, _relative_path) => {
+                            owned_paths.push(absolute_path);
                         }
                         EntryType::Directory(absolute_path, relative_path) => {
                             if relative_path.parent() == Some(Path::new(&self.config.vendored_gems_path)) {
@@ -294,6 +294,7 @@ impl<'a> ProjectBuilder<'a> {
                                 avoid_ownership: deserializer.github.do_not_add_to_codeowners_file,
                             });
                         }
+                        EntryType::NullEntry() => {}
                     }
                     (owned_paths, pkgs, gems, codeowners, team_files)
                 },