Merge pull request #2053 from Kobzol/fix-stable-benchmarks

Fix stable benchmarks

Author: lqd

collector/compile-benchmarks/html5ever/Cargo.lock

@@ -2,7 +2,7 @@
 
 name = "html5ever"
 version = "0.5.4"
-authors = [ "The html5ever Project Developers" ]
+authors = ["The html5ever Project Developers"]
 license = "MIT / Apache-2.0"
 repository = "https://github.com/servo/html5ever"
 description = "High-performance browser-grade HTML5 parser"
@@ -35,7 +35,8 @@ rustc-test = "0.1.3"
 
 [build-dependencies]
 phf_codegen = "0.7.3"
-rustc-serialize = "0.3.15"
+serde_json = "1"
+serde = { version = "1", features = ["derive"] }
 html5ever_macros = { version = "0.2.6", path = "macros", optional = true }
 
 [profile.dev]

collector/compile-benchmarks/html5ever/Cargo.toml

@@ -7,13 +7,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(rustc_encodable_decodable)]
-
 extern crate phf_codegen;
-extern crate rustc_serialize;
 
-use rustc_serialize::json::{Json, Decoder};
-use rustc_serialize::Decodable;
 use std::collections::HashMap;
 use std::env;
 use std::fs::File;
@@ -99,14 +94,13 @@ fn check_hash(from: &Path, to: &Path) -> Result<(), String> {
 
 fn named_entities_to_phf(from: &Path, to: &Path) {
     // A struct matching the entries in entities.json.
-    #[derive(RustcDecodable)]
+    #[derive(serde::Deserialize)]
     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);
@@ -115,7 +109,7 @@ fn named_entities_to_phf(from: &Path, to: &Path) {
 
     // Add every missing prefix of those keys, mapping to NULL characters.
     for key in entities.keys().cloned().collect::<Vec<_>>() {
-        for n in 1 .. key.len() {
+        for n in 1..key.len() {
             entities.entry(&key[..n]).or_insert((0, 0));
         }
     }