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/parallel.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/parallel.rs')
-rw-r--r-- | components/style/parallel.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/style/parallel.rs b/components/style/parallel.rs index 25aaed5f3a3..5753320ca21 100644 --- a/components/style/parallel.rs +++ b/components/style/parallel.rs @@ -23,13 +23,13 @@ #![deny(missing_docs)] use arrayvec::ArrayVec; -use context::{StyleContext, ThreadLocalStyleContext}; -use dom::{OpaqueNode, SendNode, TElement}; +use crate::context::{StyleContext, ThreadLocalStyleContext}; +use crate::dom::{OpaqueNode, SendNode, TElement}; +use crate::scoped_tls::ScopedTLS; +use crate::traversal::{DomTraversal, PerLevelTraversalData}; use itertools::Itertools; use rayon; -use scoped_tls::ScopedTLS; use smallvec::SmallVec; -use traversal::{DomTraversal, PerLevelTraversalData}; /// The minimum stack size for a thread in the styling pool, in kilobytes. pub const STYLE_THREAD_STACK_SIZE_KB: usize = 256; |