From 64069d53f5ea96c6bb681a11cc221e586ab51b63 Mon Sep 17 00:00:00 2001 From: Richard Feldman Date: Mon, 6 Apr 2026 14:51:54 -0400 Subject: [PATCH] Use gpui executor timer instead of disallowed smol::Timer smol::Timer::after is banned by a project-wide clippy lint. Pass the AsyncApp through to await_oauth_callback so it can use cx.background_executor().timer() instead. --- crates/language_models/src/provider/openai_subscribed.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/language_models/src/provider/openai_subscribed.rs b/crates/language_models/src/provider/openai_subscribed.rs index e8fb7f058710b98c384f8df31575d7f3fbd1bf08..fa7af5dfce74ea2b72aac164d9cd1d4f35668d3c 100644 --- a/crates/language_models/src/provider/openai_subscribed.rs +++ b/crates/language_models/src/provider/openai_subscribed.rs @@ -604,7 +604,7 @@ async fn do_oauth_flow( cx.update(|cx| cx.open_url(auth_url.as_str())); - let code = await_oauth_callback(&oauth_state) + let code = await_oauth_callback(&oauth_state, cx) .await .context("OAuth callback failed")?; @@ -627,13 +627,13 @@ async fn do_oauth_flow( }) } -async fn await_oauth_callback(expected_state: &str) -> Result { +async fn await_oauth_callback(expected_state: &str, cx: &AsyncApp) -> Result { let listener = smol::net::TcpListener::bind("127.0.0.1:1455") .await .context("Failed to bind to port 1455 for OAuth callback. Another application may be using this port.")?; let accept_future = listener.accept(); - let timeout_future = smol::Timer::after(Duration::from_secs(120)); + let timeout_future = cx.background_executor().timer(Duration::from_secs(120)); let (mut stream, _) = match futures::future::select( std::pin::pin!(accept_future),