mirror of
https://github.com/openai/codex.git
synced 2026-08-23 13:09:46 +00:00
fix: update crossbeam-epoch for RUSTSEC-2026-0204 (#31308)
Bump our crossbeam-epoch dep to fix cargo-deny.
This commit is contained in:
2
MODULE.bazel.lock
generated
2
MODULE.bazel.lock
generated
@@ -804,7 +804,7 @@
|
||||
"critical-section_1.2.0": "{\"dependencies\":[],\"features\":{\"restore-state-bool\":[],\"restore-state-none\":[],\"restore-state-u16\":[],\"restore-state-u32\":[],\"restore-state-u64\":[],\"restore-state-u8\":[],\"restore-state-usize\":[],\"std\":[\"restore-state-bool\"]}}",
|
||||
"crossbeam-channel_0.5.15": "{\"dependencies\":[{\"default_features\":false,\"name\":\"crossbeam-utils\",\"req\":\"^0.8.18\"},{\"kind\":\"dev\",\"name\":\"num_cpus\",\"req\":\"^1.13.0\"},{\"kind\":\"dev\",\"name\":\"rand\",\"req\":\"^0.8\"},{\"kind\":\"dev\",\"name\":\"signal-hook\",\"req\":\"^0.3\"}],\"features\":{\"default\":[\"std\"],\"std\":[\"crossbeam-utils/std\"]}}",
|
||||
"crossbeam-deque_0.8.6": "{\"dependencies\":[{\"default_features\":false,\"name\":\"crossbeam-epoch\",\"req\":\"^0.9.17\"},{\"default_features\":false,\"name\":\"crossbeam-utils\",\"req\":\"^0.8.18\"},{\"kind\":\"dev\",\"name\":\"rand\",\"req\":\"^0.8\"}],\"features\":{\"default\":[\"std\"],\"std\":[\"crossbeam-epoch/std\",\"crossbeam-utils/std\"]}}",
|
||||
"crossbeam-epoch_0.9.18": "{\"dependencies\":[{\"default_features\":false,\"name\":\"crossbeam-utils\",\"req\":\"^0.8.18\"},{\"name\":\"loom-crate\",\"optional\":true,\"package\":\"loom\",\"req\":\"^0.7.1\",\"target\":\"cfg(crossbeam_loom)\"},{\"kind\":\"dev\",\"name\":\"rand\",\"req\":\"^0.8\"}],\"features\":{\"alloc\":[],\"default\":[\"std\"],\"loom\":[\"loom-crate\",\"crossbeam-utils/loom\"],\"nightly\":[\"crossbeam-utils/nightly\"],\"std\":[\"alloc\",\"crossbeam-utils/std\"]}}",
|
||||
"crossbeam-epoch_0.9.20": "{\"dependencies\":[{\"default_features\":false,\"name\":\"crossbeam-utils\",\"req\":\"^0.8.18\"},{\"name\":\"loom-crate\",\"optional\":true,\"package\":\"loom\",\"req\":\"^0.7.1\",\"target\":\"cfg(crossbeam_loom)\"},{\"kind\":\"dev\",\"name\":\"rand\",\"req\":\"^0.8\"}],\"features\":{\"alloc\":[],\"default\":[\"std\"],\"loom\":[\"loom-crate\",\"crossbeam-utils/loom\"],\"nightly\":[\"crossbeam-utils/nightly\"],\"std\":[\"alloc\",\"crossbeam-utils/std\"]}}",
|
||||
"crossbeam-queue_0.3.12": "{\"dependencies\":[{\"default_features\":false,\"name\":\"crossbeam-utils\",\"req\":\"^0.8.18\"},{\"kind\":\"dev\",\"name\":\"rand\",\"req\":\"^0.8\"}],\"features\":{\"alloc\":[],\"default\":[\"std\"],\"nightly\":[\"crossbeam-utils/nightly\"],\"std\":[\"alloc\",\"crossbeam-utils/std\"]}}",
|
||||
"crossbeam-utils_0.8.21": "{\"dependencies\":[{\"name\":\"loom\",\"optional\":true,\"req\":\"^0.7.1\",\"target\":\"cfg(crossbeam_loom)\"},{\"kind\":\"dev\",\"name\":\"rand\",\"req\":\"^0.8\"}],\"features\":{\"default\":[\"std\"],\"nightly\":[],\"std\":[]}}",
|
||||
"crossterm_winapi_0.9.1": "{\"dependencies\":[{\"features\":[\"winbase\",\"consoleapi\",\"processenv\",\"handleapi\",\"synchapi\",\"impl-default\"],\"name\":\"winapi\",\"req\":\"^0.3.8\",\"target\":\"cfg(windows)\"}],\"features\":{}}",
|
||||
|
||||
5
codex-rs/Cargo.lock
generated
5
codex-rs/Cargo.lock
generated
@@ -2526,6 +2526,7 @@ dependencies = [
|
||||
"codex-utils-cargo-bin",
|
||||
"pretty_assertions",
|
||||
"serde_json",
|
||||
"tempfile",
|
||||
"tokio",
|
||||
"tokio-util",
|
||||
]
|
||||
@@ -4822,9 +4823,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-epoch"
|
||||
version = "0.9.18"
|
||||
version = "0.9.20"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
|
||||
checksum = "2d6914041f254d6e9176c01941b21115dcfb7089e55135a35411081bd106ef3f"
|
||||
dependencies = [
|
||||
"crossbeam-utils",
|
||||
]
|
||||
|
||||
@@ -28,3 +28,4 @@ codex-protocol = { workspace = true }
|
||||
codex-utils-cargo-bin = { workspace = true }
|
||||
pretty_assertions = { workspace = true }
|
||||
serde_json = { workspace = true }
|
||||
tempfile = { workspace = true }
|
||||
|
||||
@@ -504,13 +504,17 @@ return;
|
||||
next_callback_event(&mut events_rx).await,
|
||||
CallbackEvent::Started("tool_call_slow".to_string())
|
||||
);
|
||||
assert_eq!(
|
||||
let mut closure_events = vec![
|
||||
next_callback_event(&mut events_rx).await,
|
||||
CallbackEvent::Cancelled("tool_call_slow".to_string())
|
||||
);
|
||||
assert_eq!(
|
||||
next_callback_event(&mut events_rx).await,
|
||||
CallbackEvent::CellClosed(running_cell_id.clone())
|
||||
];
|
||||
closure_events.sort_by(|left, right| format!("{left:?}").cmp(&format!("{right:?}")));
|
||||
assert_eq!(
|
||||
closure_events,
|
||||
vec![
|
||||
CallbackEvent::Cancelled("tool_call_slow".to_string()),
|
||||
CallbackEvent::CellClosed(running_cell_id.clone()),
|
||||
]
|
||||
);
|
||||
assert_eq!(
|
||||
wait_task
|
||||
@@ -677,12 +681,9 @@ async fn oversized_initial_response_does_not_close_the_shared_host() {
|
||||
async fn child_process_loss_cleans_up_and_rebuilds_the_shared_host() {
|
||||
let host_program =
|
||||
codex_utils_cargo_bin::cargo_bin("codex-code-mode-host").expect("host binary");
|
||||
let proxy_dir =
|
||||
std::env::temp_dir().join(format!("codex-code-mode-host-loss-{}", std::process::id()));
|
||||
let proxy_program = proxy_dir.join("host-proxy.sh");
|
||||
let pid_path = proxy_dir.join("host.pid");
|
||||
let _ = std::fs::remove_dir_all(&proxy_dir);
|
||||
std::fs::create_dir_all(&proxy_dir).expect("create host proxy directory");
|
||||
let proxy_dir = tempfile::tempdir().expect("create host proxy directory");
|
||||
let proxy_program = proxy_dir.path().join("host-proxy.sh");
|
||||
let pid_path = proxy_dir.path().join("host.pid");
|
||||
std::fs::write(
|
||||
&proxy_program,
|
||||
format!(
|
||||
@@ -869,6 +870,4 @@ async fn child_process_loss_cleans_up_and_rebuilds_the_shared_host() {
|
||||
events_a.try_recv(),
|
||||
Err(mpsc::error::TryRecvError::Empty)
|
||||
));
|
||||
|
||||
std::fs::remove_dir_all(proxy_dir).expect("remove host proxy directory");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user