From 904c88da7b47e68159aa567d815de79fbf7d9b30 Mon Sep 17 00:00:00 2001
From: Michael Bolin <mbolin@openai.com>
Date: Tue, 13 Jan 2026 15:31:56 -0800
Subject: [PATCH] fix: Prefer raw strings (r#) where appropriate, particularly
 in tests.

Updated AGENTS.md to memorialize this practice.
---
 AGENTS.md                          |  1 +
 codex-rs/apply-patch/src/parser.rs | 57 ++++++++++++++----------------
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index 9c14089e5f..5890922160 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -12,6 +12,7 @@ In the codex-rs folder where the rust code lives:
 - Always inline format! args when possible per https://rust-lang.github.io/rust-clippy/master/index.html#uninlined_format_args
 - Use method references over closures when possible per https://rust-lang.github.io/rust-clippy/master/index.html#redundant_closure_for_method_calls
 - When writing tests, prefer comparing the equality of entire objects over fields one by one.
+- For multiline string literals, particularly for tests, prefer raw strings (`r#`) to help with readability over string literals full of `\n` metacharacters.
 - When making a change that adds or changes an API, ensure that the documentation in the `docs/` folder is up to date if applicable.
 - If you change `ConfigToml` or nested config types, run `just write-config-schema` to update `codex-rs/core/config.schema.json`.
 
diff --git a/codex-rs/apply-patch/src/parser.rs b/codex-rs/apply-patch/src/parser.rs
index 8785b38519..b2b0b23817 100644
--- a/codex-rs/apply-patch/src/parser.rs
+++ b/codex-rs/apply-patch/src/parser.rs
@@ -450,13 +450,10 @@ fn test_parse_patch() {
 
     assert_eq!(
         parse_patch_text(
-            concat!(
-                "*** Begin Patch",
-                " ",
-                "\n*** Add File: foo\n+hi\n",
-                " ",
-                "*** End Patch"
-            ),
+            r#"*** Begin Patch
+*** Add File: foo
++hi
+ *** End Patch"#,
             ParseMode::Strict
         )
         .unwrap()
@@ -468,9 +465,9 @@ fn test_parse_patch() {
     );
     assert_eq!(
         parse_patch_text(
-            "*** Begin Patch\n\
-             *** Update File: test.py\n\
-             *** End Patch",
+            r#"*** Begin Patch
+*** Update File: test.py
+*** End Patch"#,
             ParseMode::Strict
         ),
         Err(InvalidHunkError {
@@ -480,8 +477,8 @@ fn test_parse_patch() {
     );
     assert_eq!(
         parse_patch_text(
-            "*** Begin Patch\n\
-             *** End Patch",
+            r#"*** Begin Patch
+*** End Patch"#,
             ParseMode::Strict
         )
         .unwrap()
@@ -490,17 +487,17 @@ fn test_parse_patch() {
     );
     assert_eq!(
         parse_patch_text(
-            "*** Begin Patch\n\
-             *** Add File: path/add.py\n\
-             +abc\n\
-             +def\n\
-             *** Delete File: path/delete.py\n\
-             *** Update File: path/update.py\n\
-             *** Move to: path/update2.py\n\
-             @@ def f():\n\
-             -    pass\n\
-             +    return 123\n\
-             *** End Patch",
+            r#"*** Begin Patch
+*** Add File: path/add.py
++abc
++def
+*** Delete File: path/delete.py
+*** Update File: path/update.py
+*** Move to: path/update2.py
+@@ def f():
+-    pass
++    return 123
+*** End Patch"#,
             ParseMode::Strict
         )
         .unwrap()
@@ -528,13 +525,13 @@ fn test_parse_patch() {
     // Update hunk followed by another hunk (Add File).
     assert_eq!(
         parse_patch_text(
-            "*** Begin Patch\n\
-             *** Update File: file.py\n\
-             @@\n\
-             +line\n\
-             *** Add File: other.py\n\
-             +content\n\
-             *** End Patch",
+            r#"*** Begin Patch
+*** Update File: file.py
+@@
++line
+*** Add File: other.py
++content
+*** End Patch"#,
             ParseMode::Strict
         )
         .unwrap()