Auto merge of #518 - est31:idna_serde, r=nox

Move tests of idna to serde-json

Part of #506

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-url/518)
<!-- Reviewable:end -->

Author: bors-servo

idna/Cargo.toml

@@ -20,7 +20,7 @@ name = "unit"
 
 [dev-dependencies]
 rustc-test = "0.3"
-rustc-serialize = "0.3"
+serde_json = "1.0"
 
 [dependencies]
 unicode-bidi = "0.3"

idna/tests/punycode.rs

@@ -7,7 +7,9 @@
 // except according to those terms.
 
 use idna::punycode::{decode, encode_str};
-use rustc_serialize::json::{Json, Object};
+use serde_json::Value;
+use serde_json::map::Map;
+use std::str::FromStr;
 use test::TestFn;
 
 fn one_test(decoded: &str, encoded: &str) {
@@ -37,20 +39,20 @@ fn one_test(decoded: &str, encoded: &str) {
     }
 }
 
-fn get_string<'a>(map: &'a Object, key: &str) -> &'a str {
+fn get_string<'a>(map: &'a Map<String, Value>, key: &str) -> &'a str {
     match map.get(&key.to_string()) {
-        Some(&Json::String(ref s)) => s,
+        Some(&Value::String(ref s)) => s,
         None => "",
         _ => panic!(),
     }
 }
 
 pub fn collect_tests<F: FnMut(String, TestFn)>(add_test: &mut F) {
-    match Json::from_str(include_str!("punycode_tests.json")) {
-        Ok(Json::Array(tests)) => {
+    match Value::from_str(include_str!("punycode_tests.json")) {
+        Ok(Value::Array(tests)) => {
             for (i, test) in tests.into_iter().enumerate() {
                 match test {
-                    Json::Object(o) => {
+                    Value::Object(o) => {
                         let test_name = {
                             let desc = get_string(&o, "description");
                             if desc.is_empty() {

idna/tests/tests.rs

@@ -1,5 +1,5 @@
 extern crate idna;
-extern crate rustc_serialize;
+extern crate serde_json;
 extern crate rustc_test as test;
 
 mod punycode;