Provide TomlQuote instead

This is slightly better in terms of consing.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/utils.rs b/src/utils.rs
index d2b640bb324c28a03120e8200c95a510a94ac486..14f2986d7cbb09cd7eb74c7d2ecbe4fd1c14c44b 100644 (file)
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -334,27 +334,31 @@ impl<Y: Sync, E: Sync, F: Sync + FnOnce() -> Result<Y,E>>
 
 //========== toml ====================
 
+#[derive(Debug,Copy,Clone,Eq,PartialEq,Ord,PartialOrd)]
+struct TomlQuote<'s>(pub &'s str);
+
 // We reimplement this because the toml crate doesn't expose it, and
 // looking at the github issues etc. for that crate isn't encuraging.
-pub fn toml_quote_string(s: &str) -> String {
-  let mut o = String::new();
-  for c in s.chars() {
-    match c {
-      '"' | '\\'=> { o.push('\\'); o.push(c); },
-      c if (c < ' ' && c != '\t') || c == '\x7f' => {
-        write!(o, r#"\u{:04x}"#, c as u32).unwrap();
-        continue;
+impl<'s> Display for TomlQuote<'s> {
+  #[throws(fmt::Error)]
+  fn fmt(&self, f: &mut fmt::Formatter) {
+    for c in self.0.chars() {
+      match c {
+        '"' | '\\'=> write!(f, "\\{}", c)?,
+        c if (c < ' ' && c != '\t') || c == '\x7f' => {
+          write!(f, r#"\u{:04x}"#, c as u32).unwrap();
+          continue;
+        }
+        c => write!(f, "{}", c)?,
       }
-      c => o.push(c),
     }
   }
-  o
 }
 
 #[test]
 fn toml_quote_string_test(){
-  assert_eq!(toml_quote_string(r#"w \ "        \a\7fƒ."#),
-                                r#"w \\ \"     \u0007\u007fƒ."#);
+  assert_eq!(TomlQuote(r#"w \ "        \a\7fƒ."#).to_string(),
+                       r#"w \\ \"      \u0007\u007fƒ."#);
 }
 
 pub fn toml_merge<'u,