diff options
author | Andrzej Janik <vosen@vosen.pl> | 2015-06-06 18:11:48 +0200 |
---|---|---|
committer | Andrzej Janik <vosen@vosen.pl> | 2015-06-06 18:11:48 +0200 |
commit | 8487b63c97080296269242c31f36a557a90da0cf (patch) | |
tree | 75aef512eeba4074565e6c3eadca129189dec74d /src/display.rs | |
parent | 2fcd829b1d9c70d0981411b4f4adca9124985b54 (diff) | |
download | milf-rs-8487b63c97080296269242c31f36a557a90da0cf.tar.gz milf-rs-8487b63c97080296269242c31f36a557a90da0cf.zip |
Rework fix for table redefinition to avoid breaking AST-compatiblity
Diffstat (limited to 'src/display.rs')
-rw-r--r-- | src/display.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/display.rs b/src/display.rs index 74ec424..0c561e8 100644 --- a/src/display.rs +++ b/src/display.rs @@ -57,7 +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 { - for (k, v) in table.0.iter() { + for (k, v) in table.iter() { match *v { Table(..) => continue, Array(ref a) => { @@ -70,7 +70,7 @@ impl<'a, 'b> Printer<'a, 'b> { } try!(writeln!(self.output, "{} = {}", Key(&[k]), v)); } - for (k, v) in table.0.iter() { + for (k, v) in table.iter() { match *v { Table(ref inner) => { self.stack.push(k); @@ -127,14 +127,13 @@ impl<'a> fmt::Display for Key<'a> { #[allow(warnings)] mod tests { use Value; - use Table as TomlTable; use Value::{String, Integer, Float, Boolean, Datetime, Array, Table}; use std::collections::BTreeMap; macro_rules! map( ($($k:expr => $v:expr),*) => ({ let mut _m = BTreeMap::new(); $(_m.insert($k.to_string(), $v);)* - TomlTable::new(_m) + _m }) ); #[test] |