mirror of
https://github.com/openai/codex.git
synced 2026-11-16 22:00:36 +00:00
codex: fix TaskAbort compile break on PR #26259
This commit is contained in:
@@ -15,7 +15,6 @@ use codex_protocol::protocol::GuardianRiskLevel;
|
||||
use codex_protocol::protocol::GuardianUserAuthorization;
|
||||
use codex_protocol::protocol::ReviewDecision;
|
||||
use codex_protocol::protocol::SubAgentSource;
|
||||
use codex_protocol::protocol::TurnAbortReason;
|
||||
use codex_protocol::protocol::WarningEvent;
|
||||
use std::sync::Arc;
|
||||
use tokio::sync::oneshot;
|
||||
|
||||
@@ -47,7 +47,6 @@ use codex_protocol::protocol::ThreadRolledBackEvent;
|
||||
use codex_protocol::protocol::ThreadSettingsAppliedEvent;
|
||||
use codex_protocol::protocol::ThreadSettingsOverrides;
|
||||
use codex_protocol::protocol::ThreadSettingsSnapshot;
|
||||
use codex_protocol::protocol::TurnAbortReason;
|
||||
use codex_protocol::protocol::WarningEvent;
|
||||
use codex_protocol::request_permissions::RequestPermissionsResponse;
|
||||
use codex_protocol::request_user_input::RequestUserInputResponse;
|
||||
|
||||
@@ -113,7 +113,6 @@ use codex_protocol::protocol::RolloutItem;
|
||||
use codex_protocol::protocol::SessionSource;
|
||||
use codex_protocol::protocol::SubAgentSource;
|
||||
use codex_protocol::protocol::ThreadSource;
|
||||
use codex_protocol::protocol::TurnAbortReason;
|
||||
use codex_protocol::protocol::TurnContextItem;
|
||||
use codex_protocol::protocol::TurnContextNetworkItem;
|
||||
use codex_protocol::protocol::TurnEnvironmentSelection;
|
||||
|
||||
@@ -65,7 +65,7 @@ pub(crate) use user_shell::execute_user_shell_command;
|
||||
const GRACEFULL_INTERRUPTION_TIMEOUT_MS: u64 = 100;
|
||||
const TASK_COMPACT_METRIC: &str = "codex.task.compact";
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
#[derive(Debug, Clone, PartialEq)]
|
||||
enum TaskAbort {
|
||||
Standard(TurnAbortReason),
|
||||
Interrupted(InterruptReason),
|
||||
@@ -79,16 +79,16 @@ impl TaskAbort {
|
||||
}
|
||||
}
|
||||
|
||||
fn turn_abort_reason(self) -> TurnAbortReason {
|
||||
fn turn_abort_reason(&self) -> TurnAbortReason {
|
||||
match self {
|
||||
Self::Standard(reason) => reason,
|
||||
Self::Standard(reason) => reason.clone(),
|
||||
Self::Interrupted(_) => TurnAbortReason::Interrupted,
|
||||
}
|
||||
}
|
||||
|
||||
fn interrupt_reason(self) -> Option<InterruptReason> {
|
||||
fn interrupt_reason(&self) -> Option<InterruptReason> {
|
||||
match self {
|
||||
Self::Interrupted(reason) => Some(reason),
|
||||
Self::Interrupted(reason) => Some(*reason),
|
||||
Self::Standard(_) => None,
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user