Merge pull request #254 from adwhit/fix-better-http

Debug fmt handles unicode boundaries
redbadger · Jul 4, 2024 · 8c6e9b4 · 8c6e9b4
2 parents 96add81 + 4424c91
commit 8c6e9b4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -46,7 +46,7 @@ jobs:
       - name: Run sccache-cache
         uses: mozilla-actions/[email protected]
 
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v4
         with:
           version: latest
 

diff --git a/crux_http/src/protocol.rs b/crux_http/src/protocol.rs
@@ -36,7 +36,7 @@ impl std::fmt::Debug for HttpRequest {
             if s.len() < 50 {
                 format!("\"{s}\"")
             } else {
-                format!("\"{}\"...", &s[..50])
+                format!("\"{}\"...", s.chars().take(50).collect::<String>())
             }
         } else {
             format!("<binary data - {} bytes>", self.body.len())
@@ -310,12 +310,13 @@ mod tests {
         {
             // big
             let req = HttpRequest::post("http://example.com")
-                .body("abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz")
+                // we check that we handle unicode boundaries correctly
+                .body("abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstu😀😀😀😀😀😀")
                 .build();
             let repr = format!("{req:?}");
             assert_eq!(
                 repr,
-                r#"HttpReqeuest { method: "POST", url: "http://example.com", body: "abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvw"... }"#
+                r#"HttpReqeuest { method: "POST", url: "http://example.com", body: "abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstu😀😀"... }"#
             );
         }
 

diff --git a/crux_kv/src/lib.rs b/crux_kv/src/lib.rs
@@ -45,11 +45,11 @@ impl std::fmt::Debug for KeyValueOperation {
         match self {
             KeyValueOperation::Get { key } => f.debug_struct("Get").field("key", key).finish(),
             KeyValueOperation::Set { key, value } => {
-                let body_repr = if let Ok(s) = std::str::from_utf8(&value) {
+                let body_repr = if let Ok(s) = std::str::from_utf8(value) {
                     if s.len() < 50 {
                         format!("\"{s}\"")
                     } else {
-                        format!("\"{}\"...", &s[..50])
+                        format!("\"{}\"...", s.chars().take(50).collect::<String>())
                     }
                 } else {
                     format!("<binary data - {} bytes>", value.len())

diff --git a/crux_kv/src/tests.rs b/crux_kv/src/tests.rs
@@ -395,13 +395,13 @@ fn test_kv_operation_debug_repr() {
         let op = KeyValueOperation::Set {
             key: "my key".into(),
             value:
-                b"abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz"
-                    .to_vec(),
+                // we check that we handle unicode boundaries correctly
+                "abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstu😀😀😀😀😀😀".as_bytes().to_vec(),
         };
         let repr = format!("{op:?}");
         assert_eq!(
             repr,
-            r#"Set { key: "my key", value: "abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvw"... }"#
+            r#"Set { key: "my key", value: "abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstu😀😀"... }"#
         );
     }