Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

removed rustc_serialize in style tests

Browse source
This commit is contained in:
Manuel Hässig 2017-10-02 12:52:33 +02:00
parent 086c48210c
commit 93cee84f9f
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -3201,8 +3201,8 @@ dependencies = [
"html5ever 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.19.0", "selectors 0.19.0",
"serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"servo_arc 0.0.1", "servo_arc 0.0.1",
"servo_atoms 0.0.1", "servo_atoms 0.0.1",
"servo_config 0.0.1", "servo_config 0.0.1",

2
tests/unit/style/Cargo.toml
View file

@ -17,7 +17,7 @@ euclid = "0.15"
html5ever = "0.20" html5ever = "0.20"
parking_lot = "0.4" parking_lot = "0.4"
rayon = "0.8" rayon = "0.8"
rustc-serialize = "0.3" serde_json = "1.0"
selectors = {path = "../../../components/selectors"} selectors = {path = "../../../components/selectors"}
servo_arc = {path = "../../../components/servo_arc"} servo_arc = {path = "../../../components/servo_arc"}
servo_atoms = {path = "../../../components/atoms"} servo_atoms = {path = "../../../components/atoms"}

2
tests/unit/style/lib.rs
View file

@ -11,8 +11,8 @@ extern crate euclid;
#[macro_use] extern crate html5ever; #[macro_use] extern crate html5ever;
extern crate parking_lot; extern crate parking_lot;
extern crate rayon; extern crate rayon;
extern crate rustc_serialize;
extern crate selectors; extern crate selectors;
extern crate serde_json;
extern crate servo_arc; extern crate servo_arc;
extern crate servo_atoms; extern crate servo_atoms;
extern crate servo_config; extern crate servo_config;

9
tests/unit/style/properties/scaffolding.rs
View file

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use rustc_serialize::json::Json; use serde_json::{self, Value};
use std::env; use std::env;
use std::fs::{File, remove_file}; use std::fs::{File, remove_file};
use std::path::Path; use std::path::Path;
@ -25,10 +25,11 @@ fn properties_list_json() {
.status() .status()
.unwrap(); .unwrap();
assert!(status.success()); assert!(status.success());
let properties = Json::from_reader(&mut File::open(json).unwrap()).unwrap();
let properties: Value = serde_json::from_reader(File::open(json).unwrap()).unwrap();
assert!(properties.as_object().unwrap().len() > 100); assert!(properties.as_object().unwrap().len() > 100);
assert!(properties.find("margin").is_some()); assert!(properties.as_object().unwrap().contains_key("margin"));
assert!(properties.find("margin-top").is_some()); assert!(properties.as_object().unwrap().contains_key("margin-top"));
} }
#[cfg(windows)] #[cfg(windows)]