From 722eee3ea5f0d0f6fe455fd53342b47527019d9a Mon Sep 17 00:00:00 2001 From: YeonGyu-Kim Date: Thu, 2 Apr 2026 14:58:06 +0900 Subject: [PATCH] fix(api): remove unnecessary Result from tool call start events Resolves clippy::unnecessary_wraps on ToolCallState::start_event in openai_compat.rs. Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus --- rust/crates/api/src/providers/openai_compat.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rust/crates/api/src/providers/openai_compat.rs b/rust/crates/api/src/providers/openai_compat.rs index 7b05136..3289769 100644 --- a/rust/crates/api/src/providers/openai_compat.rs +++ b/rust/crates/api/src/providers/openai_compat.rs @@ -385,7 +385,7 @@ impl StreamState { state.apply(tool_call); let block_index = state.block_index(); if !state.started { - if let Some(start_event) = state.start_event()? { + if let Some(start_event) = state.start_event() { state.started = true; events.push(StreamEvent::ContentBlockStart(start_event)); } else { @@ -437,7 +437,7 @@ impl StreamState { for state in self.tool_calls.values_mut() { if !state.started { - if let Some(start_event) = state.start_event()? { + if let Some(start_event) = state.start_event() { state.started = true; events.push(StreamEvent::ContentBlockStart(start_event)); if let Some(delta_event) = state.delta_event() { @@ -505,22 +505,22 @@ impl ToolCallState { self.openai_index + 1 } - fn start_event(&self) -> Result, ApiError> { + fn start_event(&self) -> Option { let Some(name) = self.name.clone() else { - return Ok(None); + return None; }; let id = self .id .clone() .unwrap_or_else(|| format!("tool_call_{}", self.openai_index)); - Ok(Some(ContentBlockStartEvent { + Some(ContentBlockStartEvent { index: self.block_index(), content_block: OutputContentBlock::ToolUse { id, name, input: json!({}), }, - })) + }) } fn delta_event(&mut self) -> Option {