From ab952f1b310ca763e85728fc2a6c5c906b8a0357 Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Fri, 5 May 2023 17:30:54 -0700 Subject: [PATCH] Fixed randomized test failures co-authored-by: Max --- crates/project/src/worktree.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/crates/project/src/worktree.rs b/crates/project/src/worktree.rs index af6576375a6fb5c282a6db3814d7326abca34a79..136b0664e3e7a32a9d40651408dbf7a80672d143 100644 --- a/crates/project/src/worktree.rs +++ b/crates/project/src/worktree.rs @@ -1673,12 +1673,12 @@ impl LocalSnapshot { let mut updated_repositories: Vec = Vec::new(); let mut removed_repositories = Vec::new(); - let mut self_repos = self.snapshot.repository_entries.values().peekable(); - let mut other_repos = other.snapshot.repository_entries.values().peekable(); + let mut self_repos = self.snapshot.repository_entries.iter().peekable(); + let mut other_repos = other.snapshot.repository_entries.iter().peekable(); loop { match (self_repos.peek(), other_repos.peek()) { - (Some(self_repo), Some(other_repo)) => { - match Ord::cmp(&self_repo.work_directory, &other_repo.work_directory) { + (Some((self_work_dir, self_repo)), Some((other_work_dir, other_repo))) => { + match Ord::cmp(self_work_dir, other_work_dir) { Ordering::Less => { updated_repositories.push((*self_repo).into()); self_repos.next(); @@ -1697,11 +1697,11 @@ impl LocalSnapshot { } } } - (Some(self_repo), None) => { + (Some((_, self_repo)), None) => { updated_repositories.push((*self_repo).into()); self_repos.next(); } - (None, Some(other_repo)) => { + (None, Some((_, other_repo))) => { removed_repositories.push(other_repo.work_directory.to_proto()); other_repos.next(); }