diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-11-10 11:48:09 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-10 11:48:09 -0500 |
commit | 3b1078b58d510668355adb294193c0fa436b79c9 (patch) | |
tree | 2c2be69a7c068d6c06d3b473ae722293d88caa87 /components/style/parser.rs | |
parent | 7eb8544759d143b6622a734ab61b14af8ce55d82 (diff) | |
parent | b0d13cc2543d78c3369ea9894f270a126867cfc0 (diff) | |
download | servo-3b1078b58d510668355adb294193c0fa436b79c9.tar.gz servo-3b1078b58d510668355adb294193c0fa436b79c9.zip |
Auto merge of #22083 - servo:2018, r=emilio
Prepare stylo crates for switching to the 2018 edition
This can land when [Gecko requires Rust 1.30](https://bugzilla.mozilla.org/show_bug.cgi?id=1504031). This does not switch the crates yet because the new edition is not yet stable in 1.30.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22083)
<!-- Reviewable:end -->
Diffstat (limited to 'components/style/parser.rs')
-rw-r--r-- | components/style/parser.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/style/parser.rs b/components/style/parser.rs index 2d667f3f343..9f4a220311c 100644 --- a/components/style/parser.rs +++ b/components/style/parser.rs @@ -4,18 +4,18 @@ //! The context within which CSS code is parsed. -use context::QuirksMode; +use crate::context::QuirksMode; +use crate::error_reporting::{ContextualParseError, ParseErrorReporter}; +use crate::stylesheets::{CssRuleType, Namespaces, Origin, UrlExtraData}; +use crate::use_counters::UseCounters; use cssparser::{Parser, SourceLocation, UnicodeRange}; -use error_reporting::{ContextualParseError, ParseErrorReporter}; use style_traits::{OneOrMoreSeparated, ParseError, ParsingMode, Separator}; -use stylesheets::{CssRuleType, Namespaces, Origin, UrlExtraData}; -use use_counters::UseCounters; /// Asserts that all ParsingMode flags have a matching ParsingMode value in gecko. #[cfg(feature = "gecko")] #[inline] pub fn assert_parsing_mode_match() { - use gecko_bindings::structs; + use crate::gecko_bindings::structs; macro_rules! check_parsing_modes { ( $( $a:ident => $b:path ),*, ) => { |