Move "async move" a few characters to the left in cx.spawn() (#26758)
This is the core change: https://github.com/zed-industries/zed/pull/26758/files#diff-044302c0d57147af17e68a0009fee3e8dcdfb4f32c27a915e70cfa80e987f765R1052 TODO: - [x] Use AsyncFn instead of Fn() -> Future in GPUI spawn methods - [x] Implement it in the whole app - [x] Implement it in the debugger - [x] Glance at the RPC crate, and see if those box future methods can be switched over. Answer: It can't directly, as you can't make an AsyncFn* into a trait object. There's ways around that, but they're all more complex than just keeping the code as is. - [ ] Fix platform specific code Release Notes: - N/A
This commit is contained in:
parent
7f2e3fb5bd
commit
1aefa5178b
256 changed files with 3110 additions and 3200 deletions
|
@ -49,7 +49,7 @@ impl WorktreeIndex {
|
|||
let worktree_abs_path = worktree.read(cx).abs_path();
|
||||
let embedding_fs = Arc::clone(&fs);
|
||||
let summary_fs = fs;
|
||||
cx.spawn(|mut cx| async move {
|
||||
cx.spawn(async move |cx| {
|
||||
let entries_being_indexed = Arc::new(IndexingEntrySet::new(status_tx));
|
||||
let (embedding_index, summary_index) = cx
|
||||
.background_spawn({
|
||||
|
@ -138,7 +138,9 @@ impl WorktreeIndex {
|
|||
summary_index,
|
||||
worktree,
|
||||
entry_ids_being_indexed,
|
||||
_index_entries: cx.spawn(|this, cx| Self::index_entries(this, updated_entries_rx, cx)),
|
||||
_index_entries: cx.spawn(async move |this, cx| {
|
||||
Self::index_entries(this, updated_entries_rx, cx).await
|
||||
}),
|
||||
_subscription,
|
||||
}
|
||||
}
|
||||
|
@ -166,10 +168,10 @@ impl WorktreeIndex {
|
|||
async fn index_entries(
|
||||
this: WeakEntity<Self>,
|
||||
updated_entries: channel::Receiver<UpdatedEntriesSet>,
|
||||
mut cx: AsyncApp,
|
||||
cx: &mut AsyncApp,
|
||||
) -> Result<()> {
|
||||
let is_auto_available = cx.update(|cx| cx.wait_for_flag::<AutoCommand>())?.await;
|
||||
let index = this.update(&mut cx, |this, cx| {
|
||||
let index = this.update(cx, |this, cx| {
|
||||
futures::future::try_join(
|
||||
this.embedding_index.index_entries_changed_on_disk(cx),
|
||||
this.summary_index
|
||||
|
@ -183,7 +185,7 @@ impl WorktreeIndex {
|
|||
.update(|cx| cx.has_flag::<AutoCommand>())
|
||||
.unwrap_or(false);
|
||||
|
||||
let index = this.update(&mut cx, |this, cx| {
|
||||
let index = this.update(cx, |this, cx| {
|
||||
futures::future::try_join(
|
||||
this.embedding_index
|
||||
.index_updated_entries(updated_entries.clone(), cx),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue