mirror of
https://github.com/openai/codex.git
synced 2026-11-15 21:50:46 +00:00
Merge remote-tracking branch 'refs/remotes/origin/main' into abhinav/codex-env-file-conflict-fix
# Conflicts: # codex-rs/core/src/tools/runtimes/mod.rs # codex-rs/core/src/tools/runtimes/shell.rs # codex-rs/core/src/tools/runtimes/shell/unix_escalation.rs # codex-rs/core/src/tools/runtimes/unified_exec.rs
This commit is contained in:
@@ -707,7 +707,7 @@ fn canonicalize_json(value: &Value) -> Value {
|
||||
Value::Array(items) => Value::Array(items.iter().map(canonicalize_json).collect()),
|
||||
Value::Object(map) => {
|
||||
let mut entries: Vec<_> = map.iter().collect();
|
||||
entries.sort_by(|(left, _), (right, _)| left.cmp(right));
|
||||
entries.sort_by_key(|(key, _)| *key);
|
||||
let mut sorted = Map::with_capacity(map.len());
|
||||
for (key, child) in entries {
|
||||
sorted.insert(key.clone(), canonicalize_json(child));
|
||||
|
||||
Reference in New Issue
Block a user