diff options
author | Simon Sapin <simon.sapin@exyr.org> | 2018-11-01 17:23:56 +0100 |
---|---|---|
committer | Simon Sapin <simon.sapin@exyr.org> | 2018-11-06 15:26:02 +0100 |
commit | 76e59a46d3aff701b2e8dfbaf047f6d5c3edcced (patch) | |
tree | ee36ca9b3f981d01184871fe72fbc31347086e92 /components/script/task_source | |
parent | 45f7199eee82c66637ec68287eafa40a651001c4 (diff) | |
download | servo-76e59a46d3aff701b2e8dfbaf047f6d5c3edcced.tar.gz servo-76e59a46d3aff701b2e8dfbaf047f6d5c3edcced.zip |
Sort `use` statements
Diffstat (limited to 'components/script/task_source')
-rw-r--r-- | components/script/task_source/dom_manipulation.rs | 6 | ||||
-rw-r--r-- | components/script/task_source/file_reading.rs | 4 | ||||
-rw-r--r-- | components/script/task_source/media_element.rs | 6 | ||||
-rw-r--r-- | components/script/task_source/mod.rs | 2 | ||||
-rw-r--r-- | components/script/task_source/networking.rs | 2 | ||||
-rw-r--r-- | components/script/task_source/performance_timeline.rs | 6 | ||||
-rw-r--r-- | components/script/task_source/remote_event.rs | 2 | ||||
-rw-r--r-- | components/script/task_source/user_interaction.rs | 6 | ||||
-rw-r--r-- | components/script/task_source/websocket.rs | 2 |
9 files changed, 18 insertions, 18 deletions
diff --git a/components/script/task_source/dom_manipulation.rs b/components/script/task_source/dom_manipulation.rs index d361372e77c..fa6da31e6eb 100644 --- a/components/script/task_source/dom_manipulation.rs +++ b/components/script/task_source/dom_manipulation.rs @@ -7,13 +7,13 @@ use crate::dom::bindings::refcounted::Trusted; use crate::dom::event::{EventBubbles, EventCancelable, EventTask, SimpleEventTask}; use crate::dom::eventtarget::EventTarget; use crate::dom::window::Window; -use msg::constellation_msg::PipelineId; use crate::script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory}; +use crate::task::{TaskCanceller, TaskOnce}; +use crate::task_source::{TaskSource, TaskSourceName}; +use msg::constellation_msg::PipelineId; use servo_atoms::Atom; use std::fmt; use std::result::Result; -use crate::task::{TaskCanceller, TaskOnce}; -use crate::task_source::{TaskSource, TaskSourceName}; #[derive(JSTraceable)] pub struct DOMManipulationTaskSource(pub Box<ScriptChan + Send>, pub PipelineId); diff --git a/components/script/task_source/file_reading.rs b/components/script/task_source/file_reading.rs index db810939f68..129e4f35315 100644 --- a/components/script/task_source/file_reading.rs +++ b/components/script/task_source/file_reading.rs @@ -4,11 +4,11 @@ use crate::dom::domexception::DOMErrorName; use crate::dom::filereader::{FileReader, TrustedFileReader, GenerationId, ReadMetaData}; -use msg::constellation_msg::PipelineId; use crate::script_runtime::{CommonScriptMsg, ScriptThreadEventCategory, ScriptChan}; -use std::sync::Arc; use crate::task::{TaskCanceller, TaskOnce}; use crate::task_source::{TaskSource, TaskSourceName}; +use msg::constellation_msg::PipelineId; +use std::sync::Arc; #[derive(JSTraceable)] pub struct FileReadingTaskSource(pub Box<ScriptChan + Send + 'static>, pub PipelineId); diff --git a/components/script/task_source/media_element.rs b/components/script/task_source/media_element.rs index 63d0f3da81b..d57368ecae1 100644 --- a/components/script/task_source/media_element.rs +++ b/components/script/task_source/media_element.rs @@ -7,15 +7,15 @@ use crate::dom::bindings::refcounted::Trusted; use crate::dom::event::SimpleEventTask; use crate::dom::eventtarget::EventTarget; use crate::dom::window::Window; -use msg::constellation_msg::PipelineId; use crate::script_runtime::{CommonScriptMsg, ScriptThreadEventCategory}; use crate::script_thread::MainThreadScriptMsg; +use crate::task::{TaskCanceller, TaskOnce}; +use crate::task_source::{TaskSource, TaskSourceName}; +use msg::constellation_msg::PipelineId; use servo_atoms::Atom; use servo_channel::Sender; use std::fmt; use std::result::Result; -use crate::task::{TaskCanceller, TaskOnce}; -use crate::task_source::{TaskSource, TaskSourceName}; #[derive(Clone, JSTraceable)] pub struct MediaElementTaskSource(pub Sender<MainThreadScriptMsg>, pub PipelineId); diff --git a/components/script/task_source/mod.rs b/components/script/task_source/mod.rs index 719f232afd9..f0105422be3 100644 --- a/components/script/task_source/mod.rs +++ b/components/script/task_source/mod.rs @@ -13,9 +13,9 @@ pub mod user_interaction; pub mod websocket; use crate::dom::globalscope::GlobalScope; +use crate::task::{TaskCanceller, TaskOnce}; use enum_iterator::IntoEnumIterator; use std::result::Result; -use crate::task::{TaskCanceller, TaskOnce}; // The names of all task sources, used to differentiate TaskCancellers. // Note: When adding a task source, update this enum. diff --git a/components/script/task_source/networking.rs b/components/script/task_source/networking.rs index 7eef50b5b47..a472a8f5691 100644 --- a/components/script/task_source/networking.rs +++ b/components/script/task_source/networking.rs @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use msg::constellation_msg::PipelineId; use crate::script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory}; use crate::task::{TaskCanceller, TaskOnce}; use crate::task_source::{TaskSource, TaskSourceName}; +use msg::constellation_msg::PipelineId; #[derive(JSTraceable)] pub struct NetworkingTaskSource(pub Box<ScriptChan + Send + 'static>, pub PipelineId); diff --git a/components/script/task_source/performance_timeline.rs b/components/script/task_source/performance_timeline.rs index 5b7716bd3e2..f6c29880e98 100644 --- a/components/script/task_source/performance_timeline.rs +++ b/components/script/task_source/performance_timeline.rs @@ -8,12 +8,12 @@ use crate::dom::bindings::refcounted::Trusted; use crate::dom::globalscope::GlobalScope; -use msg::constellation_msg::PipelineId; use crate::script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory}; -use std::fmt; -use std::result::Result; use crate::task::{TaskCanceller, TaskOnce}; use crate::task_source::{TaskSource, TaskSourceName}; +use msg::constellation_msg::PipelineId; +use std::fmt; +use std::result::Result; #[derive(JSTraceable)] pub struct PerformanceTimelineTaskSource(pub Box<ScriptChan + Send + 'static>, pub PipelineId); diff --git a/components/script/task_source/remote_event.rs b/components/script/task_source/remote_event.rs index c47b25ed0bf..e58f94d1645 100644 --- a/components/script/task_source/remote_event.rs +++ b/components/script/task_source/remote_event.rs @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use msg::constellation_msg::PipelineId; use crate::script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory}; use crate::task::{TaskCanceller, TaskOnce}; use crate::task_source::{TaskSource, TaskSourceName}; +use msg::constellation_msg::PipelineId; #[derive(JSTraceable)] pub struct RemoteEventTaskSource(pub Box<ScriptChan + Send + 'static>, pub PipelineId); diff --git a/components/script/task_source/user_interaction.rs b/components/script/task_source/user_interaction.rs index 961b16ef4d6..fcf6a39e17b 100644 --- a/components/script/task_source/user_interaction.rs +++ b/components/script/task_source/user_interaction.rs @@ -7,15 +7,15 @@ use crate::dom::bindings::refcounted::Trusted; use crate::dom::event::{EventBubbles, EventCancelable, EventTask}; use crate::dom::eventtarget::EventTarget; use crate::dom::window::Window; -use msg::constellation_msg::PipelineId; use crate::script_runtime::{CommonScriptMsg, ScriptThreadEventCategory}; use crate::script_thread::MainThreadScriptMsg; +use crate::task::{TaskCanceller, TaskOnce}; +use crate::task_source::{TaskSource, TaskSourceName}; +use msg::constellation_msg::PipelineId; use servo_atoms::Atom; use servo_channel::Sender; use std::fmt; use std::result::Result; -use crate::task::{TaskCanceller, TaskOnce}; -use crate::task_source::{TaskSource, TaskSourceName}; #[derive(Clone, JSTraceable)] pub struct UserInteractionTaskSource(pub Sender<MainThreadScriptMsg>, pub PipelineId); diff --git a/components/script/task_source/websocket.rs b/components/script/task_source/websocket.rs index 36a5dc965e1..9cb116155d1 100644 --- a/components/script/task_source/websocket.rs +++ b/components/script/task_source/websocket.rs @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use msg::constellation_msg::PipelineId; use crate::script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory}; use crate::task::{TaskCanceller, TaskOnce}; use crate::task_source::{TaskSource, TaskSourceName}; +use msg::constellation_msg::PipelineId; #[derive(JSTraceable)] pub struct WebsocketTaskSource(pub Box<ScriptChan + Send + 'static>, pub PipelineId); |