diff options
Diffstat (limited to 'components/script/task_source')
-rw-r--r-- | components/script/task_source/dom_manipulation.rs | 3 | ||||
-rw-r--r-- | components/script/task_source/file_reading.rs | 2 | ||||
-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 | 2 | ||||
-rw-r--r-- | components/script/task_source/user_interaction.rs | 3 |
6 files changed, 8 insertions, 6 deletions
diff --git a/components/script/task_source/dom_manipulation.rs b/components/script/task_source/dom_manipulation.rs index f7b7a6577f8..93cdfde95f4 100644 --- a/components/script/task_source/dom_manipulation.rs +++ b/components/script/task_source/dom_manipulation.rs @@ -8,11 +8,12 @@ use dom::event::{EventBubbles, EventCancelable, EventTask, SimpleEventTask}; use dom::eventtarget::EventTarget; use dom::window::Window; use script_runtime::{CommonScriptMsg, ScriptThreadEventCategory}; -use script_thread::{MainThreadScriptMsg, Task, TaskCanceller}; +use script_thread::MainThreadScriptMsg; use servo_atoms::Atom; use std::fmt; use std::result::Result; use std::sync::mpsc::Sender; +use task::{Task, TaskCanceller}; use task_source::TaskSource; #[derive(Clone, JSTraceable)] diff --git a/components/script/task_source/file_reading.rs b/components/script/task_source/file_reading.rs index dc9a6a751dd..1d44a4087d6 100644 --- a/components/script/task_source/file_reading.rs +++ b/components/script/task_source/file_reading.rs @@ -5,8 +5,8 @@ use dom::domexception::DOMErrorName; use dom::filereader::{FileReader, TrustedFileReader, GenerationId, ReadMetaData}; use script_runtime::{CommonScriptMsg, ScriptThreadEventCategory, ScriptChan}; -use script_thread::{Task, TaskCanceller}; use std::sync::Arc; +use task::{Task, TaskCanceller}; use task_source::TaskSource; #[derive(JSTraceable)] diff --git a/components/script/task_source/mod.rs b/components/script/task_source/mod.rs index 3dbb753883e..40b3c2f3261 100644 --- a/components/script/task_source/mod.rs +++ b/components/script/task_source/mod.rs @@ -10,8 +10,8 @@ pub mod performance_timeline; pub mod user_interaction; use dom::globalscope::GlobalScope; -use script_thread::{Task, TaskCanceller}; use std::result::Result; +use task::{Task, TaskCanceller}; pub trait TaskSource { fn queue_with_canceller<T>( diff --git a/components/script/task_source/networking.rs b/components/script/task_source/networking.rs index 56c583d775f..5d339037729 100644 --- a/components/script/task_source/networking.rs +++ b/components/script/task_source/networking.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory}; -use script_thread::{Task, TaskCanceller}; +use task::{Task, TaskCanceller}; use task_source::TaskSource; #[derive(JSTraceable)] diff --git a/components/script/task_source/performance_timeline.rs b/components/script/task_source/performance_timeline.rs index db80789a206..938566b7a8f 100644 --- a/components/script/task_source/performance_timeline.rs +++ b/components/script/task_source/performance_timeline.rs @@ -10,9 +10,9 @@ use dom::bindings::refcounted::Trusted; use dom::globalscope::GlobalScope; use dom::performance::Performance; use script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory}; -use script_thread::{Task, TaskCanceller}; use std::fmt; use std::result::Result; +use task::{Task, TaskCanceller}; use task_source::TaskSource; pub struct NotifyPerformanceObserverTask { diff --git a/components/script/task_source/user_interaction.rs b/components/script/task_source/user_interaction.rs index 3e84e0fb19a..8b36a61e9d0 100644 --- a/components/script/task_source/user_interaction.rs +++ b/components/script/task_source/user_interaction.rs @@ -8,11 +8,12 @@ use dom::event::{EventBubbles, EventCancelable, EventTask}; use dom::eventtarget::EventTarget; use dom::window::Window; use script_runtime::{CommonScriptMsg, ScriptThreadEventCategory}; -use script_thread::{MainThreadScriptMsg, Task, TaskCanceller}; +use script_thread::MainThreadScriptMsg; use servo_atoms::Atom; use std::fmt; use std::result::Result; use std::sync::mpsc::Sender; +use task::{Task, TaskCanceller}; use task_source::TaskSource; #[derive(Clone, JSTraceable)] |