diff options
author | Ms2ger <Ms2ger@gmail.com> | 2016-11-04 11:46:35 +0100 |
---|---|---|
committer | Ms2ger <Ms2ger@gmail.com> | 2016-11-06 12:18:39 +0100 |
commit | a888f075a1d79bd71a6cce550890483519c5dc8c (patch) | |
tree | eca4083ae99bdaa72c418cd8ba70af0b1e6da844 | |
parent | 697275dea3e4c1686301c5516f5a10faae5866f2 (diff) | |
download | servo-a888f075a1d79bd71a6cce550890483519c5dc8c.tar.gz servo-a888f075a1d79bd71a6cce550890483519c5dc8c.zip |
Privatize the http_loader module.
-rw-r--r-- | components/net/lib.rs | 8 | ||||
-rw-r--r-- | tests/unit/net/http_loader.rs | 4 | ||||
-rw-r--r-- | tests/unit/net/lib.rs | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/components/net/lib.rs b/components/net/lib.rs index 6f3b4bd3e29..1ad29b77b3d 100644 --- a/components/net/lib.rs +++ b/components/net/lib.rs @@ -58,7 +58,7 @@ mod data_loader; mod file_loader; pub mod filemanager_thread; pub mod hsts; -pub mod http_loader; +mod http_loader; pub mod image_cache_thread; pub mod mime_classifier; pub mod resource_thread; @@ -70,3 +70,9 @@ pub mod fetch { pub mod cors_cache; pub mod methods; } + +/// A module for re-exports of items used in unit tests. +pub mod test { + pub use http_loader::{HttpRequest, HttpRequestFactory, HttpResponse, HttpState}; + pub use http_loader::{LoadError, LoadErrorType, UIProvider, load}; +} diff --git a/tests/unit/net/http_loader.rs b/tests/unit/net/http_loader.rs index d247e9283c7..e7f15eba36e 100644 --- a/tests/unit/net/http_loader.rs +++ b/tests/unit/net/http_loader.rs @@ -22,9 +22,9 @@ use msg::constellation_msg::{PipelineId, TEST_PIPELINE_ID}; use net::cookie::Cookie; use net::cookie_storage::CookieStorage; use net::hsts::HstsEntry; -use net::http_loader::{HttpRequest, HttpRequestFactory, HttpState, LoadError, UIProvider, load}; -use net::http_loader::{HttpResponse, LoadErrorType}; use net::resource_thread::{AuthCacheEntry, CancellationListener}; +use net::test::{HttpRequest, HttpRequestFactory, HttpState, LoadError, UIProvider, load}; +use net::test::{HttpResponse, LoadErrorType}; use net_traits::{CookieSource, IncludeSubdomains, LoadContext, LoadData}; use net_traits::{CustomResponse, LoadOrigin, Metadata, ReferrerPolicy}; use std::borrow::Cow; diff --git a/tests/unit/net/lib.rs b/tests/unit/net/lib.rs index 14319d51f15..4f1f91f923d 100644 --- a/tests/unit/net/lib.rs +++ b/tests/unit/net/lib.rs @@ -37,7 +37,7 @@ use devtools_traits::DevtoolsControlMsg; use filemanager_thread::{TestProvider, TEST_PROVIDER}; use net::fetch::methods::{FetchContext, fetch}; use net::filemanager_thread::FileManager; -use net::http_loader::HttpState; +use net::test::HttpState; use net_traits::FetchTaskTarget; use net_traits::request::Request; use net_traits::response::Response; |