From b887124e72b6247b2beed4dc7f3e339a1611503f Mon Sep 17 00:00:00 2001
From: Michael Bolin <mbolin@openai.com>
Date: Mon, 18 Aug 2025 09:47:10 -0700
Subject: [PATCH] chore: prefer returning Err to expect()

---
 codex-rs/login/src/server.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/codex-rs/login/src/server.rs b/codex-rs/login/src/server.rs
index ef85df69ea..19ef4c1cfe 100644
--- a/codex-rs/login/src/server.rs
+++ b/codex-rs/login/src/server.rs
@@ -59,10 +59,9 @@ pub struct LoginServer {
 
 impl LoginServer {
     pub fn block_until_done(self) -> io::Result<()> {
-        #[expect(clippy::expect_used)]
         self.server_handle
             .join()
-            .expect("can't join on the server thread")
+            .map_err(|err| io::Error::other(format!("login server thread panicked: {err:?}")))?
     }
 
     pub fn cancel(&self) {