From ef1c19651628b6fca78ae2b00f7d8d67e9970ce3 Mon Sep 17 00:00:00 2001 From: Greg Burd Date: Thu, 23 Jan 2020 11:14:29 -0500 Subject: [PATCH] Update pretty_print dependency and fix issues. --- edn/Cargo.toml | 2 +- edn/src/pretty_print.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/edn/Cargo.toml b/edn/Cargo.toml index fec4b9b4..c8cd57eb 100644 --- a/edn/Cargo.toml +++ b/edn/Cargo.toml @@ -14,7 +14,7 @@ chrono = "0.4" itertools = "0.8" num = "0.2" ordered-float = "1.0" -pretty = "0.2" +pretty = "0.9" uuid = { version = "0.8", features = ["v4", "serde"] } serde = { version = "1.0", optional = true } serde_derive = { version = "1.0", optional = true } diff --git a/edn/src/pretty_print.rs b/edn/src/pretty_print.rs index 07a27c79..87885c6a 100644 --- a/edn/src/pretty_print.rs +++ b/edn/src/pretty_print.rs @@ -56,11 +56,11 @@ impl Value { I: IntoIterator, { let open = open.into(); - let n = open.len();// as isize; + let n = open.len() as isize; let i = vs .into_iter() .map(|v| v.as_doc(allocator)) - .intersperse(allocator.space()); + .intersperse(allocator.line()); allocator .text(open) .append(allocator.concat(i).nest(n)) @@ -84,8 +84,8 @@ impl Value { let xs = vs .iter() .rev() - .map(|(k, v)| k.as_doc(pp).append(pp.space()).append(v.as_doc(pp)).group()) - .intersperse(pp.space()); + .map(|(k, v)| k.as_doc(pp).append(pp.line()).append(v.as_doc(pp)).group()) + .intersperse(pp.line()); pp.text("{") .append(pp.concat(xs).nest(1)) .append(pp.text("}"))