Merge branch 'main' of github.com:openai/codex into codex/websocket-reverse-4

# Conflicts:
#	codex-rs/features/src/lib.rs
This commit is contained in:
Ruslan Nigmatullin
2026-03-31 00:10:43 -07:00
1785 changed files with 36353 additions and 161275 deletions

View File

@@ -888,7 +888,10 @@ mod tests {
#[test]
fn log_format_from_env_value_defaults_for_non_json_values() {
assert_eq!(LogFormat::from_env_value(None), LogFormat::Default);
assert_eq!(
LogFormat::from_env_value(/*value*/ None),
LogFormat::Default
);
assert_eq!(LogFormat::from_env_value(Some("")), LogFormat::Default);
assert_eq!(LogFormat::from_env_value(Some("text")), LogFormat::Default);
assert_eq!(LogFormat::from_env_value(Some("jsonl")), LogFormat::Default);