From 1bf11fd8059058f7ad3c144d9f9ffe4e6f706429 Mon Sep 17 00:00:00 2001 From: Dan Spencer Date: Mon, 13 Apr 2015 08:35:24 -0600 Subject: [PATCH] Adjust SExpression output --- src/queryplan/sexpression.rs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/queryplan/sexpression.rs b/src/queryplan/sexpression.rs index fa03cb9..dd29bf6 100644 --- a/src/queryplan/sexpression.rs +++ b/src/queryplan/sexpression.rs @@ -89,23 +89,20 @@ where ::Table: 'a try!(yield_in_fn.format(f, indent + 1)); try!(writeln!(f, "")); write_indent!(indent+1); - try!(writeln!(f, "(group-by-values ")); + try!(write!(f, "(group-by-values")); for group_by_value in group_by_values { - try!(group_by_value.format(f, indent + 2)); try!(writeln!(f, "")); + try!(group_by_value.format(f, indent + 2)); } - write_indent!(indent+1); try!(writeln!(f, ")")); try!(yield_out_fn.format(f, indent + 1)); write!(f, ")") }, &SExpression::Yield { ref fields } => { - try!(writeln!(f, "(yield ")); - for (i, field) in fields.iter().enumerate() { + try!(write!(f, "(yield")); + for field in fields { + try!(writeln!(f, "")); try!(field.format(f, indent + 1)); - if i != fields.len() - 1 { - try!(writeln!(f, "")); - } } write!(f, ")") },