diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-11-06 13:38:52 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-06 13:38:52 -0500 |
commit | 6878dbbbeaa59b21a7b3608b6d6a911e88c1e443 (patch) | |
tree | f4a13f7d59c7f72c51e30755d1097595764f96c0 /components/script/task_source/file_reading.rs | |
parent | 8df38f5e29d0005b792d403c3c54d35748448100 (diff) | |
parent | 8757cf5bc084ee23db643e283ca7e9fef143d810 (diff) | |
download | servo-6878dbbbeaa59b21a7b3608b6d6a911e88c1e443.tar.gz servo-6878dbbbeaa59b21a7b3608b6d6a911e88c1e443.zip |
Auto merge of #22086 - servo:2018-without-stylo, r=SimonSapin
Switch some crates to the 2018 edition
This is the subset of https://github.com/servo/servo/pull/22083 that doesn’t affect Gecko at all, so it isn’t blocked.
<!-- 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/22086)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/task_source/file_reading.rs')
-rw-r--r-- | components/script/task_source/file_reading.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/script/task_source/file_reading.rs b/components/script/task_source/file_reading.rs index 6c6324c79e0..129e4f35315 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 crate::script_runtime::{CommonScriptMsg, ScriptThreadEventCategory, ScriptChan}; +use crate::task::{TaskCanceller, TaskOnce}; +use crate::task_source::{TaskSource, TaskSourceName}; use msg::constellation_msg::PipelineId; -use script_runtime::{CommonScriptMsg, ScriptThreadEventCategory, ScriptChan}; use std::sync::Arc; -use task::{TaskCanceller, TaskOnce}; -use task_source::{TaskSource, TaskSourceName}; #[derive(JSTraceable)] pub struct FileReadingTaskSource(pub Box<ScriptChan + Send + 'static>, pub PipelineId); |