Fix formatting for space indented mode

Author: oli-obk

examples/no-indent.stdout

@@ -1,38 +1,21 @@
-1:main no_indent::hierarchical-example
-1:main  version=0.1
-1:main   no_indent::server
-1:main    host="localhost"
-1:main    port=8080
+1:main no_indent::hierarchical-example version=0.1
+1:main   no_indent::server host="localhost", port=8080
 1:main    INFO no_indent starting
 1:main    INFO no_indent listening
-1:main     no_indent::conn
-1:main      peer_addr="82.9.9.9"
-1:main      port=42381
+1:main     no_indent::conn peer_addr="82.9.9.9", port=42381
 1:main      DEBUG no_indent connected
-1:main      DEBUG no_indent message received
-1:main      length=2
-1:main     no_indent::conn
-1:main      peer_addr="8.8.8.8"
-1:main      port=18230
+1:main      DEBUG no_indent message received, length=2
+1:main     no_indent::conn peer_addr="8.8.8.8", port=18230
 1:main      DEBUG no_indent connected
-1:main     no_indent::foomp 42 <- format string
-1:main      normal_var=43
+1:main     no_indent::foomp 42 <- format string, normal_var=43
 1:main      ERROR no_indent hello
-1:main     no_indent::conn
-1:main      peer_addr="82.9.9.9"
-1:main      port=42381
-1:main      WARN no_indent weak encryption requested
-1:main      algo="xor"
-1:main      DEBUG no_indent response sent
-1:main      length=8
+1:main     no_indent::conn peer_addr="82.9.9.9", port=42381
+1:main      WARN no_indent weak encryption requested, algo="xor"
+1:main      DEBUG no_indent response sent, length=8
 1:main      DEBUG no_indent disconnected
-1:main     no_indent::conn
-1:main      peer_addr="8.8.8.8"
-1:main      port=18230
-1:main      DEBUG no_indent message received
-1:main      length=5
-1:main      DEBUG no_indent response sent
-1:main      length=8
+1:main     no_indent::conn peer_addr="8.8.8.8", port=18230
+1:main      DEBUG no_indent message received, length=5
+1:main      DEBUG no_indent response sent, length=8
 1:main      DEBUG no_indent disconnected
 1:main    WARN no_indent internal error
 1:main    INFO no_indent exit

src/format.rs

@@ -272,6 +272,7 @@ impl Buffers {
 
 pub struct FmtEvent<'a> {
     pub bufs: &'a mut Buffers,
+    pub lines: bool,
 }
 
 impl<'a> Visit for FmtEvent<'a> {
@@ -285,7 +286,12 @@ impl<'a> Visit for FmtEvent<'a> {
             #[cfg(feature = "tracing-log")]
             name if name.starts_with("log.") => {}
             name => {
-                write!(buf, "\n {}={:?}", name, value).unwrap();
+                if self.lines {
+                    write!(buf, "\n ").unwrap()
+                } else {
+                    write!(buf, ", ").unwrap()
+                }
+                write!(buf, "{}={:?}", name, value).unwrap();
             }
         }
     }

src/lib.rs

@@ -246,16 +246,18 @@ where
         V: fmt::Display + 'a,
     {
         let mut kvs = kvs.into_iter();
-        let nl = if self.config.bracketed_fields {
-            ""
+        let (nl, first) = if self.config.bracketed_fields {
+            ("", "")
+        } else if self.config.indent_lines {
+            ("\n ", "\n ")
         } else {
-            "\n "
+            (", ", " ")
         };
         if let Some((k, v)) = kvs.next() {
             if k == "message" {
                 write!(buf, " {}", v)?;
             } else {
-                write!(buf, "{nl}{}={}", k, v)?;
+                write!(buf, "{first}{}={}", k, v)?;
             }
         }
         for (k, v) in kvs {
@@ -560,7 +562,10 @@ where
             .expect("Unable to write to buffer");
         }
 
-        let mut visitor = FmtEvent { bufs };
+        let mut visitor = FmtEvent {
+            bufs,
+            lines: self.config.indent_lines,
+        };
         event.record(&mut visitor);
         visitor
             .bufs