From c11e2f3d1d8019d786e3b6bade20a477fc2a17e7 Mon Sep 17 00:00:00 2001
From: David Wiesen <iceweasel@openai.com>
Date: Mon, 15 Jun 2026 09:35:55 -0700
Subject: [PATCH] Fix non-Windows direct-spawn clippy

---
 codex-rs/sandboxing/src/manager.rs       | 10 ++++++----
 codex-rs/sandboxing/src/manager_tests.rs |  3 ++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/codex-rs/sandboxing/src/manager.rs b/codex-rs/sandboxing/src/manager.rs
index 759a4e5c16..b0e86be7d7 100644
--- a/codex-rs/sandboxing/src/manager.rs
+++ b/codex-rs/sandboxing/src/manager.rs
@@ -362,11 +362,13 @@ impl SandboxManager {
         &self,
         request: SandboxDirectSpawnTransformRequest<'_>,
     ) -> Result<SandboxExecRequest, SandboxTransformError> {
-        let SandboxDirectSpawnTransformRequest {
-            transform,
-            workspace_roots,
-        } = request;
+        let transform = request.transform;
+        #[cfg(target_os = "windows")]
+        let workspace_roots = request.workspace_roots;
+        #[cfg(target_os = "windows")]
         let mut request = self.transform(transform)?;
+        #[cfg(not(target_os = "windows"))]
+        let request = self.transform(transform)?;
         #[cfg(target_os = "windows")]
         if request.sandbox == SandboxType::WindowsRestrictedToken {
             wrap_windows_sandbox_exec_request_for_direct_spawn(&mut request, workspace_roots)?;
diff --git a/codex-rs/sandboxing/src/manager_tests.rs b/codex-rs/sandboxing/src/manager_tests.rs
index 02184c6f30..36869411c3 100644
--- a/codex-rs/sandboxing/src/manager_tests.rs
+++ b/codex-rs/sandboxing/src/manager_tests.rs
@@ -1,4 +1,5 @@
 use super::SandboxCommand;
+#[cfg(target_os = "windows")]
 use super::SandboxDirectSpawnTransformRequest;
 use super::SandboxManager;
 use super::SandboxTransformRequest;
@@ -488,7 +489,7 @@ fn transform_for_direct_spawn_windows_materializes_inner_helper() {
     let configured_helper = helper_dir.path().join("configured-codex-helper.exe");
     std::fs::write(&configured_helper, b"helper").expect("write configured helper");
     let cwd = AbsolutePathBuf::from_absolute_path(helper_dir.path()).expect("absolute cwd");
-    let cwd_uri = PathUri::from_abs_path(&cwd).expect("cwd URI");
+    let cwd_uri = PathUri::from_abs_path(&cwd);
     let other_workspace = tempfile::TempDir::new().expect("other workspace");
     let other_workspace_root = AbsolutePathBuf::from_absolute_path(other_workspace.path())
         .expect("absolute other workspace");