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

20
crates/zeta/src/zeta.rs
View file

@ -262,7 +262,7 @@ impl Zeta {
|this, _listener, _event, cx| {
let client = this.client.clone();
let llm_token = this.llm_token.clone();
cx.spawn(|_this, _cx| async move {
cx.spawn(async move |_this, _cx| {
llm_token.refresh(&client).await?;
anyhow::Ok(())
})
@ -405,7 +405,7 @@ impl Zeta {
None
};
cx.spawn(|_, cx| async move {
cx.spawn(async move |_, cx| {
let request_sent_at = Instant::now();
struct BackgroundValues {
@ -666,12 +666,12 @@ and then another
),
];
cx.spawn(|zeta, mut cx| async move {
cx.spawn(async move |zeta, cx| {
for task in completion_tasks {
task.await.unwrap();
}
zeta.update(&mut cx, |zeta, _cx| {
zeta.update(cx, |zeta, _cx| {
zeta.shown_completions.get_mut(2).unwrap().edits = Arc::new([]);
zeta.shown_completions.get_mut(3).unwrap().edits = Arc::new([]);
})
@ -806,7 +806,7 @@ and then another
let snapshot = snapshot.clone();
let request_id = prediction_response.request_id;
let output_excerpt = prediction_response.output_excerpt;
cx.spawn(|cx| async move {
cx.spawn(async move |cx| {
let output_excerpt: Arc<str> = output_excerpt.into();
let edits: Arc<[(Range<Anchor>, String)]> = cx
@ -819,7 +819,7 @@ and then another
.await?
.into();
let Some((edits, snapshot, edit_preview)) = buffer.read_with(&cx, {
let Some((edits, snapshot, edit_preview)) = buffer.read_with(cx, {
let edits = edits.clone();
|buffer, cx| {
let new_snapshot = buffer.snapshot();
@ -1457,14 +1457,14 @@ impl inline_completion::EditPredictionProvider for ZetaInlineCompletionProvider
let can_collect_data = self.provider_data_collection.can_collect_data(cx);
let last_request_timestamp = self.last_request_timestamp;
let task = cx.spawn(|this, mut cx| async move {
let task = cx.spawn(async move |this, cx| {
if let Some(timeout) = (last_request_timestamp + Self::THROTTLE_TIMEOUT)
.checked_duration_since(Instant::now())
{
cx.background_executor().timer(timeout).await;
}
let completion_request = this.update(&mut cx, |this, cx| {
let completion_request = this.update(cx, |this, cx| {
this.last_request_timestamp = Instant::now();
this.zeta.update(cx, |zeta, cx| {
zeta.request_completion(
@ -1494,7 +1494,7 @@ impl inline_completion::EditPredictionProvider for ZetaInlineCompletionProvider
.log_err()
.flatten()
else {
this.update(&mut cx, |this, cx| {
this.update(cx, |this, cx| {
if this.pending_completions[0].id == pending_completion_id {
this.pending_completions.remove(0);
} else {
@ -1507,7 +1507,7 @@ impl inline_completion::EditPredictionProvider for ZetaInlineCompletionProvider
return;
};
this.update(&mut cx, |this, cx| {
this.update(cx, |this, cx| {
if this.pending_completions[0].id == pending_completion_id {
this.pending_completions.remove(0);
} else {