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.

4 files changed, 9 insertions, 5 deletions

diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index f58356ff9f5..62a44c31109 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -42,6 +42,9 @@ path = "../canvas"
 [dependencies.cssparser]
 git = "https://github.com/servo/rust-cssparser"
 
+[dependencies.selectors]
+git = "https://github.com/servo/rust-selectors"
+
 [dependencies.geom]
 git = "https://github.com/servo/rust-geom"
 
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;
 
diff --git a/components/script/lib.rs b/components/script/lib.rs
index a35e3c2ee89..a88bc2f5fa9 100644
--- a/components/script/lib.rs
+++ b/components/script/lib.rs
@@ -41,6 +41,7 @@ extern crate "rustc-serialize" as rustc_serialize;
 extern crate time;
 extern crate canvas;
 extern crate script_traits;
+extern crate selectors;
 #[no_link] #[plugin] #[macro_use]
 extern crate "plugins" as servo_plugins;
 extern crate util;