Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename Task -> EntityTask (a BackgroundTask is just a Task)

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Max Brunsfeld 2021-04-05 17:03:42 -07:00
parent 46f8665e41
commit fda1394057
7 changed files with 28 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
zed/src/worktree/worktree.rs
View file

@ -11,7 +11,7 @@ use crate::{
use anyhow::{anyhow, Result};
use crossbeam_channel as channel;
use easy_parallel::Parallel;
use gpui::{executor::BackgroundTask, AppContext, Entity, ModelContext, ModelHandle};
use gpui::{AppContext, Entity, ModelContext, ModelHandle, Task};
use ignore::dir::{Ignore, IgnoreBuilder};
use parking_lot::RwLock;
use smol::prelude::*;
@ -356,7 +356,7 @@ impl Worktree {
entry_id: usize,
content: Snapshot,
ctx: &AppContext,
) -> BackgroundTask<Result<()>> {
) -> Task<Result<()>> {
let path = self.abs_entry_path(entry_id);
ctx.background_executor().spawn(async move {
let buffer_size = content.text_summary().bytes.min(10 * 1024);
@ -468,7 +468,7 @@ impl FileHandle {
self.worktree.as_ref(app).load_history(self.entry_id)
}
pub fn save<'a>(&self, content: Snapshot, ctx: &AppContext) -> BackgroundTask<Result<()>> {
pub fn save<'a>(&self, content: Snapshot, ctx: &AppContext) -> Task<Result<()>> {
let worktree = self.worktree.as_ref(ctx);
worktree.save(self.entry_id, content, ctx)
}