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/repl/src/kernels/native_kernel.rs
View file

@ -118,7 +118,7 @@ impl NativeRunningKernel {
window: &mut Window,
cx: &mut App,
) -> Task<Result<Box<dyn RunningKernel>>> {
window.spawn(cx, |cx| async move {
window.spawn(cx, async move |cx| {
let ip = IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1));
let ports = peek_ports(ip).await?;
@ -177,10 +177,10 @@ impl NativeRunningKernel {
cx.spawn({
let session = session.clone();
|mut cx| async move {
async move |cx| {
while let Some(message) = messages_rx.next().await {
session
.update_in(&mut cx, |session, window, cx| {
.update_in(cx, |session, window, cx| {
session.route(&message, window, cx);
})
.ok();
@ -194,10 +194,10 @@ impl NativeRunningKernel {
cx.spawn({
let session = session.clone();
|mut cx| async move {
async move |cx| {
while let Ok(message) = iopub_socket.read().await {
session
.update_in(&mut cx, |session, window, cx| {
.update_in(cx, |session, window, cx| {
session.route(&message, window, cx);
})
.ok();
@ -253,7 +253,7 @@ impl NativeRunningKernel {
let stderr = process.stderr.take();
cx.spawn(|mut _cx| async move {
cx.spawn(async move |_cx| {
if stderr.is_none() {
return;
}
@ -267,7 +267,7 @@ impl NativeRunningKernel {
let stdout = process.stdout.take();
cx.spawn(|mut _cx| async move {
cx.spawn(async move |_cx| {
if stdout.is_none() {
return;
}
@ -281,7 +281,7 @@ impl NativeRunningKernel {
let status = process.status();
let process_status_task = cx.spawn(|mut cx| async move {
let process_status_task = cx.spawn(async move |cx| {
let error_message = match status.await {
Ok(status) => {
if status.success() {
@ -299,7 +299,7 @@ impl NativeRunningKernel {
log::error!("{}", error_message);
session
.update(&mut cx, |session, cx| {
.update(cx, |session, cx| {
session.kernel_errored(error_message, cx);
cx.notify();

8
crates/repl/src/kernels/remote_kernels.rs
View file

@ -148,7 +148,7 @@ impl RemoteRunningKernel {
let http_client = cx.http_client();
window.spawn(cx, |cx| async move {
window.spawn(cx, async move |cx| {
let kernel_id = launch_remote_kernel(
&remote_server,
http_client.clone(),
@ -201,12 +201,12 @@ impl RemoteRunningKernel {
let receiving_task = cx.spawn({
let session = session.clone();
|mut cx| async move {
async move |cx| {
while let Some(message) = r.next().await {
match message {
Ok(message) => {
session
.update_in(&mut cx, |session, window, cx| {
.update_in(cx, |session, window, cx| {
session.route(&message, window, cx);
})
.ok();
@ -281,7 +281,7 @@ impl RunningKernel for RemoteRunningKernel {
let token = self.remote_server.token.clone();
let http_client = self.http_client.clone();
window.spawn(cx, |_| async move {
window.spawn(cx, async move |_| {
let request = Request::builder()
.method("DELETE")
.uri(&url)