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

12
crates/livekit_client/examples/test_app.rs
View file

@ -76,7 +76,7 @@ fn main() {
let height = px(800.);
let width = px(800.);
cx.spawn(|cx| async move {
cx.spawn(async move |cx| {
let mut windows = Vec::new();
for i in 0..2 {
let token = token::create(
@ -141,7 +141,7 @@ impl LivekitWindow {
},
|window, cx| {
cx.new(|cx| {
let _events_task = cx.spawn_in(window, |this, mut cx| async move {
let _events_task = cx.spawn_in(window, async move |this, cx| {
while let Some(event) = events.recv().await {
cx.update(|window, cx| {
this.update(cx, |this: &mut LivekitWindow, cx| {
@ -276,7 +276,7 @@ impl LivekitWindow {
cx.notify();
} else {
let participant = self.room.local_participant();
cx.spawn_in(window, |this, mut cx| async move {
cx.spawn_in(window, async move |this, cx| {
let (track, stream) = capture_local_audio_track(cx.background_executor())?.await;
let publication = participant
.publish_track(
@ -288,7 +288,7 @@ impl LivekitWindow {
)
.await
.unwrap();
this.update(&mut cx, |this, cx| {
this.update(cx, |this, cx| {
this.microphone_track = Some(publication);
this.microphone_stream = Some(stream);
cx.notify();
@ -310,7 +310,7 @@ impl LivekitWindow {
} else {
let participant = self.room.local_participant();
let sources = cx.screen_capture_sources();
cx.spawn_in(window, |this, mut cx| async move {
cx.spawn_in(window, async move |this, cx| {
let sources = sources.await.unwrap()?;
let source = sources.into_iter().next().unwrap();
let (track, stream) = capture_local_video_track(&*source).await?;
@ -325,7 +325,7 @@ impl LivekitWindow {
)
.await
.unwrap();
this.update(&mut cx, |this, cx| {
this.update(cx, |this, cx| {
this.screen_share_track = Some(publication);
this.screen_share_stream = Some(stream);
cx.notify();