diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-09-08 22:19:19 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-08 22:19:19 -0500 |
commit | 3117787fd2a8b7748cfde1e9b8c5be3c00f2c599 (patch) | |
tree | a8855004b4309212182505b0cf72f116d846c4cb /components/servo/lib.rs | |
parent | 5a5a76cc5db830d2e622d4e0924837383b64dfa2 (diff) | |
parent | 93a103ba7306b578841b73a0ecfbccaad8fc78c1 (diff) | |
download | servo-3117787fd2a8b7748cfde1e9b8c5be3c00f2c599.tar.gz servo-3117787fd2a8b7748cfde1e9b8c5be3c00f2c599.zip |
Auto merge of #13205 - UK992:tidy-sort, r=Wafflespeanut
Tidy: Fix ordering use statements with braces
This hack fixes https://github.com/servo/servo/issues/7412 and matches behavior with rustfmt.
<!-- 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/13205)
<!-- Reviewable:end -->
Diffstat (limited to 'components/servo/lib.rs')
-rw-r--r-- | components/servo/lib.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/servo/lib.rs b/components/servo/lib.rs index 6e61ad4d736..11a13d6c1cc 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -60,14 +60,14 @@ fn webdriver(port: u16, constellation: Sender<ConstellationMsg>) { #[cfg(not(feature = "webdriver"))] fn webdriver(_port: u16, _constellation: Sender<ConstellationMsg>) { } +use compositing::{CompositorProxy, IOCompositor}; use compositing::compositor_thread::InitialCompositorState; use compositing::windowing::WindowEvent; use compositing::windowing::WindowMethods; -use compositing::{CompositorProxy, IOCompositor}; +use constellation::{Constellation, InitialConstellationState, UnprivilegedPipelineContent}; +use constellation::{FromCompositorLogger, FromScriptLogger}; #[cfg(not(target_os = "windows"))] use constellation::content_process_sandbox_profile; -use constellation::{Constellation, InitialConstellationState, UnprivilegedPipelineContent}; -use constellation::{FromScriptLogger, FromCompositorLogger}; use env_logger::Logger as EnvLogger; #[cfg(not(target_os = "windows"))] use gaol::sandbox::{ChildSandbox, ChildSandboxMethods}; @@ -83,7 +83,7 @@ use profile::mem as profile_mem; use profile::time as profile_time; use profile_traits::mem; use profile_traits::time; -use script_traits::{ConstellationMsg, ScriptMsg, SWManagerSenders}; +use script_traits::{ConstellationMsg, SWManagerSenders, ScriptMsg}; use std::cmp::max; use std::rc::Rc; use std::sync::mpsc::Sender; |