aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
Diffstat (limited to 'components')
-rw-r--r--components/layout/Cargo.toml2
-rw-r--r--components/layout_thread/Cargo.toml2
-rw-r--r--components/script/Cargo.toml2
-rw-r--r--components/script/dom/element.rs4
-rw-r--r--components/script/layout_wrapper.rs6
-rw-r--r--components/script_layout_interface/Cargo.toml2
-rw-r--r--components/style/Cargo.toml2
-rw-r--r--components/style/gecko/wrapper.rs6
-rw-r--r--components/style/restyle_hints.rs4
-rw-r--r--components/style/servo/selector_parser.rs2
10 files changed, 16 insertions, 16 deletions
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
index 5642459c940..359d8619c7f 100644
--- a/components/layout/Cargo.toml
+++ b/components/layout/Cargo.toml
@@ -34,7 +34,7 @@ range = {path = "../range"}
rayon = "0.6"
script_layout_interface = {path = "../script_layout_interface"}
script_traits = {path = "../script_traits"}
-selectors = "0.15.1"
+selectors = "0.17"
serde = "0.8"
serde_derive = "0.8"
servo_geometry = {path = "../geometry"}
diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml
index 5cc708d3208..fd721e0c935 100644
--- a/components/layout_thread/Cargo.toml
+++ b/components/layout_thread/Cargo.toml
@@ -30,7 +30,7 @@ rayon = "0.6"
script = {path = "../script"}
script_layout_interface = {path = "../script_layout_interface"}
script_traits = {path = "../script_traits"}
-selectors = "0.15.1"
+selectors = "0.17"
serde_derive = "0.8"
serde_json = "0.8"
servo_config = {path = "../config"}
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index 16368dd1bb1..1d565715d25 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -70,7 +70,7 @@ regex = "0.2"
rustc-serialize = "0.3"
script_layout_interface = {path = "../script_layout_interface"}
script_traits = {path = "../script_traits"}
-selectors = "0.15.1"
+selectors = "0.17"
serde = "0.8"
servo_atoms = {path = "../atoms"}
servo_config = {path = "../config", features = ["servo"] }
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
index e93becfffdd..9fae93d10cd 100644
--- a/components/script/dom/element.rs
+++ b/components/script/dom/element.rs
@@ -2335,8 +2335,8 @@ impl<'a> ::selectors::Element for Root<Element> {
self.namespace()
}
- fn match_non_ts_pseudo_class(&self, pseudo_class: NonTSPseudoClass) -> bool {
- match pseudo_class {
+ fn match_non_ts_pseudo_class(&self, pseudo_class: &NonTSPseudoClass) -> bool {
+ match *pseudo_class {
// https://github.com/servo/servo/issues/8718
NonTSPseudoClass::Link |
NonTSPseudoClass::AnyLink => self.is_link(),
diff --git a/components/script/layout_wrapper.rs b/components/script/layout_wrapper.rs
index 15a110e7d51..fcaba5905a7 100644
--- a/components/script/layout_wrapper.rs
+++ b/components/script/layout_wrapper.rs
@@ -594,8 +594,8 @@ impl<'le> ::selectors::Element for ServoLayoutElement<'le> {
self.element.namespace()
}
- fn match_non_ts_pseudo_class(&self, pseudo_class: NonTSPseudoClass) -> bool {
- match pseudo_class {
+ fn match_non_ts_pseudo_class(&self, pseudo_class: &NonTSPseudoClass) -> bool {
+ match *pseudo_class {
// https://github.com/servo/servo/issues/8718
NonTSPseudoClass::Link |
NonTSPseudoClass::AnyLink => unsafe {
@@ -1092,7 +1092,7 @@ impl<'le> ::selectors::Element for ServoThreadSafeLayoutElement<'le> {
self.element.get_namespace()
}
- fn match_non_ts_pseudo_class(&self, _: NonTSPseudoClass) -> bool {
+ fn match_non_ts_pseudo_class(&self, _: &NonTSPseudoClass) -> bool {
// NB: This could maybe be implemented
warn!("ServoThreadSafeLayoutElement::match_non_ts_pseudo_class called");
false
diff --git a/components/script_layout_interface/Cargo.toml b/components/script_layout_interface/Cargo.toml
index c75279af06c..1440755e769 100644
--- a/components/script_layout_interface/Cargo.toml
+++ b/components/script_layout_interface/Cargo.toml
@@ -28,6 +28,6 @@ plugins = {path = "../plugins"}
profile_traits = {path = "../profile_traits"}
range = {path = "../range"}
script_traits = {path = "../script_traits"}
-selectors = "0.15.1"
+selectors = "0.17"
servo_url = {path = "../url"}
style = {path = "../style"}
diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
index 8bcc1e596ef..fcbab890135 100644
--- a/components/style/Cargo.toml
+++ b/components/style/Cargo.toml
@@ -46,7 +46,7 @@ phf = "0.7.20"
pdqsort = "0.1.0"
rayon = "0.6"
rustc-serialize = "0.3"
-selectors = "0.15.1"
+selectors = "0.17"
serde = {version = "0.8", optional = true}
serde_derive = {version = "0.8", optional = true}
servo_atoms = {path = "../atoms", optional = true}
diff --git a/components/style/gecko/wrapper.rs b/components/style/gecko/wrapper.rs
index 872fc06486c..1468e31f487 100644
--- a/components/style/gecko/wrapper.rs
+++ b/components/style/gecko/wrapper.rs
@@ -571,8 +571,8 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
}
}
- fn match_non_ts_pseudo_class(&self, pseudo_class: NonTSPseudoClass) -> bool {
- match pseudo_class {
+ fn match_non_ts_pseudo_class(&self, pseudo_class: &NonTSPseudoClass) -> bool {
+ match *pseudo_class {
// https://github.com/servo/servo/issues/8718
NonTSPseudoClass::AnyLink => unsafe { Gecko_IsLink(self.0) },
NonTSPseudoClass::Link => unsafe { Gecko_IsUnvisitedLink(self.0) },
@@ -732,7 +732,7 @@ impl<'le> ::selectors::MatchAttr for GeckoElement<'le> {
impl<'le> ElementExt for GeckoElement<'le> {
#[inline]
fn is_link(&self) -> bool {
- self.match_non_ts_pseudo_class(NonTSPseudoClass::AnyLink)
+ self.match_non_ts_pseudo_class(&NonTSPseudoClass::AnyLink)
}
#[inline]
diff --git a/components/style/restyle_hints.rs b/components/style/restyle_hints.rs
index cb0d889e7e9..785a18c1d1f 100644
--- a/components/style/restyle_hints.rs
+++ b/components/style/restyle_hints.rs
@@ -227,8 +227,8 @@ impl<'a, E> MatchAttr for ElementWrapper<'a, E>
impl<'a, E> Element for ElementWrapper<'a, E>
where E: TElement,
{
- fn match_non_ts_pseudo_class(&self, pseudo_class: NonTSPseudoClass) -> bool {
- let flag = SelectorImpl::pseudo_class_state_flag(&pseudo_class);
+ fn match_non_ts_pseudo_class(&self, pseudo_class: &NonTSPseudoClass) -> bool {
+ let flag = SelectorImpl::pseudo_class_state_flag(pseudo_class);
if flag == ElementState::empty() {
self.element.match_non_ts_pseudo_class(pseudo_class)
} else {
diff --git a/components/style/servo/selector_parser.rs b/components/style/servo/selector_parser.rs
index 9da80b05253..a2df2fa3795 100644
--- a/components/style/servo/selector_parser.rs
+++ b/components/style/servo/selector_parser.rs
@@ -428,7 +428,7 @@ impl MatchAttrGeneric for ServoElementSnapshot {
impl<E: Element<Impl=SelectorImpl> + Debug> ElementExt for E {
fn is_link(&self) -> bool {
- self.match_non_ts_pseudo_class(NonTSPseudoClass::AnyLink)
+ self.match_non_ts_pseudo_class(&NonTSPseudoClass::AnyLink)
}
#[inline]