aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-02-23 08:39:47 -0700
committerbors-servo <metajack+bors@gmail.com>2015-02-23 08:39:47 -0700
commit91abf5557b1a324d6568ce08cfb92cdffca10e41 (patch)
tree4842bd2f8fcb0d3808a639d47936a41b8e40421d /components/script/dom
parentf0b5794e44a2a28212aaf3fac4c340a3f32a8515 (diff)
parent2a50755c8a751218c8e3d5de53c831deaf061e64 (diff)
downloadservo-91abf5557b1a324d6568ce08cfb92cdffca10e41.tar.gz
servo-91abf5557b1a324d6568ce08cfb92cdffca10e41.zip
auto merge of #5010 : SimonSapin/servo/external-selectors, r=larsberg
The new library is https://github.com/servo/rust-selectors. It’s not quite ready for other users (the API needs work), but this is a first step. https://github.com/servo/rust-selectors/pull/2 should also be reviewed. Fixes #3669.
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/element.rs4
-rw-r--r--components/script/dom/node.rs6
2 files changed, 5 insertions, 5 deletions
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
index e54607f73a0..03e7247eb7a 100644
--- a/components/script/dom/element.rs
+++ b/components/script/dom/element.rs
@@ -53,9 +53,9 @@ use dom::nodelist::NodeList;
use dom::virtualmethods::{VirtualMethods, vtable_for};
use devtools_traits::AttrInfo;
use style::legacy::{SimpleColorAttribute, UnsignedIntegerAttribute, IntegerAttribute, LengthAttribute};
-use style::selector_matching::matches;
+use selectors::matching::matches;
use style::properties::{PropertyDeclarationBlock, PropertyDeclaration, parse_style_attribute};
-use style::selectors::parse_author_origin_selector_list_from_str;
+use selectors::parser::parse_author_origin_selector_list_from_str;
use style;
use util::namespace;
use util::str::{DOMString, LengthOrPercentageOrAuto};
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index 253e987e454..18910764188 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -48,9 +48,9 @@ use devtools_traits::NodeInfo;
use script_traits::UntrustedNodeAddress;
use util::geometry::Au;
use util::str::{DOMString, null_str_as_empty};
-use style::selectors::{Selector, AttrSelector, NamespaceConstraint};
-use style::selectors::parse_author_origin_selector_list_from_str;
-use style::selector_matching::matches;
+use selectors::parser::{Selector, AttrSelector, NamespaceConstraint};
+use selectors::parser::parse_author_origin_selector_list_from_str;
+use selectors::matching::matches;
use style::properties::ComputedValues;
use style;