From de9f3d3835e44c1b520d3b0a8393315e6a5b6d31 Mon Sep 17 00:00:00 2001 From: Ahmed Ibrahim <219906144+aibrahim-oai@users.noreply.github.com> Date: Tue, 17 Mar 2026 21:04:17 +0000 Subject: [PATCH 1/3] codex: fix CI failure on PR #14902 Co-authored-by: Codex --- codex-rs/core/src/realtime_conversation.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/codex-rs/core/src/realtime_conversation.rs b/codex-rs/core/src/realtime_conversation.rs index 17c1450cca..277e9c5839 100644 --- a/codex-rs/core/src/realtime_conversation.rs +++ b/codex-rs/core/src/realtime_conversation.rs @@ -485,9 +485,7 @@ async fn prepare_realtime_start( RealtimeWsMode::Conversational => RealtimeSessionMode::Conversational, RealtimeWsMode::Transcription => RealtimeSessionMode::Transcription, }; - let requested_session_id = params - .session_id - .or_else(|| Some(sess.conversation_id.to_string())); + let requested_session_id = params.session_id.or(Some(sess.conversation_id.to_string())); let session_config = RealtimeSessionConfig { instructions: prompt, model, @@ -620,9 +618,7 @@ fn realtime_text_from_handoff_request(handoff: &RealtimeHandoffRequested) -> Opt .join("\n"); (!active_transcript.is_empty()) .then_some(active_transcript) - .or_else(|| { - (!handoff.input_transcript.is_empty()).then(|| handoff.input_transcript.clone()) - }) + .or((!handoff.input_transcript.is_empty()).then_some(handoff.input_transcript.clone())) } fn realtime_api_key( From b8d83bb0ef410fde94b7183924ad084e6c3e4332 Mon Sep 17 00:00:00 2001 From: Ahmed Ibrahim <219906144+aibrahim-oai@users.noreply.github.com> Date: Tue, 17 Mar 2026 21:14:02 +0000 Subject: [PATCH 2/3] codex: fix remaining lint on PR #14902 Co-authored-by: Codex --- codex-rs/core/src/realtime_conversation.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codex-rs/core/src/realtime_conversation.rs b/codex-rs/core/src/realtime_conversation.rs index 277e9c5839..cf7f008a60 100644 --- a/codex-rs/core/src/realtime_conversation.rs +++ b/codex-rs/core/src/realtime_conversation.rs @@ -983,7 +983,7 @@ fn update_output_audio_state( fn audio_duration_ms(frame: &RealtimeAudioFrame) -> u32 { let Some(samples_per_channel) = frame .samples_per_channel - .or_else(|| decoded_samples_per_channel(frame)) + .or(decoded_samples_per_channel(frame)) else { return 0; }; From 548f90dc4824e5d7398bf23ce8ed5b143a6a8214 Mon Sep 17 00:00:00 2001 From: Ahmed Ibrahim <219906144+aibrahim-oai@users.noreply.github.com> Date: Tue, 17 Mar 2026 21:57:32 +0000 Subject: [PATCH 3/3] codex: fix clippy single-match on PR #14902 Co-authored-by: Codex --- codex-rs/core/src/realtime_conversation.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/codex-rs/core/src/realtime_conversation.rs b/codex-rs/core/src/realtime_conversation.rs index cf7f008a60..13727d0b26 100644 --- a/codex-rs/core/src/realtime_conversation.rs +++ b/codex-rs/core/src/realtime_conversation.rs @@ -393,15 +393,14 @@ async fn stop_conversation_state( state.input_task.abort(); let _ = state.input_task.await; - match state.fanout_task.take() { - Some(fanout_task) => match fanout_task_stop { + if let Some(fanout_task) = state.fanout_task.take() { + match fanout_task_stop { RealtimeFanoutTaskStop::Abort => { fanout_task.abort(); let _ = fanout_task.await; } RealtimeFanoutTaskStop::Detach => {} - }, - None => {} + } } }