9 files changed, 14 insertions, 9 deletions
diff --git a/src/components/style/common_types.rs b/src/components/style/common_types.rs
index 7bde565a5b5..0d61ff6c108 100644
--- a/src/components/style/common_types.rs
+++ b/src/components/style/common_types.rs
@@ -9,7 +9,8 @@ pub type CSSFloat = f64;
 
 pub mod specified {
     use std::ascii::StrAsciiExt;
-    use cssparser::*;
+    use cssparser::ast;
+    use cssparser::ast::*;
     use super::{Au, CSSFloat};
     pub use CSSColor = cssparser::Color;
 
diff --git a/src/components/style/errors.rs b/src/components/style/errors.rs
index d899054393c..1f99a64e7d2 100644
--- a/src/components/style/errors.rs
+++ b/src/components/style/errors.rs
@@ -2,7 +2,7 @@
  * 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/. */
 
-use cssparser::{SyntaxError, SourceLocation};
+use cssparser::ast::{SyntaxError, SourceLocation};
 
 
 pub struct ErrorLoggerIterator<I>(I);
diff --git a/src/components/style/media_queries.rs b/src/components/style/media_queries.rs
index 0c6e39e16a9..d8f1e0f1d26 100644
--- a/src/components/style/media_queries.rs
+++ b/src/components/style/media_queries.rs
@@ -3,7 +3,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use std::ascii::StrAsciiExt;
-use cssparser::*;
+use cssparser::parse_rule_list;
+use cssparser::ast::*;
+
 use errors::{ErrorLoggerIterator, log_css_error};
 use stylesheets::{CSSRule, CSSMediaRule, parse_style_rule, parse_nested_at_rule};
 use namespaces::NamespaceMap;
diff --git a/src/components/style/namespaces.rs b/src/components/style/namespaces.rs
index 3c94ec3b3ea..77ae126fcd3 100644
--- a/src/components/style/namespaces.rs
+++ b/src/components/style/namespaces.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use std::hashmap::HashMap;
-use cssparser::*;
+use cssparser::ast::*;
 use errors::log_css_error;
 
 pub struct NamespaceMap {
diff --git a/src/components/style/parsing_utils.rs b/src/components/style/parsing_utils.rs
index 062e4f5a6ae..18288240a04 100644
--- a/src/components/style/parsing_utils.rs
+++ b/src/components/style/parsing_utils.rs
@@ -4,7 +4,7 @@
 
 
 use std::ascii::StrAsciiExt;
-use cssparser::*;
+use cssparser::ast::{ComponentValue, Ident, SkipWhitespaceIterable};
 
 
 pub fn one_component_value<'a>(input: &'a [ComponentValue]) -> Option<&'a ComponentValue> {
diff --git a/src/components/style/properties.rs.mako b/src/components/style/properties.rs.mako
index 8036a54e3f0..20cff68c7d3 100644
--- a/src/components/style/properties.rs.mako
+++ b/src/components/style/properties.rs.mako
@@ -6,9 +6,10 @@
 
 use std::ascii::StrAsciiExt;
 pub use extra::arc::Arc;
-pub use std::iter;
 pub use cssparser::*;
-pub use errors::{ErrorLoggerIterator, log_css_error};
+pub use cssparser::ast::*;
+
+use errors::{ErrorLoggerIterator, log_css_error};
 pub use parsing_utils::*;
 pub use self::common_types::*;
 
diff --git a/src/components/style/selectors.rs b/src/components/style/selectors.rs
index 86f84a128d0..1589625f61a 100644
--- a/src/components/style/selectors.rs
+++ b/src/components/style/selectors.rs
@@ -4,7 +4,7 @@
 
 use std::{vec, iter};
 use std::ascii::StrAsciiExt;
-use cssparser::*;
+use cssparser::ast::*;
 use namespaces::NamespaceMap;
 
 
diff --git a/src/components/style/stylesheets.rs b/src/components/style/stylesheets.rs
index b97a9897d43..a4c48fe9470 100644
--- a/src/components/style/stylesheets.rs
+++ b/src/components/style/stylesheets.rs
@@ -5,7 +5,8 @@
 use std::str;
 use std::iter::Iterator;
 use std::ascii::StrAsciiExt;
-use cssparser::*;
+use cssparser::{tokenize, parse_stylesheet_rules, ToCss};
+use cssparser::ast::*;
 use selectors;
 use properties;
 use errors::{ErrorLoggerIterator, log_css_error};
diff --git a/src/support/css/rust-cssparser b/src/support/css/rust-cssparser
-Subproject 03d7044a13a78a34db196e2bce48cb4826a144f
+Subproject 1a7b4ca6d368f6035a4135504f89d66c5e225d0