chore: upgrade to Rust 1.89 (#2465)
Codex created this PR from the following prompt: > upgrade this entire repo to Rust 1.89. Note that this requires updating codex-rs/rust-toolchain.toml as well as the workflows in .github/. Make sure that things are "clippy clean" as this change will likely uncover new Clippy errors. `just fmt` and `cargo clippy --tests` are sufficient to check for correctness Note this modifies a lot of lines because it folds nested `if` statements using `&&`. --- [//]: # (BEGIN SAPLING FOOTER) Stack created with [Sapling](https://sapling-scm.com). Best reviewed with [ReviewStack](https://reviewstack.dev/openai/codex/pull/2465). * #2467 * __->__ #2465
This commit is contained in:
@@ -53,12 +53,12 @@ pub(crate) fn format_json_compact(text: &str) -> Option<String> {
|
||||
}
|
||||
' ' | '\t' if !in_string => {
|
||||
// Add a space after : and , but only when not in a string
|
||||
if let Some(&next_ch) = chars.peek() {
|
||||
if let Some(last_ch) = result.chars().last() {
|
||||
if (last_ch == ':' || last_ch == ',') && !matches!(next_ch, '}' | ']') {
|
||||
result.push(' ');
|
||||
}
|
||||
}
|
||||
if let Some(&next_ch) = chars.peek()
|
||||
&& let Some(last_ch) = result.chars().last()
|
||||
&& (last_ch == ':' || last_ch == ',')
|
||||
&& !matches!(next_ch, '}' | ']')
|
||||
{
|
||||
result.push(' ');
|
||||
}
|
||||
}
|
||||
_ => {
|
||||
|
||||
Reference in New Issue
Block a user