huskies: merge 927

server/src/chat/commands/diff.rs

@@ -4,6 +4,7 @@
 //! HEAD, formatted for readability in chat.
 
 use super::CommandContext;
+use crate::chat::util::truncate_at_char_boundary;
 use std::path::Path;
 use std::process::Command;
 
@@ -125,18 +126,6 @@ fn run_git(dir: &Path, args: &[&str]) -> String {
         .unwrap_or_default()
 }
 
-/// Truncate `s` to at most `max_bytes` bytes without splitting a UTF-8 character.
-fn truncate_at_char_boundary(s: &str, max_bytes: usize) -> &str {
-    if s.len() <= max_bytes {
-        return s;
-    }
-    let mut boundary = max_bytes;
-    while !s.is_char_boundary(boundary) {
-        boundary -= 1;
-    }
-    &s[..boundary]
-}
-
 // ---------------------------------------------------------------------------
 // Tests
 // ---------------------------------------------------------------------------