From 71e18d94d6465ba6c8bbe65c449f5c71d3474b01 Mon Sep 17 00:00:00 2001
From: nabijaczleweli <nabijaczleweli@gmail.com>
Date: Tue, 6 Sep 2016 09:00:35 +0200
Subject: Don't space out the first table or array if not needed

Closes #110
---
 src/display.rs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'src/display.rs')

diff --git a/src/display.rs b/src/display.rs
index 6891530..f563b77 100644
--- a/src/display.rs
+++ b/src/display.rs
@@ -57,6 +57,7 @@ fn write_str(f: &mut fmt::Formatter, s: &str) -> fmt::Result {
 
 impl<'a, 'b> Printer<'a, 'b> {
     fn print(&mut self, table: &'a TomlTable) -> fmt::Result {
+        let mut space_out_first = false;
         for (k, v) in table.iter() {
             match *v {
                 Table(..) => continue,
@@ -67,13 +68,17 @@ impl<'a, 'b> Printer<'a, 'b> {
                 }
                 _ => {}
             }
+            space_out_first = true;
             try!(writeln!(self.output, "{} = {}", Key(&[k]), v));
         }
-        for (k, v) in table.iter() {
+        for (i, (k, v)) in table.iter().enumerate() {
             match *v {
                 Table(ref inner) => {
                     self.stack.push(k);
-                    try!(writeln!(self.output, "\n[{}]", Key(&self.stack)));
+                    if space_out_first || i != 0 {
+                        try!(write!(self.output, "\n"));
+                    }
+                    try!(writeln!(self.output, "[{}]", Key(&self.stack)));
                     try!(self.print(inner));
                     self.stack.pop();
                 }
@@ -83,8 +88,11 @@ impl<'a, 'b> Printer<'a, 'b> {
                         _ => continue
                     }
                     self.stack.push(k);
-                    for inner in inner.iter() {
-                        try!(writeln!(self.output, "\n[[{}]]", Key(&self.stack)));
+                    for (j, inner) in inner.iter().enumerate() {
+                        if space_out_first || i != 0 || j != 0 {
+                            try!(write!(self.output, "\n"));
+                        }
+                        try!(writeln!(self.output, "[[{}]]", Key(&self.stack)));
                         match *inner {
                             Table(ref inner) => try!(self.print(inner)),
                             _ => panic!("non-heterogeneous toml array"),
-- 
cgit v1.2.3