Update to master

- updated `rustc-serialize` dependency, in other case `toml-rs`
  prohibits `rustc-serialize` update on other crates
- updated after syntax and lib changes

1 files changed, 3 insertions, 3 deletions

diff --git a/src/test/valid.rs b/src/test/valid.rs
index 8f8b6bc..5d15739 100644
--- a/src/test/valid.rs
+++ b/src/test/valid.rs
@@ -2,7 +2,7 @@ extern crate serialize;
 
 use std::num::strconv;
 use std::collections::BTreeMap;
-use self::serialize::json::{mod, Json};
+use self::serialize::json::{self, Json};
 
 use {Parser, Value};
 use Value::{Table, Integer, Float, Boolean, Datetime, Array};
@@ -57,8 +57,8 @@ fn run(toml: &str, json: &str) {
     let toml_json = to_json(Table(table));
     assert!(json == toml_json,
             "expected\n{}\ngot\n{}\n",
-            json.to_pretty_str(),
-            toml_json.to_pretty_str());
+            json.pretty(),
+            toml_json.pretty());
 }
 
 macro_rules! test( ($name:ident, $toml:expr, $json:expr) => (