Auto merge of #327 - derekdreery:use_serde, r=jdm

Switch to serde for build script

Author: bors-servo

markup5ever/Cargo.toml

@@ -25,5 +25,7 @@ heapsize_derive = { version = "0.1", optional = true }
 [build-dependencies]
 string_cache_codegen = "0.4"
 phf_codegen = "0.7.3"
-rustc-serialize = "0.3.15"
+serde = "1.0"
+serde_derive = "1.0"
+serde_json = "1.0"
 

markup5ever/build.rs

@@ -9,10 +9,11 @@
 
 extern crate string_cache_codegen;
 extern crate phf_codegen;
-extern crate rustc_serialize;
+#[macro_use]
+extern crate serde_derive;
+extern crate serde;
+extern crate serde_json;
 
-use rustc_serialize::json::{Json, Decoder};
-use rustc_serialize::Decodable;
 use std::collections::HashMap;
 #[allow(unused_imports)] use std::ascii::AsciiExt;
 use std::env;
@@ -69,14 +70,14 @@ fn main() {
 
 fn named_entities_to_phf(from: &Path, to: &Path) {
     // A struct matching the entries in entities.json.
-    #[derive(RustcDecodable)]
+    #[derive(Deserialize, Debug)]
     struct CharRef {
         codepoints: Vec<u32>,
         //characters: String,  // Present in the file but we don't need it
     }
 
-    let json = Json::from_reader(&mut File::open(from).unwrap()).unwrap();
-    let entities: HashMap<String, CharRef> = Decodable::decode(&mut Decoder::new(json)).unwrap();
+    let entities: HashMap<String, CharRef>
+        = serde_json::from_reader(&mut File::open(from).unwrap()).unwrap();
     let mut entities: HashMap<&str, (u32, u32)> = entities.iter().map(|(name, char_ref)| {
         assert!(name.starts_with("&"));
         assert!(char_ref.codepoints.len() <= 2);
@@ -100,4 +101,4 @@ fn named_entities_to_phf(from: &Path, to: &Path) {
     write!(&mut file, "pub static NAMED_ENTITIES: Map<&'static str, (u32, u32)> = ").unwrap();
     phf_map.build(&mut file).unwrap();
     write!(&mut file, ";\n").unwrap();
-}
+}