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/selector_map.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/selector_map.rs')
-rw-r--r-- | components/style/selector_map.rs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/components/style/selector_map.rs b/components/style/selector_map.rs index d9bf0771084..38503f69d05 100644 --- a/components/style/selector_map.rs +++ b/components/style/selector_map.rs @@ -5,22 +5,22 @@ //! A data structure to efficiently index structs containing selectors by local //! name, ids and hash. -use applicable_declarations::ApplicableDeclarationList; -use context::QuirksMode; -use dom::TElement; +use crate::applicable_declarations::ApplicableDeclarationList; +use crate::context::QuirksMode; +use crate::dom::TElement; +use crate::hash::map as hash_map; +use crate::hash::{HashMap, HashSet}; +use crate::rule_tree::{CascadeLevel, ShadowCascadeOrder}; +use crate::selector_parser::SelectorImpl; +use crate::stylist::Rule; +use crate::{Atom, LocalName, Namespace, WeakAtom}; use fallible::FallibleVec; -use hash::map as hash_map; -use hash::{HashMap, HashSet}; use hashglobe::FailedAllocationError; use precomputed_hash::PrecomputedHash; -use rule_tree::{CascadeLevel, ShadowCascadeOrder}; -use selector_parser::SelectorImpl; use selectors::matching::{matches_selector, ElementSelectorFlags, MatchingContext}; use selectors::parser::{Combinator, Component, SelectorIter}; use smallvec::SmallVec; use std::hash::{BuildHasherDefault, Hash, Hasher}; -use stylist::Rule; -use {Atom, LocalName, Namespace, WeakAtom}; /// A hasher implementation that doesn't hash anything, because it expects its /// input to be a suitable u32 hash. |