diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs index b540d9713a2ee3205bdd8b938c1e942e01c0dddb..56db25365edff9f926892af6cc0a9a033972cb6b 100644 --- a/crates/project/src/project.rs +++ b/crates/project/src/project.rs @@ -2428,7 +2428,7 @@ mod tests { .as_remote_mut() .unwrap() .snapshot - .apply_update(update_message) + .apply_remote_update(update_message) .unwrap(); assert_eq!( diff --git a/crates/project/src/worktree.rs b/crates/project/src/worktree.rs index 3c7e12d1c987d906ecabad489247f7b40302b5aa..32e72a5f177f3793505bf92680664690c5de071b 100644 --- a/crates/project/src/worktree.rs +++ b/crates/project/src/worktree.rs @@ -265,7 +265,7 @@ impl Worktree { .spawn(async move { while let Some(update) = updates_rx.recv().await { let mut snapshot = snapshot_tx.borrow().clone(); - if let Err(error) = snapshot.apply_update(update) { + if let Err(error) = snapshot.apply_remote_update(update) { log::error!("error applying worktree update: {}", error); } *snapshot_tx.borrow_mut() = snapshot; @@ -1000,7 +1000,7 @@ impl Snapshot { } } - pub(crate) fn apply_update(&mut self, update: proto::UpdateWorktree) -> Result<()> { + pub(crate) fn apply_remote_update(&mut self, update: proto::UpdateWorktree) -> Result<()> { let mut entries_by_path_edits = Vec::new(); let mut entries_by_id_edits = Vec::new(); for entry_id in update.removed_entries { @@ -2618,7 +2618,7 @@ mod tests { let update = scanner .snapshot() .build_update(&prev_snapshot, 0, 0, include_ignored); - prev_snapshot.apply_update(update).unwrap(); + prev_snapshot.apply_remote_update(update).unwrap(); assert_eq!( prev_snapshot.to_vec(true), scanner.snapshot().to_vec(include_ignored)