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
|
@ -33,7 +33,6 @@ use std::{
|
|||
cell::{Cell, RefCell},
|
||||
cmp,
|
||||
fmt::{Debug, Display},
|
||||
future::Future,
|
||||
hash::{Hash, Hasher},
|
||||
marker::PhantomData,
|
||||
mem,
|
||||
|
@ -1292,12 +1291,16 @@ impl Window {
|
|||
/// The closure is provided a handle to the current window and an `AsyncWindowContext` for
|
||||
/// use within your future.
|
||||
#[track_caller]
|
||||
pub fn spawn<Fut, R>(&self, cx: &App, f: impl FnOnce(AsyncWindowContext) -> Fut) -> Task<R>
|
||||
pub fn spawn<AsyncFn, R>(&self, cx: &App, f: AsyncFn) -> Task<R>
|
||||
where
|
||||
R: 'static,
|
||||
Fut: Future<Output = R> + 'static,
|
||||
AsyncFn: AsyncFnOnce(&mut AsyncWindowContext) -> R + 'static,
|
||||
{
|
||||
cx.spawn(|app| f(AsyncWindowContext::new_context(app, self.handle)))
|
||||
let handle = self.handle;
|
||||
cx.spawn(async move |app| {
|
||||
let mut async_window_cx = AsyncWindowContext::new_context(app.clone(), handle);
|
||||
f(&mut async_window_cx).await
|
||||
})
|
||||
}
|
||||
|
||||
fn bounds_changed(&mut self, cx: &mut App) {
|
||||
|
@ -2068,7 +2071,7 @@ impl Window {
|
|||
let entity = self.current_view();
|
||||
self.spawn(cx, {
|
||||
let task = task.clone();
|
||||
|mut cx| async move {
|
||||
async move |cx| {
|
||||
task.await;
|
||||
|
||||
cx.on_next_frame(move |_, cx| {
|
||||
|
@ -3241,7 +3244,7 @@ impl Window {
|
|||
if !match_result.pending.is_empty() {
|
||||
currently_pending.keystrokes = match_result.pending;
|
||||
currently_pending.focus = self.focus;
|
||||
currently_pending.timer = Some(self.spawn(cx, |mut cx| async move {
|
||||
currently_pending.timer = Some(self.spawn(cx, async move |cx| {
|
||||
cx.background_executor.timer(Duration::from_secs(1)).await;
|
||||
cx.update(move |window, cx| {
|
||||
let Some(currently_pending) = window
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue