From a07d0f4d2140b2bdf1da2d1721413077bc5c64e1 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Thu, 12 Mar 2026 18:49:17 -0400 Subject: [PATCH] Assign meaningful names to some single-letter bindings (#51432) This PR assigns meaningful names to some single-letter bindings we were using to refer to the organization. Release Notes: - N/A --- crates/language_model/src/model/cloud_model.rs | 2 +- crates/language_models/src/provider/cloud.rs | 6 +++--- crates/web_search_providers/src/cloud.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/language_model/src/model/cloud_model.rs b/crates/language_model/src/model/cloud_model.rs index e384ce05fa390677529235442c4cb91186520a02..527d24ec18c0f9ef08576a71fe92562dd94d4afd 100644 --- a/crates/language_model/src/model/cloud_model.rs +++ b/crates/language_model/src/model/cloud_model.rs @@ -159,7 +159,7 @@ impl RefreshLlmTokenListener { .user_store .read(cx) .current_organization() - .map(|o| o.id.clone()); + .map(|organization| organization.id.clone()); cx.spawn(async move |this, cx| { llm_api_token.refresh(&client, organization_id).await?; this.update(cx, |_this, cx| cx.emit(LlmTokenRefreshedEvent)) diff --git a/crates/language_models/src/provider/cloud.rs b/crates/language_models/src/provider/cloud.rs index 610b0167b86f8bf4426b671cedad45a28c3fdc6d..4fdf06cc959ccc853f92f4e150978cd15c8e70d3 100644 --- a/crates/language_models/src/provider/cloud.rs +++ b/crates/language_models/src/provider/cloud.rs @@ -157,7 +157,7 @@ impl State { .user_store .read(cx) .current_organization() - .map(|o| o.id.clone()); + .map(|organization| organization.id.clone()); cx.spawn(async move |this, cx| { let response = Self::fetch_models(client, llm_api_token, organization_id).await?; @@ -705,7 +705,7 @@ impl LanguageModel for CloudLanguageModel { .user_store .read(cx) .current_organization() - .map(|o| o.id.clone()); + .map(|organization| organization.id.clone()); let model_id = self.model.id.to_string(); let generate_content_request = into_google(request, model_id.clone(), GoogleModelMode::Default); @@ -777,7 +777,7 @@ impl LanguageModel for CloudLanguageModel { user_store .read(cx) .current_organization() - .map(|o| o.id.clone()) + .map(|organization| organization.id.clone()) }); let thinking_allowed = request.thinking_allowed; let enable_thinking = thinking_allowed && self.model.supports_thinking; diff --git a/crates/web_search_providers/src/cloud.rs b/crates/web_search_providers/src/cloud.rs index 51be6c9ddff01a956eebabe3e44166ae15de4515..17addd24d445a666138a1b37fef872beedd07aed 100644 --- a/crates/web_search_providers/src/cloud.rs +++ b/crates/web_search_providers/src/cloud.rs @@ -55,7 +55,7 @@ impl WebSearchProvider for CloudWebSearchProvider { .user_store .read(cx) .current_organization() - .map(|o| o.id.clone()); + .map(|organization| organization.id.clone()); let body = WebSearchBody { query }; cx.background_spawn(async move { perform_web_search(client, llm_api_token, organization_id, body).await