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/net/resource_thread.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/net/resource_thread.rs')
-rw-r--r-- | components/net/resource_thread.rs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/components/net/resource_thread.rs b/components/net/resource_thread.rs index 8c0a1652778..6c4cc78479a 100644 --- a/components/net/resource_thread.rs +++ b/components/net/resource_thread.rs @@ -3,19 +3,21 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ //! A thread that takes a URL and streams back the binary data. -use connector::{create_http_client, create_ssl_connector_builder}; -use cookie; -use cookie_rs; -use cookie_storage::CookieStorage; +use crate::connector::{create_http_client, create_ssl_connector_builder}; +use crate::cookie; +use crate::cookie_rs; +use crate::cookie_storage::CookieStorage; +use crate::fetch::cors_cache::CorsCache; +use crate::fetch::methods::{CancellationListener, FetchContext, fetch}; +use crate::filemanager_thread::FileManager; +use crate::hsts::HstsList; +use crate::http_cache::HttpCache; +use crate::http_loader::{HANDLE, HttpState, http_redirect_fetch}; +use crate::storage_thread::StorageThreadFactory; +use crate::websocket_loader; use devtools_traits::DevtoolsControlMsg; use embedder_traits::EmbedderProxy; use embedder_traits::resources::{self, Resource}; -use fetch::cors_cache::CorsCache; -use fetch::methods::{CancellationListener, FetchContext, fetch}; -use filemanager_thread::FileManager; -use hsts::HstsList; -use http_cache::HttpCache; -use http_loader::{HANDLE, HttpState, http_redirect_fetch}; use hyper_serde::Serde; use ipc_channel::ipc::{self, IpcReceiver, IpcReceiverSet, IpcSender}; use malloc_size_of::{MallocSizeOf, MallocSizeOfOps}; @@ -44,8 +46,6 @@ use std::ops::Deref; use std::path::{Path, PathBuf}; use std::sync::{Arc, Mutex, RwLock}; use std::thread; -use storage_thread::StorageThreadFactory; -use websocket_loader; /// Returns a tuple of (public, private) senders to the new threads. pub fn new_resource_threads( |