From 96c5ef3f80fddb78c0050aa5e15cac1b63ffe542 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Sun, 22 Feb 2015 13:34:29 -0800 Subject: [PATCH] Pretty print generated structs --- phf_codegen/src/lib.rs | 52 ++++++++++++++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/phf_codegen/src/lib.rs b/phf_codegen/src/lib.rs index 87d3dc9e..c521ac2c 100644 --- a/phf_codegen/src/lib.rs +++ b/phf_codegen/src/lib.rs @@ -106,15 +106,28 @@ impl Map { let state = phf_generator::generate_hash(&self.keys); - try!(write!(w, "::phf::Map {{ key: {}, disps: &[", state.key)); + try!(write!(w, "::phf::Map {{ + key: {}, + disps: &[ +", + state.key)); for &(d1, d2) in &state.disps { - try!(write!(w, "({}, {}),", d1, d2)); + try!(write!(w, " + ({}, {}),", + d1, d2)); } - try!(write!(w, "], entries: &[")); + try!(write!(w, " + ], + entries: &[ +")); for &idx in &state.map { - try!(write!(w, "({:?}, {}),", &self.keys[idx], &self.values[idx])); + try!(write!(w, " + ({:?}, {}),", + &self.keys[idx], &self.values[idx])); } - write!(w, "] }}") + write!(w, " + ] +}}") } } @@ -189,19 +202,34 @@ impl OrderedMap { let state = phf_generator::generate_hash(&self.keys); - try!(write!(w, "::phf::OrderedMap {{ key: {}, disps: &[", state.key)); + try!(write!(w, "::phf::OrderedMap {{ + key: {}, + disps: &[", + state.key)); for &(d1, d2) in &state.disps { - try!(write!(w, "({}, {}),", d1, d2)); + try!(write!(w, " + ({}, {}),", + d1, d2)); } - try!(write!(w, "], idxs: &[")); + try!(write!(w, " + ], + idxs: &[")); for &idx in &state.map { - try!(write!(w, "{},", idx)); + try!(write!(w, " + {},", + idx)); } - try!(write!(w, "], entries: &[")); + try!(write!(w, " + ], + entries: &[")); for (key, value) in self.keys.iter().zip(self.values.iter()) { - try!(write!(w, "({:?}, {}),", key, value)); + try!(write!(w, " + ({:?}, {}),", + key, value)); } - write!(w, "] }}") + write!(w, " + ] +}}") } }