diff options
Diffstat (limited to 'components/net/tests')
-rw-r--r-- | components/net/tests/cookie.rs | 2 | ||||
-rw-r--r-- | components/net/tests/data_loader.rs | 2 | ||||
-rw-r--r-- | components/net/tests/fetch.rs | 8 | ||||
-rw-r--r-- | components/net/tests/filemanager_thread.rs | 2 | ||||
-rw-r--r-- | components/net/tests/http_loader.rs | 15 | ||||
-rw-r--r-- | components/net/tests/resource_thread.rs | 2 |
6 files changed, 16 insertions, 15 deletions
diff --git a/components/net/tests/cookie.rs b/components/net/tests/cookie.rs index 219b2979aa9..9cf9aa3ac14 100644 --- a/components/net/tests/cookie.rs +++ b/components/net/tests/cookie.rs @@ -2,7 +2,7 @@ * 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 cookie_rs; +use crate::cookie_rs; use net::cookie::Cookie; use net::cookie_storage::CookieStorage; use net_traits::CookieSource; diff --git a/components/net/tests/data_loader.rs b/components/net/tests/data_loader.rs index cc8bfd69b38..5ab5c68943f 100644 --- a/components/net/tests/data_loader.rs +++ b/components/net/tests/data_loader.rs @@ -2,7 +2,7 @@ * 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 fetch; +use crate::fetch; use headers_core::HeaderMapExt; use headers_ext::ContentType; use hyper_serde::Serde; diff --git a/components/net/tests/fetch.rs b/components/net/tests/fetch.rs index f89ed8170ba..bd24b873352 100644 --- a/components/net/tests/fetch.rs +++ b/components/net/tests/fetch.rs @@ -2,11 +2,11 @@ * 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 {DEFAULT_USER_AGENT, new_fetch_context, create_embedder_proxy, fetch, make_server, make_ssl_server}; +use crate::{DEFAULT_USER_AGENT, new_fetch_context, create_embedder_proxy, fetch, make_server, make_ssl_server}; use devtools_traits::HttpRequest as DevtoolsHttpRequest; use devtools_traits::HttpResponse as DevtoolsHttpResponse; -use fetch_with_context; -use fetch_with_cors_cache; +use crate::fetch_with_context; +use crate::fetch_with_cors_cache; use headers_core::HeaderMapExt; use headers_ext::{AccessControlAllowCredentials, AccessControlAllowHeaders, AccessControlAllowOrigin}; use headers_ext::{AccessControlAllowMethods, AccessControlMaxAge}; @@ -14,7 +14,7 @@ use headers_ext::{CacheControl, ContentLength, ContentType, Expires, Host, LastM use http::{Method, StatusCode}; use http::header::{self, HeaderMap, HeaderName, HeaderValue}; use http::uri::Authority; -use http_loader::{expect_devtools_http_request, expect_devtools_http_response}; +use crate::http_loader::{expect_devtools_http_request, expect_devtools_http_response}; use hyper::{Request as HyperRequest, Response as HyperResponse}; use hyper::body::Body; use mime::{self, Mime}; diff --git a/components/net/tests/filemanager_thread.rs b/components/net/tests/filemanager_thread.rs index 2320fa41a2f..35634cad815 100644 --- a/components/net/tests/filemanager_thread.rs +++ b/components/net/tests/filemanager_thread.rs @@ -2,7 +2,7 @@ * 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 create_embedder_proxy; +use crate::create_embedder_proxy; use embedder_traits::FilterPattern; use ipc_channel::ipc; use net::filemanager_thread::FileManager; diff --git a/components/net/tests/http_loader.rs b/components/net/tests/http_loader.rs index c0bdc57b357..25ed6f0e094 100644 --- a/components/net/tests/http_loader.rs +++ b/components/net/tests/http_loader.rs @@ -2,12 +2,12 @@ * 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 cookie_rs::Cookie as CookiePair; +use crate::cookie_rs::Cookie as CookiePair; use devtools_traits::{ChromeToDevtoolsControlMsg, DevtoolsControlMsg, NetworkEvent}; use devtools_traits::HttpRequest as DevtoolsHttpRequest; use devtools_traits::HttpResponse as DevtoolsHttpResponse; -use fetch; -use fetch_with_context; +use crate::fetch; +use crate::fetch_with_context; use flate2::Compression; use flate2::write::{DeflateEncoder, GzEncoder}; use futures::{self, Future, Stream}; @@ -19,7 +19,7 @@ use http::header::{self, HeaderMap, HeaderValue}; use http::uri::Authority; use hyper::{Request as HyperRequest, Response as HyperResponse}; use hyper::body::Body; -use make_server; +use crate::make_server; use msg::constellation_msg::TEST_PIPELINE_ID; use net::cookie::Cookie; use net::cookie_storage::CookieStorage; @@ -28,7 +28,7 @@ use net::test::replace_host_table; use net_traits::{CookieSource, NetworkError}; use net_traits::request::{Request, RequestInit, RequestMode, CredentialsMode, Destination}; use net_traits::response::ResponseBody; -use new_fetch_context; +use crate::new_fetch_context; use servo_channel::{channel, Receiver}; use servo_url::{ServoUrl, ImmutableOrigin}; use std::collections::HashMap; @@ -128,7 +128,7 @@ fn test_check_default_headers_loaded_in_every_request() { HeaderValue::from_static("en-US, en; q=0.5"), ); - headers.typed_insert::<UserAgent>(::DEFAULT_USER_AGENT.parse().unwrap()); + headers.typed_insert::<UserAgent>(crate::DEFAULT_USER_AGENT.parse().unwrap()); *expected_headers.lock().unwrap() = Some(headers.clone()); @@ -275,7 +275,8 @@ fn test_request_and_response_data_with_network_messages() { header::ACCEPT_LANGUAGE, HeaderValue::from_static("en-US, en; q=0.5"), ); - headers.typed_insert::<UserAgent>(::DEFAULT_USER_AGENT.parse().unwrap()); + + headers.typed_insert::<UserAgent>(crate::DEFAULT_USER_AGENT.parse().unwrap()); let httprequest = DevtoolsHttpRequest { url: url, diff --git a/components/net/tests/resource_thread.rs b/components/net/tests/resource_thread.rs index d9f09270f21..b33e28942fa 100644 --- a/components/net/tests/resource_thread.rs +++ b/components/net/tests/resource_thread.rs @@ -2,7 +2,7 @@ * 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 create_embedder_proxy; +use crate::create_embedder_proxy; use ipc_channel::ipc; use net::resource_thread::new_core_resource_thread; use net::test::parse_hostsfile; |