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

cargo: Bump selectors and string_cache

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2016-04-27 10:43:20 +02:00
parent ac8406f4ae
commit 2dacbc6fb3
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
6 changed files with 85 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,6 +18,6 @@ app_units = {version = "0.2.3", features = ["plugins"]}
cssparser = {version = "0.5.4", features = ["heap_size"]}
euclid = {version = "0.6.4", features = ["plugins"]}
selectors = {version = "0.5", features = ["heap_size"]}
string_cache = {version = "0.2.12", features = ["heap_size"]}
string_cache = {version = "0.2", features = ["heap_size"]}
url = {version = "1.0.0", features = ["heap_size"]}
rustc-serialize = "0.3"

13
tests/unit/style/stylesheets.rs
View file

@ -8,7 +8,7 @@ use selectors::parser::*;
use std::borrow::ToOwned;
use std::sync::Arc;
use std::sync::Mutex;
use string_cache::Atom;
use string_cache::{Atom, Namespace};
use style::properties::{PropertyDeclaration, PropertyDeclarationBlock, DeclaredValue, longhands};
use style::stylesheets::{CSSRule, StyleRule, Origin};
use style::error_reporting::ParseErrorReporter;
@ -32,13 +32,13 @@ fn test_parse_stylesheet() {
media: None,
dirty_on_viewport_size_change: false,
rules: vec![
CSSRule::Namespace(None, ns!(html)),
CSSRule::Namespace(None, Namespace(Atom::from("http://www.w3.org/1999/xhtml"))),
CSSRule::Style(StyleRule {
selectors: vec![
Selector {
compound_selectors: Arc::new(CompoundSelector {
simple_selectors: vec![
SimpleSelector::Namespace(ns!(html)),
SimpleSelector::Namespace(Namespace(Atom::from("http://www.w3.org/1999/xhtml"))),
SimpleSelector::LocalName(LocalName {
name: atom!("input"),
lower_name: atom!("input"),
@ -68,7 +68,7 @@ fn test_parse_stylesheet() {
Selector {
compound_selectors: Arc::new(CompoundSelector {
simple_selectors: vec![
SimpleSelector::Namespace(ns!(html)),
SimpleSelector::Namespace(Namespace(Atom::from("http://www.w3.org/1999/xhtml"))),
SimpleSelector::LocalName(LocalName {
name: atom!("html"),
lower_name: atom!("html"),
@ -82,7 +82,7 @@ fn test_parse_stylesheet() {
Selector {
compound_selectors: Arc::new(CompoundSelector {
simple_selectors: vec![
SimpleSelector::Namespace(ns!(html)),
SimpleSelector::Namespace(Namespace(Atom::from("http://www.w3.org/1999/xhtml"))),
SimpleSelector::LocalName(LocalName {
name: atom!("body"),
lower_name: atom!("body"),
@ -107,10 +107,12 @@ fn test_parse_stylesheet() {
Selector {
compound_selectors: Arc::new(CompoundSelector {
simple_selectors: vec![
SimpleSelector::Namespace(Namespace(Atom::from("http://www.w3.org/1999/xhtml"))),
SimpleSelector::Class(Atom::from("ok")),
],
next: Some((Arc::new(CompoundSelector {
simple_selectors: vec![
SimpleSelector::Namespace(Namespace(Atom::from("http://www.w3.org/1999/xhtml"))),
SimpleSelector::ID(Atom::from("d1")),
],
next: None,
@ -145,7 +147,6 @@ fn test_parse_stylesheet() {
});
}
struct CSSError {
pub line: usize,
pub column: usize,