diff --git a/codex-rs/core/src/codex.rs b/codex-rs/core/src/codex.rs
index 9493e28f54..4891e22bdd 100644
--- a/codex-rs/core/src/codex.rs
+++ b/codex-rs/core/src/codex.rs
@@ -1884,7 +1884,7 @@ impl Session {
 
             let hint = cwd.file_name().and_then(|name| name.to_str()).map_or_else(
                 || cwd.to_string_lossy().into_owned(),
-                |name| name.to_string(),
+                std::string::ToString::to_string,
             );
 
             let mut workspaces = BTreeMap::new();
diff --git a/codex-rs/core/src/environment_context.rs b/codex-rs/core/src/environment_context.rs
index 2961b4f4ea..aabc27b0d3 100644
--- a/codex-rs/core/src/environment_context.rs
+++ b/codex-rs/core/src/environment_context.rs
@@ -282,11 +282,8 @@ mod tests {
             },
         );
         let workspace_configuration = WorkspaceConfiguration { workspaces };
-        let context = EnvironmentContext::new(
-            Some(cwd.clone()),
-            fake_shell(),
-            Some(workspace_configuration),
-        );
+        let context =
+            EnvironmentContext::new(Some(cwd), fake_shell(), Some(workspace_configuration));
 
         let expected = r#"<environment_context>
   <cwd>/repo</cwd>