Skip to content

Commit e63e173

Browse files
authored
Merge bb185e9 into sapling-pr-archive-bolinfest
2 parents 6662e71 + bb185e9 commit e63e173

File tree

6 files changed

+6
-30
lines changed

6 files changed

+6
-30
lines changed

.github/workflows/rust-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
working-directory: codex-rs
5858
steps:
5959
- uses: actions/checkout@v5
60-
- uses: dtolnay/rust-toolchain@1.89
60+
- uses: dtolnay/rust-toolchain@1.90
6161
with:
6262
components: rustfmt
6363
- name: cargo fmt
@@ -75,7 +75,7 @@ jobs:
7575
working-directory: codex-rs
7676
steps:
7777
- uses: actions/checkout@v5
78-
- uses: dtolnay/rust-toolchain@1.89
78+
- uses: dtolnay/rust-toolchain@1.90
7979
- uses: taiki-e/install-action@0c5db7f7f897c03b771660e91d065338615679f4 # v2
8080
with:
8181
tool: cargo-shear
@@ -143,7 +143,7 @@ jobs:
143143

144144
steps:
145145
- uses: actions/checkout@v5
146-
- uses: dtolnay/rust-toolchain@1.89
146+
- uses: dtolnay/rust-toolchain@1.90
147147
with:
148148
targets: ${{ matrix.target }}
149149
components: clippy

.github/workflows/rust-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777

7878
steps:
7979
- uses: actions/checkout@v5
80-
- uses: dtolnay/rust-toolchain@1.89
80+
- uses: dtolnay/rust-toolchain@1.90
8181
with:
8282
targets: ${{ matrix.target }}
8383

codex-rs/core/src/client.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -414,9 +414,6 @@ struct SseEvent {
414414
delta: Option<String>,
415415
}
416416

417-
#[derive(Debug, Deserialize)]
418-
struct ResponseCreated {}
419-
420417
#[derive(Debug, Deserialize)]
421418
struct ResponseCompleted {
422419
id: String,

codex-rs/core/src/rollout/recorder.rs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ use std::path::Path;
77
use std::path::PathBuf;
88

99
use codex_protocol::mcp_protocol::ConversationId;
10-
use serde::Deserialize;
11-
use serde::Serialize;
1210
use serde_json::Value;
1311
use time::OffsetDateTime;
1412
use time::format_description::FormatItem;
@@ -28,27 +26,13 @@ use super::policy::is_persisted_response_item;
2826
use crate::config::Config;
2927
use crate::default_client::ORIGINATOR;
3028
use crate::git_info::collect_git_info;
31-
use codex_protocol::models::ResponseItem;
3229
use codex_protocol::protocol::InitialHistory;
3330
use codex_protocol::protocol::ResumedHistory;
3431
use codex_protocol::protocol::RolloutItem;
3532
use codex_protocol::protocol::RolloutLine;
3633
use codex_protocol::protocol::SessionMeta;
3734
use codex_protocol::protocol::SessionMetaLine;
3835

39-
#[derive(Serialize, Deserialize, Default, Clone)]
40-
pub struct SessionStateSnapshot {}
41-
42-
#[derive(Serialize, Deserialize, Default, Clone)]
43-
pub struct SavedSession {
44-
pub session: SessionMeta,
45-
#[serde(default)]
46-
pub items: Vec<ResponseItem>,
47-
#[serde(default)]
48-
pub state: SessionStateSnapshot,
49-
pub session_id: ConversationId,
50-
}
51-
5236
/// Records all [`ResponseItem`]s for a session and flushes them to disk after
5337
/// every update.
5438
///

codex-rs/core/src/tool_apply_patch.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ use crate::openai_tools::ResponsesApiTool;
1010

1111
const APPLY_PATCH_LARK_GRAMMAR: &str = include_str!("tool_apply_patch.lark");
1212

13-
#[derive(Serialize, Deserialize)]
14-
pub(crate) struct ApplyPatchToolArgs {
15-
pub(crate) input: String,
16-
}
17-
1813
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Hash)]
1914
#[serde(rename_all = "snake_case")]
2015
pub enum ApplyPatchToolType {

codex-rs/rust-toolchain.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "1.89.0"
3-
components = [ "clippy", "rustfmt", "rust-src"]
2+
channel = "1.90.0"
3+
components = ["clippy", "rustfmt", "rust-src"]

0 commit comments

Comments
 (0)