diff options
author | Simon Sapin <simon.sapin@exyr.org> | 2018-11-01 23:45:06 +0100 |
---|---|---|
committer | Simon Sapin <simon.sapin@exyr.org> | 2018-11-06 15:26:02 +0100 |
commit | 45f7199eee82c66637ec68287eafa40a651001c4 (patch) | |
tree | 8c0802f4ac7b89c2ce4d73063c8f65b9ee5face9 /components/script/task_source | |
parent | 86f148fb97601413c0d983f21b760d973ade7a75 (diff) | |
download | servo-45f7199eee82c66637ec68287eafa40a651001c4.tar.gz servo-45f7199eee82c66637ec68287eafa40a651001c4.zip |
`cargo fix --edition`
Diffstat (limited to 'components/script/task_source')
-rw-r--r-- | components/script/task_source/dom_manipulation.rs | 16 | ||||
-rw-r--r-- | components/script/task_source/file_reading.rs | 10 | ||||
-rw-r--r-- | components/script/task_source/history_traversal.rs | 4 | ||||
-rw-r--r-- | components/script/task_source/media_element.rs | 18 | ||||
-rw-r--r-- | components/script/task_source/mod.rs | 4 | ||||
-rw-r--r-- | components/script/task_source/networking.rs | 6 | ||||
-rw-r--r-- | components/script/task_source/performance_timeline.rs | 10 | ||||
-rw-r--r-- | components/script/task_source/remote_event.rs | 6 | ||||
-rw-r--r-- | components/script/task_source/user_interaction.rs | 18 | ||||
-rw-r--r-- | components/script/task_source/websocket.rs | 6 |
10 files changed, 49 insertions, 49 deletions
diff --git a/components/script/task_source/dom_manipulation.rs b/components/script/task_source/dom_manipulation.rs index 376927da742..d361372e77c 100644 --- a/components/script/task_source/dom_manipulation.rs +++ b/components/script/task_source/dom_manipulation.rs @@ -2,18 +2,18 @@ * 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 dom::bindings::inheritance::Castable; -use dom::bindings::refcounted::Trusted; -use dom::event::{EventBubbles, EventCancelable, EventTask, SimpleEventTask}; -use dom::eventtarget::EventTarget; -use dom::window::Window; +use crate::dom::bindings::inheritance::Castable; +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 script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory}; +use crate::script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory}; use servo_atoms::Atom; use std::fmt; use std::result::Result; -use task::{TaskCanceller, TaskOnce}; -use task_source::{TaskSource, TaskSourceName}; +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 6c6324c79e0..db810939f68 100644 --- a/components/script/task_source/file_reading.rs +++ b/components/script/task_source/file_reading.rs @@ -2,13 +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 dom::domexception::DOMErrorName; -use dom::filereader::{FileReader, TrustedFileReader, GenerationId, ReadMetaData}; +use crate::dom::domexception::DOMErrorName; +use crate::dom::filereader::{FileReader, TrustedFileReader, GenerationId, ReadMetaData}; use msg::constellation_msg::PipelineId; -use script_runtime::{CommonScriptMsg, ScriptThreadEventCategory, ScriptChan}; +use crate::script_runtime::{CommonScriptMsg, ScriptThreadEventCategory, ScriptChan}; use std::sync::Arc; -use task::{TaskCanceller, TaskOnce}; -use task_source::{TaskSource, TaskSourceName}; +use crate::task::{TaskCanceller, TaskOnce}; +use crate::task_source::{TaskSource, TaskSourceName}; #[derive(JSTraceable)] pub struct FileReadingTaskSource(pub Box<ScriptChan + Send + 'static>, pub PipelineId); diff --git a/components/script/task_source/history_traversal.rs b/components/script/task_source/history_traversal.rs index dfd97bf23e7..97c099fd3b2 100644 --- a/components/script/task_source/history_traversal.rs +++ b/components/script/task_source/history_traversal.rs @@ -2,8 +2,8 @@ * 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 script_runtime::{ScriptChan, CommonScriptMsg}; -use script_thread::MainThreadScriptMsg; +use crate::script_runtime::{ScriptChan, CommonScriptMsg}; +use crate::script_thread::MainThreadScriptMsg; use servo_channel::Sender; #[derive(JSTraceable)] diff --git a/components/script/task_source/media_element.rs b/components/script/task_source/media_element.rs index 711af86ba08..63d0f3da81b 100644 --- a/components/script/task_source/media_element.rs +++ b/components/script/task_source/media_element.rs @@ -2,20 +2,20 @@ * 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 dom::bindings::inheritance::Castable; -use dom::bindings::refcounted::Trusted; -use dom::event::SimpleEventTask; -use dom::eventtarget::EventTarget; -use dom::window::Window; +use crate::dom::bindings::inheritance::Castable; +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 script_runtime::{CommonScriptMsg, ScriptThreadEventCategory}; -use script_thread::MainThreadScriptMsg; +use crate::script_runtime::{CommonScriptMsg, ScriptThreadEventCategory}; +use crate::script_thread::MainThreadScriptMsg; use servo_atoms::Atom; use servo_channel::Sender; use std::fmt; use std::result::Result; -use task::{TaskCanceller, TaskOnce}; -use task_source::{TaskSource, TaskSourceName}; +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 b58c0cb3191..719f232afd9 100644 --- a/components/script/task_source/mod.rs +++ b/components/script/task_source/mod.rs @@ -12,10 +12,10 @@ pub mod remote_event; pub mod user_interaction; pub mod websocket; -use dom::globalscope::GlobalScope; +use crate::dom::globalscope::GlobalScope; use enum_iterator::IntoEnumIterator; use std::result::Result; -use task::{TaskCanceller, TaskOnce}; +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 08429c4e029..7eef50b5b47 100644 --- a/components/script/task_source/networking.rs +++ b/components/script/task_source/networking.rs @@ -3,9 +3,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use msg::constellation_msg::PipelineId; -use script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory}; -use task::{TaskCanceller, TaskOnce}; -use task_source::{TaskSource, TaskSourceName}; +use crate::script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory}; +use crate::task::{TaskCanceller, TaskOnce}; +use crate::task_source::{TaskSource, TaskSourceName}; #[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 645338554f0..5b7716bd3e2 100644 --- a/components/script/task_source/performance_timeline.rs +++ b/components/script/task_source/performance_timeline.rs @@ -6,14 +6,14 @@ // 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 dom::bindings::refcounted::Trusted; -use dom::globalscope::GlobalScope; +use crate::dom::bindings::refcounted::Trusted; +use crate::dom::globalscope::GlobalScope; use msg::constellation_msg::PipelineId; -use script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory}; +use crate::script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory}; use std::fmt; use std::result::Result; -use task::{TaskCanceller, TaskOnce}; -use task_source::{TaskSource, TaskSourceName}; +use crate::task::{TaskCanceller, TaskOnce}; +use crate::task_source::{TaskSource, TaskSourceName}; #[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 0e02551b034..c47b25ed0bf 100644 --- a/components/script/task_source/remote_event.rs +++ b/components/script/task_source/remote_event.rs @@ -3,9 +3,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use msg::constellation_msg::PipelineId; -use script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory}; -use task::{TaskCanceller, TaskOnce}; -use task_source::{TaskSource, TaskSourceName}; +use crate::script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory}; +use crate::task::{TaskCanceller, TaskOnce}; +use crate::task_source::{TaskSource, TaskSourceName}; #[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 18b86cf5a24..961b16ef4d6 100644 --- a/components/script/task_source/user_interaction.rs +++ b/components/script/task_source/user_interaction.rs @@ -2,20 +2,20 @@ * 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 dom::bindings::inheritance::Castable; -use dom::bindings::refcounted::Trusted; -use dom::event::{EventBubbles, EventCancelable, EventTask}; -use dom::eventtarget::EventTarget; -use dom::window::Window; +use crate::dom::bindings::inheritance::Castable; +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 script_runtime::{CommonScriptMsg, ScriptThreadEventCategory}; -use script_thread::MainThreadScriptMsg; +use crate::script_runtime::{CommonScriptMsg, ScriptThreadEventCategory}; +use crate::script_thread::MainThreadScriptMsg; use servo_atoms::Atom; use servo_channel::Sender; use std::fmt; use std::result::Result; -use task::{TaskCanceller, TaskOnce}; -use task_source::{TaskSource, TaskSourceName}; +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 9fb1ade2b01..36a5dc965e1 100644 --- a/components/script/task_source/websocket.rs +++ b/components/script/task_source/websocket.rs @@ -3,9 +3,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use msg::constellation_msg::PipelineId; -use script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory}; -use task::{TaskCanceller, TaskOnce}; -use task_source::{TaskSource, TaskSourceName}; +use crate::script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory}; +use crate::task::{TaskCanceller, TaskOnce}; +use crate::task_source::{TaskSource, TaskSourceName}; #[derive(JSTraceable)] pub struct WebsocketTaskSource(pub Box<ScriptChan + Send + 'static>, pub PipelineId); |