From 428f24b0f8282b59e8e5b5a7d8397d09a8084d56 Mon Sep 17 00:00:00 2001 From: Cameron Cordes Date: Thu, 7 May 2026 14:40:04 -0400 Subject: [PATCH] insight-chat: code-review polish on the chat system_prompt override - Trim the override input once via Option::map(str::trim).filter(...). - Use matches!() in restore_system_prompt_override's Prepended arm so it reads consistently with the Replaced arm. Co-Authored-By: Claude Opus 4.7 (1M context) --- src/ai/insight_chat.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/ai/insight_chat.rs b/src/ai/insight_chat.rs index 6724f8b..e782070 100644 --- a/src/ai/insight_chat.rs +++ b/src/ai/insight_chat.rs @@ -1205,10 +1205,7 @@ pub(crate) fn apply_system_prompt_override( messages: &mut Vec, override_prompt: Option<&str>, ) -> Option { - let prompt = match override_prompt { - Some(s) if !s.trim().is_empty() => s.trim().to_string(), - _ => return None, - }; + let prompt = override_prompt.map(str::trim).filter(|s| !s.is_empty())?.to_string(); if let Some(first) = messages.first_mut() && first.role == "system" { @@ -1235,7 +1232,7 @@ pub(crate) fn restore_system_prompt_override( } } SystemPromptStash::Prepended => { - if !messages.is_empty() && messages[0].role == "system" { + if matches!(messages.first(), Some(m) if m.role == "system") { messages.remove(0); } }