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
|
@ -7,7 +7,7 @@ use gpui::{App, AppContext as _, AsyncApp, Context, Entity, Global, Task, WeakEn
|
|||
use postage::stream::Stream;
|
||||
use rpc::proto;
|
||||
use std::{sync::Arc, time::Duration};
|
||||
use util::{ResultExt, TryFutureExt};
|
||||
use util::ResultExt;
|
||||
|
||||
impl Global for GlobalManager {}
|
||||
struct GlobalManager(Entity<Manager>);
|
||||
|
@ -65,7 +65,11 @@ impl Manager {
|
|||
if self.maintain_connection.is_none() {
|
||||
self.maintain_connection = Some(cx.spawn({
|
||||
let client = self.client.clone();
|
||||
move |_, cx| Self::maintain_connection(manager, client.clone(), cx).log_err()
|
||||
async move |_, cx| {
|
||||
Self::maintain_connection(manager, client.clone(), cx)
|
||||
.await
|
||||
.log_err()
|
||||
}
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
@ -102,11 +106,11 @@ impl Manager {
|
|||
.collect(),
|
||||
});
|
||||
|
||||
cx.spawn(|this, mut cx| async move {
|
||||
cx.spawn(async move |this, cx| {
|
||||
let response = request.await?;
|
||||
let message_id = response.message_id;
|
||||
|
||||
this.update(&mut cx, |_, cx| {
|
||||
this.update(cx, |_, cx| {
|
||||
for rejoined_project in response.payload.rejoined_projects {
|
||||
if let Some(project) = projects.get(&rejoined_project.id) {
|
||||
project.update(cx, |project, cx| {
|
||||
|
@ -133,7 +137,7 @@ impl Manager {
|
|||
async fn maintain_connection(
|
||||
this: WeakEntity<Self>,
|
||||
client: Arc<Client>,
|
||||
mut cx: AsyncApp,
|
||||
cx: &mut AsyncApp,
|
||||
) -> Result<()> {
|
||||
let mut client_status = client.status();
|
||||
loop {
|
||||
|
@ -155,7 +159,7 @@ impl Manager {
|
|||
log::info!("client reconnected, attempting to rejoin projects");
|
||||
|
||||
let Some(this) = this.upgrade() else { break };
|
||||
match this.update(&mut cx, |this, cx| this.reconnected(cx)) {
|
||||
match this.update(cx, |this, cx| this.reconnected(cx)) {
|
||||
Ok(task) => {
|
||||
if task.await.log_err().is_some() {
|
||||
return true;
|
||||
|
@ -204,7 +208,7 @@ impl Manager {
|
|||
// we leave the room and return an error.
|
||||
if let Some(this) = this.upgrade() {
|
||||
log::info!("reconnection failed, disconnecting projects");
|
||||
this.update(&mut cx, |this, cx| this.connection_lost(cx))?;
|
||||
this.update(cx, |this, cx| this.connection_lost(cx))?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue