From 394215599acdfe4be8355e998e7abdfbe862212e Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Wed, 19 Mar 2025 11:26:19 -0400 Subject: [PATCH] assistant2: Fix broken merge (#27081) This PR fixes a broken merge caused by https://github.com/zed-industries/zed/pull/26987 landing after https://github.com/zed-industries/zed/pull/26758. Release Notes: - N/A --- crates/assistant2/src/thread.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/assistant2/src/thread.rs b/crates/assistant2/src/thread.rs index f241b4a571b279222db23d88c4c7f0de910b6700..8f65a1d1b36f6939db41c16ec0e27112efa99421 100644 --- a/crates/assistant2/src/thread.rs +++ b/crates/assistant2/src/thread.rs @@ -605,7 +605,7 @@ impl Thread { let task = cx.spawn(async move |thread, cx| { let stream = model.stream_completion(request, &cx); let initial_token_usage = - thread.read_with(&cx, |thread, _cx| thread.cumulative_token_usage.clone()); + thread.read_with(cx, |thread, _cx| thread.cumulative_token_usage.clone()); let stream_completion = async { let mut events = stream.await?; let mut stop_reason = StopReason::EndTurn;