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

Move "async move" a few characters to the left in cx.spawn() (#26758)

Browse source 
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:
Mikayla Maki 2025-03-18 19:09:02 -07:00 • committed by GitHub
parent 7f2e3fb5bd
commit 1aefa5178b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
256 changed files with 3110 additions and 3200 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/debugger_ui/src/attach_modal.rs
View file

@ -114,9 +114,9 @@ impl PickerDelegate for AttachModalDelegate {
_window: &mut Window,
cx: &mut Context<Picker<Self>>,
) -> gpui::Task<()> {
cx.spawn(|this, mut cx| async move {
cx.spawn(async move |this, cx| {
let Some(processes) = this
.update(&mut cx, |this, _| {
.update(cx, |this, _| {
if let Some(processes) = this.delegate.candidates.clone() {
processes
} else {
@ -172,7 +172,7 @@ impl PickerDelegate for AttachModalDelegate {
)
.await;
this.update(&mut cx, |this, _| {
this.update(cx, |this, _| {
let delegate = &mut this.delegate;
delegate.matches = matches;

8
crates/debugger_ui/src/debugger_panel.rs
View file

@ -150,8 +150,8 @@ impl DebugPanel {
workspace: WeakEntity<Workspace>,
cx: AsyncWindowContext,
) -> Task<Result<Entity<Self>>> {
cx.spawn(|mut cx| async move {
workspace.update_in(&mut cx, |workspace, window, cx| {
cx.spawn(async move |cx| {
workspace.update_in(cx, |workspace, window, cx| {
let debug_panel = DebugPanel::new(workspace, window, cx);
cx.observe(&debug_panel, |_, debug_panel, cx| {
@ -349,11 +349,11 @@ impl DebugPanel {
cx,
);
cx.spawn(|_, mut cx| async move {
cx.spawn(async move |_, cx| {
let pid_task = async move {
let terminal = terminal_task.await?;
terminal.read_with(&mut cx, |terminal, _| terminal.pty_info.pid())
terminal.read_with(cx, |terminal, _| terminal.pty_info.pid())
};
pid_task.await

6
crates/debugger_ui/src/session/running/console.rs
View file

@ -213,8 +213,8 @@ impl Render for Console {
fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
let session = self.session.clone();
let token = self.last_token;
self.update_output_task = cx.spawn_in(window, move |this, mut cx| async move {
_ = session.update_in(&mut cx, move |session, window, cx| {
self.update_output_task = cx.spawn_in(window, async move |this, cx| {
_ = session.update_in(cx, move |session, window, cx| {
let (output, last_processed_token) = session.output(token);
_ = this.update(cx, |this, cx| {
@ -342,7 +342,7 @@ impl ConsoleQueryBarCompletionProvider {
let query = buffer.read(cx).text();
cx.spawn(|_, cx| async move {
cx.spawn(async move |_, cx| {
let matches = fuzzy::match_strings(
&string_matches,
&query,

8
crates/debugger_ui/src/session/running/module_list.rs
View file

@ -60,9 +60,9 @@ impl ModuleList {
}
fn open_module(&mut self, path: Arc<Path>, window: &mut Window, cx: &mut Context<Self>) {
cx.spawn_in(window, move |this, mut cx| async move {
cx.spawn_in(window, async move |this, cx| {
let (worktree, relative_path) = this
.update(&mut cx, |this, cx| {
.update(cx, |this, cx| {
this.workspace.update(cx, |workspace, cx| {
workspace.project().update(cx, |this, cx| {
this.find_or_create_worktree(&path, false, cx)
@ -72,7 +72,7 @@ impl ModuleList {
.await?;
let buffer = this
.update(&mut cx, |this, cx| {
.update(cx, |this, cx| {
this.workspace.update(cx, |this, cx| {
this.project().update(cx, |this, cx| {
let worktree_id = worktree.read(cx).id();
@ -88,7 +88,7 @@ impl ModuleList {
})??
.await?;
this.update_in(&mut cx, |this, window, cx| {
this.update_in(cx, |this, window, cx| {
this.workspace.update(cx, |workspace, cx| {
let project_path = buffer.read(cx).project_path(cx).ok_or_else(|| {
anyhow!("Could not select a stack frame for unnamed buffer")

12
crates/debugger_ui/src/session/running/stack_frame_list.rs
View file

@ -235,9 +235,9 @@ impl StackFrameList {
return Task::ready(Err(anyhow!("Project path not found")));
};
cx.spawn_in(window, move |this, mut cx| async move {
cx.spawn_in(window, async move |this, cx| {
let (worktree, relative_path) = this
.update(&mut cx, |this, cx| {
.update(cx, |this, cx| {
this.workspace.update(cx, |workspace, cx| {
workspace.project().update(cx, |this, cx| {
this.find_or_create_worktree(&abs_path, false, cx)
@ -246,7 +246,7 @@ impl StackFrameList {
})??
.await?;
let buffer = this
.update(&mut cx, |this, cx| {
.update(cx, |this, cx| {
this.workspace.update(cx, |this, cx| {
this.project().update(cx, |this, cx| {
let worktree_id = worktree.read(cx).id();
@ -261,10 +261,10 @@ impl StackFrameList {
})
})??
.await?;
let position = buffer.update(&mut cx, |this, _| {
let position = buffer.update(cx, |this, _| {
this.snapshot().anchor_after(PointUtf16::new(row, 0))
})?;
this.update_in(&mut cx, |this, window, cx| {
this.update_in(cx, |this, window, cx| {
this.workspace.update(cx, |workspace, cx| {
let project_path = buffer.read(cx).project_path(cx).ok_or_else(|| {
anyhow!("Could not select a stack frame for unnamed buffer")
@ -282,7 +282,7 @@ impl StackFrameList {
})???
.await?;
this.update(&mut cx, |this, cx| {
this.update(cx, |this, cx| {
this.workspace.update(cx, |workspace, cx| {
let breakpoint_store = workspace.project().read(cx).breakpoint_store();

4
crates/debugger_ui/src/session/starting.rs
View file

@ -29,10 +29,10 @@ impl StartingState {
task: Task<Result<Entity<Session>>>,
cx: &mut Context<Self>,
) -> Self {
let _notify_parent = cx.spawn(move |this, mut cx| async move {
let _notify_parent = cx.spawn(async move |this, cx| {
let entity = task.await;
this.update(&mut cx, |_, cx| {
this.update(cx, |_, cx| {
if let Ok(entity) = entity {
cx.emit(StartingEvent::Finished(entity))
} else {

12
crates/debugger_ui/src/tests.rs
View file

@ -40,13 +40,21 @@ pub async fn init_test_workspace(
cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
let debugger_panel = workspace_handle
.update(cx, |_, window, cx| cx.spawn_in(window, DebugPanel::load))
.update(cx, |_, window, cx| {
cx.spawn_in(window, async move |this, cx| {
DebugPanel::load(this, cx.clone()).await
})
})
.unwrap()
.await
.expect("Failed to load debug panel");
let terminal_panel = workspace_handle
.update(cx, |_, window, cx| cx.spawn_in(window, TerminalPanel::load))
.update(cx, |_, window, cx| {
cx.spawn_in(window, async |this, cx| {
TerminalPanel::load(this, cx.clone()).await
})
})
.unwrap()
.await
.expect("Failed to load terminal panel");