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:
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user