Update cargo to 2024 edition (#842)

Some effects of this change:
- New formatting changes across many files. No functionality changes
should occur from that.
- Calls to `set_env` are considered unsafe, since this only happens in
tests we wrap them in `unsafe` blocks

codex-rs/core/src/client.rs

@@ -14,8 +14,8 @@ use futures::prelude::*;
 use reqwest::StatusCode;
 use serde::Deserialize;
 use serde::Serialize;
-use serde_json::json;
 use serde_json::Value;
+use serde_json::json;
 use tokio::sync::mpsc;
 use tokio::time::timeout;
 use tokio_util::io::ReaderStream;
@@ -25,11 +25,11 @@ use tracing::warn;
 
 use crate::error::CodexErr;
 use crate::error::Result;
-use crate::flags::get_api_key;
 use crate::flags::CODEX_RS_SSE_FIXTURE;
 use crate::flags::OPENAI_API_BASE;
 use crate::flags::OPENAI_REQUEST_MAX_RETRIES;
 use crate::flags::OPENAI_STREAM_IDLE_TIMEOUT_MS;
+use crate::flags::get_api_key;
 use crate::models::ResponseItem;
 use crate::util::backoff;
 

codex-rs/core/src/codex.rs

@@ -9,18 +9,18 @@ use std::sync::Mutex;
 use anyhow::Context;
 use async_channel::Receiver;
 use async_channel::Sender;
-use codex_apply_patch::maybe_parse_apply_patch_verified;
-use codex_apply_patch::print_summary;
 use codex_apply_patch::AffectedPaths;
 use codex_apply_patch::ApplyPatchAction;
 use codex_apply_patch::ApplyPatchFileChange;
 use codex_apply_patch::MaybeApplyPatchVerified;
+use codex_apply_patch::maybe_parse_apply_patch_verified;
+use codex_apply_patch::print_summary;
 use fs_err as fs;
 use futures::prelude::*;
 use serde::Serialize;
 use serde_json;
-use tokio::sync::oneshot;
 use tokio::sync::Notify;
+use tokio::sync::oneshot;
 use tokio::task::AbortHandle;
 use tracing::debug;
 use tracing::error;
@@ -35,13 +35,13 @@ use crate::config::Config;
 use crate::config::ConfigOverrides;
 use crate::error::CodexErr;
 use crate::error::Result as CodexResult;
-use crate::exec::process_exec_tool_call;
 use crate::exec::ExecParams;
 use crate::exec::ExecToolCallOutput;
 use crate::exec::SandboxType;
+use crate::exec::process_exec_tool_call;
 use crate::flags::OPENAI_STREAM_MAX_RETRIES;
-use crate::mcp_connection_manager::try_parse_fully_qualified_tool_name;
 use crate::mcp_connection_manager::McpConnectionManager;
+use crate::mcp_connection_manager::try_parse_fully_qualified_tool_name;
 use crate::mcp_tool_call::handle_mcp_tool_call;
 use crate::models::ContentItem;
 use crate::models::FunctionCallOutputPayload;
@@ -57,9 +57,9 @@ use crate::protocol::Op;
 use crate::protocol::ReviewDecision;
 use crate::protocol::SandboxPolicy;
 use crate::protocol::Submission;
+use crate::safety::SafetyCheck;
 use crate::safety::assess_command_safety;
 use crate::safety::assess_patch_safety;
-use crate::safety::SafetyCheck;
 use crate::user_notification::UserNotification;
 use crate::util::backoff;
 use crate::zdr_transcript::ZdrTranscript;

codex-rs/core/src/codex_wrapper.rs

@@ -1,13 +1,13 @@
-use std::sync::atomic::AtomicU64;
 use std::sync::Arc;
+use std::sync::atomic::AtomicU64;
 
+use crate::Codex;
 use crate::config::Config;
 use crate::protocol::Event;
 use crate::protocol::EventMsg;
 use crate::protocol::Op;
 use crate::protocol::Submission;
 use crate::util::notify_on_sigint;
-use crate::Codex;
 use tokio::sync::Notify;
 
 /// Spawn a new [`Codex`] and initialise the session.

codex-rs/core/src/config.rs

@@ -301,14 +301,12 @@ pub fn parse_sandbox_permission_with_base_path(
         "disk-write-cwd" => Ok(DiskWriteCwd),
         "disk-full-write-access" => Ok(DiskFullWriteAccess),
         "network-full-access" => Ok(NetworkFullAccess),
-        _ => Err(
-            std::io::Error::new(
-                std::io::ErrorKind::InvalidInput,
-                format!(
-                    "`{raw}` is not a recognised permission.\nRun with `--help` to see the accepted values."
-                ),
-            )
-        ),
+        _ => Err(std::io::Error::new(
+            std::io::ErrorKind::InvalidInput,
+            format!(
+                "`{raw}` is not a recognised permission.\nRun with `--help` to see the accepted values."
+            ),
+        )),
     }
 }
 

codex-rs/core/src/linux.rs

@@ -7,11 +7,12 @@ use std::sync::Arc;
 use crate::error::CodexErr;
 use crate::error::Result;
 use crate::error::SandboxErr;
-use crate::exec::exec;
 use crate::exec::ExecParams;
 use crate::exec::RawExecToolCallOutput;
+use crate::exec::exec;
 use crate::protocol::SandboxPolicy;
 
+use landlock::ABI;
 use landlock::Access;
 use landlock::AccessFs;
 use landlock::CompatLevel;
@@ -19,8 +20,6 @@ use landlock::Compatible;
 use landlock::Ruleset;
 use landlock::RulesetAttr;
 use landlock::RulesetCreatedAttr;
-use landlock::ABI;
-use seccompiler::apply_filter;
 use seccompiler::BpfProgram;
 use seccompiler::SeccompAction;
 use seccompiler::SeccompCmpArgLen;
@@ -29,6 +28,7 @@ use seccompiler::SeccompCondition;
 use seccompiler::SeccompFilter;
 use seccompiler::SeccompRule;
 use seccompiler::TargetArch;
+use seccompiler::apply_filter;
 use tokio::sync::Notify;
 
 pub async fn exec_linux(
@@ -181,9 +181,9 @@ fn install_network_seccomp_filter_on_current_thread() -> std::result::Result<(),
 #[cfg(test)]
 mod tests_linux {
     use super::*;
-    use crate::exec::process_exec_tool_call;
     use crate::exec::ExecParams;
     use crate::exec::SandboxType;
+    use crate::exec::process_exec_tool_call;
     use crate::protocol::SandboxPolicy;
     use std::sync::Arc;
     use tempfile::NamedTempFile;

codex-rs/core/src/mcp_connection_manager.rs

@@ -8,9 +8,9 @@
 
 use std::collections::HashMap;
 
-use anyhow::anyhow;
 use anyhow::Context;
 use anyhow::Result;
+use anyhow::anyhow;
 use codex_mcp_client::McpClient;
 use mcp_types::Tool;
 use tokio::task::JoinSet;

codex-rs/core/src/models.rs

@@ -1,7 +1,7 @@
 use base64::Engine;
-use serde::ser::Serializer;
 use serde::Deserialize;
 use serde::Serialize;
+use serde::ser::Serializer;
 
 use crate::protocol::InputItem;