bumping crates

Author: perryqh

src/ownership/codeowners_file_parser.rs

@@ -23,7 +23,7 @@ pub struct Parser {
 }
 
 impl Parser {
-    pub fn teams_from_files_paths(&self, file_paths: &[PathBuf]) -> Result<HashMap<String, Team>, Box<dyn Error>> {
+    pub fn teams_from_files_paths(&self, file_paths: &[PathBuf]) -> Result<HashMap<String, Option<Team>>, Box<dyn Error>> {
         let file_inputs: Vec<(String, String)> = file_paths
             .iter()
             .map(|path| {
@@ -57,14 +57,14 @@ impl Parser {
 
         let teams_by_name = teams_by_github_team_name(self.absolute_team_files_globs());
 
-        let result: HashMap<String, Team> = file_inputs
+        let result: HashMap<String, Option<Team>> = file_inputs
             .par_iter()
-            .filter_map(|(key, prefixed)| {
-                codeowners_entries
+            .map(|(key, prefixed)| {
+                let team = codeowners_entries
                     .iter()
                     .find(|(glob, _)| glob_match(glob, prefixed))
-                    .and_then(|(_, team_name)| teams_by_name.get(team_name))
-                    .map(|team| (key.clone(), team.clone()))
+                    .and_then(|(_, team_name)| teams_by_name.get(team_name).cloned());
+                (key.clone(), team)
             })
             .collect();
 
@@ -73,7 +73,7 @@ impl Parser {
 
     pub fn team_from_file_path(&self, file_path: &Path) -> Result<Option<Team>, Box<dyn Error>> {
         let teams = self.teams_from_files_paths(&[file_path.to_path_buf()])?;
-        Ok(teams.get(file_path.to_string_lossy().into_owned().as_str()).cloned())
+        Ok(teams.get(file_path.to_string_lossy().into_owned().as_str()).cloned().flatten())
     }
 
     fn absolute_team_files_globs(&self) -> Vec<String> {

src/runner.rs

@@ -283,7 +283,7 @@ fn for_file_codeowners_only(run_config: &RunConfig, file_path: &str) -> RunResul
 }
 
 // For an array of file paths, return a map of file path to its owning team
-pub fn teams_for_files_from_codeowners(run_config: &RunConfig, file_paths: &[String]) -> Result<HashMap<String, Team>, Error> {
+pub fn teams_for_files_from_codeowners(run_config: &RunConfig, file_paths: &[String]) -> Result<HashMap<String, Option<Team>>, Error> {
     let relative_file_paths: Vec<PathBuf> = file_paths
         .iter()
         .map(|path| Path::new(path).strip_prefix(&run_config.project_root).unwrap_or(Path::new(path)))
@@ -435,17 +435,43 @@ mod tests {
         };
         let teams =
             teams_for_files_from_codeowners(&run_config, &file_paths.iter().map(|s| s.to_string()).collect::<Vec<String>>()).unwrap();
-        assert_eq!(teams.len(), 3);
+        assert_eq!(teams.len(), 5);
         assert_eq!(
-            teams.get("javascript/packages/items/item.ts").map(|t| t.name.as_str()),
+            teams
+                .get("javascript/packages/items/item.ts")
+                .unwrap()
+                .as_ref()
+                .map(|t| t.name.as_str()),
             Some("Payroll")
         );
-        assert_eq!(teams.get("config/teams/payroll.yml").map(|t| t.name.as_str()), Some("Payroll"));
         assert_eq!(
-            teams.get("ruby/app/models/bank_account.rb").map(|t| t.name.as_str()),
+            teams.get("config/teams/payroll.yml").unwrap().as_ref().map(|t| t.name.as_str()),
+            Some("Payroll")
+        );
+        assert_eq!(
+            teams
+                .get("ruby/app/models/bank_account.rb")
+                .unwrap()
+                .as_ref()
+                .map(|t| t.name.as_str()),
             Some("Payments")
         );
-        assert_eq!(teams.get("made/up/file.rb").map(|t| t.name.as_str()), None);
-        assert_eq!(teams.get("ruby/ignored_files/git_ignored.rb").map(|t| t.name.as_str()), None);
+        assert_eq!(teams.get("made/up/file.rb").unwrap().as_ref().map(|t| t.name.as_str()), None);
+        assert_eq!(
+            teams
+                .get("ruby/ignored_files/git_ignored.rb")
+                .unwrap()
+                .as_ref()
+                .map(|t| t.name.as_str()),
+            None
+        );
+        assert_eq!(
+            teams
+                .get("ruby/ignored_files/git_ignored.rb")
+                .unwrap()
+                .as_ref()
+                .map(|t| t.name.as_str()),
+            None
+        );
     }
 }