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
|
@ -209,18 +209,18 @@ impl SerializableItem for ImageView {
|
|||
window: &mut Window,
|
||||
cx: &mut App,
|
||||
) -> Task<gpui::Result<Entity<Self>>> {
|
||||
window.spawn(cx, |mut cx| async move {
|
||||
window.spawn(cx, async move |cx| {
|
||||
let image_path = IMAGE_VIEWER
|
||||
.get_image_path(item_id, workspace_id)?
|
||||
.ok_or_else(|| anyhow::anyhow!("No image path found"))?;
|
||||
|
||||
let (worktree, relative_path) = project
|
||||
.update(&mut cx, |project, cx| {
|
||||
.update(cx, |project, cx| {
|
||||
project.find_or_create_worktree(image_path.clone(), false, cx)
|
||||
})?
|
||||
.await
|
||||
.context("Path not found")?;
|
||||
let worktree_id = worktree.update(&mut cx, |worktree, _cx| worktree.id())?;
|
||||
let worktree_id = worktree.update(cx, |worktree, _cx| worktree.id())?;
|
||||
|
||||
let project_path = ProjectPath {
|
||||
worktree_id,
|
||||
|
@ -228,7 +228,7 @@ impl SerializableItem for ImageView {
|
|||
};
|
||||
|
||||
let image_item = project
|
||||
.update(&mut cx, |project, cx| project.open_image(project_path, cx))?
|
||||
.update(cx, |project, cx| project.open_image(project_path, cx))?
|
||||
.await?;
|
||||
|
||||
cx.update(|_, cx| Ok(cx.new(|cx| ImageView::new(image_item, project, cx))))?
|
||||
|
@ -241,8 +241,10 @@ impl SerializableItem for ImageView {
|
|||
window: &mut Window,
|
||||
cx: &mut App,
|
||||
) -> Task<gpui::Result<()>> {
|
||||
window.spawn(cx, |_| {
|
||||
IMAGE_VIEWER.delete_unloaded_items(workspace_id, alive_items)
|
||||
window.spawn(cx, async move |_| {
|
||||
IMAGE_VIEWER
|
||||
.delete_unloaded_items(workspace_id, alive_items)
|
||||
.await
|
||||
})
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue