remove newlines from non-line-indented output

Author: jonathanmorley

examples/quiet.rs

@@ -5,7 +5,6 @@ use tracing_tree::HierarchicalLayer;
 fn main() {
     let layer = HierarchicalLayer::default()
         .with_writer(std::io::stdout)
-        .with_indent_lines(true)
         .with_indent_amount(2)
         .with_thread_names(true)
         .with_thread_ids(true)

examples/quiet.stdout

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

src/format.rs

@@ -167,11 +167,12 @@ impl Buffers {
     }
 
     pub(crate) fn indent_current(&mut self, indent: usize, config: &Config, style: SpanMode) {
-        self.current_buf.push('\n');
         let prefix = config.prefix();
 
         // Render something when wraparound occurs so the user is aware of it
         if config.indent_lines {
+            self.current_buf.push('\n');
+
             match style {
                 SpanMode::Close { .. } | SpanMode::PostClose => {
                     if indent > 0 && (indent + 1) % config.wraparound == 0 {