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/applicable_declarations.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/applicable_declarations.rs')
| -rw-r--r-- | components/style/applicable_declarations.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/style/applicable_declarations.rs b/components/style/applicable_declarations.rs index 986dc04c371..031d0e8005b 100644 --- a/components/style/applicable_declarations.rs +++ b/components/style/applicable_declarations.rs @@ -4,10 +4,10 @@ //! Applicable declarations management. -use properties::PropertyDeclarationBlock; -use rule_tree::{CascadeLevel, ShadowCascadeOrder, StyleSource}; +use crate::properties::PropertyDeclarationBlock; +use crate::rule_tree::{CascadeLevel, ShadowCascadeOrder, StyleSource}; +use crate::shared_lock::Locked; use servo_arc::Arc; -use shared_lock::Locked; use smallvec::SmallVec; use std::fmt::{self, Debug}; |