12 files changed, 48 insertions, 29 deletions
diff --git a/components/script/task_source/dom_manipulation.rs b/components/script/task_source/dom_manipulation.rs
index 68316b79fe3..64c2b3a33c6 100644
--- a/components/script/task_source/dom_manipulation.rs
+++ b/components/script/task_source/dom_manipulation.rs
@@ -2,6 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use std::fmt;
+use std::result::Result;
+
+use msg::constellation_msg::PipelineId;
+use servo_atoms::Atom;
+
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::refcounted::Trusted;
 use crate::dom::event::{EventBubbles, EventCancelable, EventTask, SimpleEventTask};
@@ -10,10 +16,6 @@ use crate::dom::window::Window;
 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;
 
 #[derive(JSTraceable)]
 pub struct DOMManipulationTaskSource(pub Box<dyn ScriptChan + Send>, #[no_trace] pub PipelineId);
diff --git a/components/script/task_source/file_reading.rs b/components/script/task_source/file_reading.rs
index 646778ffea5..ebf37249b59 100644
--- a/components/script/task_source/file_reading.rs
+++ b/components/script/task_source/file_reading.rs
@@ -2,12 +2,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use msg::constellation_msg::PipelineId;
+
 use crate::dom::domexception::DOMErrorName;
 use crate::dom::filereader::{FileReader, GenerationId, ReadMetaData, TrustedFileReader};
 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 FileReadingTaskSource(
diff --git a/components/script/task_source/history_traversal.rs b/components/script/task_source/history_traversal.rs
index ecabbddfa55..1676461fa99 100644
--- a/components/script/task_source/history_traversal.rs
+++ b/components/script/task_source/history_traversal.rs
@@ -2,12 +2,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use crossbeam_channel::Sender;
+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 crossbeam_channel::Sender;
-use msg::constellation_msg::PipelineId;
 
 #[derive(Clone, JSTraceable)]
 pub struct HistoryTraversalTaskSource(
diff --git a/components/script/task_source/media_element.rs b/components/script/task_source/media_element.rs
index 16922a0ec87..64d2f6c2764 100644
--- a/components/script/task_source/media_element.rs
+++ b/components/script/task_source/media_element.rs
@@ -2,6 +2,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use std::fmt;
+use std::result::Result;
+
+use crossbeam_channel::Sender;
+use msg::constellation_msg::PipelineId;
+use servo_atoms::Atom;
+
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::refcounted::Trusted;
 use crate::dom::event::SimpleEventTask;
@@ -11,11 +18,6 @@ use crate::script_runtime::{CommonScriptMsg, ScriptThreadEventCategory};
 use crate::script_thread::MainThreadScriptMsg;
 use crate::task::{TaskCanceller, TaskOnce};
 use crate::task_source::{TaskSource, TaskSourceName};
-use crossbeam_channel::Sender;
-use msg::constellation_msg::PipelineId;
-use servo_atoms::Atom;
-use std::fmt;
-use std::result::Result;
 
 #[derive(Clone, JSTraceable)]
 pub struct MediaElementTaskSource(
diff --git a/components/script/task_source/mod.rs b/components/script/task_source/mod.rs
index 7defd922779..b67b87c8caf 100644
--- a/components/script/task_source/mod.rs
+++ b/components/script/task_source/mod.rs
@@ -14,10 +14,12 @@ pub mod timer;
 pub mod user_interaction;
 pub mod websocket;
 
+use std::result::Result;
+
+use enum_iterator::IntoEnumIterator;
+
 use crate::dom::globalscope::GlobalScope;
 use crate::task::{TaskCanceller, TaskOnce};
-use enum_iterator::IntoEnumIterator;
-use std::result::Result;
 
 // 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 0193cb22839..b95e20aa9fe 100644
--- a/components/script/task_source/networking.rs
+++ b/components/script/task_source/networking.rs
@@ -2,10 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://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(
diff --git a/components/script/task_source/performance_timeline.rs b/components/script/task_source/performance_timeline.rs
index 58e2660e6fd..b66f1c496b8 100644
--- a/components/script/task_source/performance_timeline.rs
+++ b/components/script/task_source/performance_timeline.rs
@@ -6,14 +6,16 @@
 //     a low priority task and it should be processed during idle periods.
 //     We are currently treating this task queue as a normal priority queue.
 
+use std::fmt;
+use std::result::Result;
+
+use msg::constellation_msg::PipelineId;
+
 use crate::dom::bindings::refcounted::Trusted;
 use crate::dom::globalscope::GlobalScope;
 use crate::script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory};
 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(
diff --git a/components/script/task_source/port_message.rs b/components/script/task_source/port_message.rs
index e21230f8099..30fe007cbf4 100644
--- a/components/script/task_source/port_message.rs
+++ b/components/script/task_source/port_message.rs
@@ -2,11 +2,13 @@
  * 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 std::fmt;
+
+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 std::fmt;
 
 #[derive(JSTraceable)]
 pub struct PortMessageQueue(
diff --git a/components/script/task_source/remote_event.rs b/components/script/task_source/remote_event.rs
index 91e132ed719..061558af6c9 100644
--- a/components/script/task_source/remote_event.rs
+++ b/components/script/task_source/remote_event.rs
@@ -2,10 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://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(
diff --git a/components/script/task_source/timer.rs b/components/script/task_source/timer.rs
index 9c4d03bdda5..f5bfdbb8f52 100644
--- a/components/script/task_source/timer.rs
+++ b/components/script/task_source/timer.rs
@@ -2,11 +2,13 @@
  * 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 std::fmt;
+
+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 std::fmt;
 
 #[derive(JSTraceable)]
 /// https://html.spec.whatwg.org/multipage/#timer-task-source
diff --git a/components/script/task_source/user_interaction.rs b/components/script/task_source/user_interaction.rs
index 1f543d88cfd..a16277f2781 100644
--- a/components/script/task_source/user_interaction.rs
+++ b/components/script/task_source/user_interaction.rs
@@ -2,6 +2,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use std::fmt;
+use std::result::Result;
+
+use crossbeam_channel::Sender;
+use msg::constellation_msg::PipelineId;
+use servo_atoms::Atom;
+
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::refcounted::Trusted;
 use crate::dom::event::{EventBubbles, EventCancelable, EventTask};
@@ -11,11 +18,6 @@ use crate::script_runtime::{CommonScriptMsg, ScriptThreadEventCategory};
 use crate::script_thread::MainThreadScriptMsg;
 use crate::task::{TaskCanceller, TaskOnce};
 use crate::task_source::{TaskSource, TaskSourceName};
-use crossbeam_channel::Sender;
-use msg::constellation_msg::PipelineId;
-use servo_atoms::Atom;
-use std::fmt;
-use std::result::Result;
 
 #[derive(Clone, JSTraceable)]
 pub struct UserInteractionTaskSource(
diff --git a/components/script/task_source/websocket.rs b/components/script/task_source/websocket.rs
index 843a9632a8a..ec5e263fe09 100644
--- a/components/script/task_source/websocket.rs
+++ b/components/script/task_source/websocket.rs
@@ -2,10 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://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(