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

18
crates/tasks_ui/src/tasks_ui.rs
View file

@ -48,11 +48,11 @@ pub fn init(cx: &mut App) {
original_task.use_new_terminal = use_new_terminal;
}
let task_contexts = task_contexts(workspace, window, cx);
cx.spawn_in(window, |workspace, mut cx| async move {
cx.spawn_in(window, async move |workspace, cx| {
let task_contexts = task_contexts.await;
let default_context = TaskContext::default();
workspace
.update_in(&mut cx, |workspace, _, cx| {
.update_in(cx, |workspace, _, cx| {
schedule_task(
workspace,
task_source_kind,
@ -146,10 +146,10 @@ pub fn toggle_modal(
});
if can_open_modal {
let task_contexts = task_contexts(workspace, window, cx);
cx.spawn_in(window, |workspace, mut cx| async move {
cx.spawn_in(window, async move |workspace, cx| {
let task_contexts = task_contexts.await;
workspace
.update_in(&mut cx, |workspace, window, cx| {
.update_in(cx, |workspace, window, cx| {
workspace.toggle_modal(window, cx, |window, cx| {
TasksModal::new(
task_store.clone(),
@ -177,12 +177,12 @@ fn spawn_task_with_name(
window: &mut Window,
cx: &mut Context<Workspace>,
) -> Task<anyhow::Result<()>> {
cx.spawn_in(window, |workspace, mut cx| async move {
let task_contexts = workspace.update_in(&mut cx, |workspace, window, cx| {
cx.spawn_in(window, async move |workspace, cx| {
let task_contexts = workspace.update_in(cx, |workspace, window, cx| {
task_contexts(workspace, window, cx)
})?;
let task_contexts = task_contexts.await;
let tasks = workspace.update(&mut cx, |workspace, cx| {
let tasks = workspace.update(cx, |workspace, cx| {
let Some(task_inventory) = workspace
.project()
.read(cx)
@ -209,7 +209,7 @@ fn spawn_task_with_name(
})?;
let did_spawn = workspace
.update(&mut cx, |workspace, cx| {
.update(cx, |workspace, cx| {
let (task_source_kind, mut target_task) =
tasks.into_iter().find(|(_, task)| task.label == name)?;
if let Some(overrides) = &overrides {
@ -232,7 +232,7 @@ fn spawn_task_with_name(
.is_some();
if !did_spawn {
workspace
.update_in(&mut cx, |workspace, window, cx| {
.update_in(cx, |workspace, window, cx| {
spawn_task_or_modal(
workspace,
&Spawn::ViaModal {