aboutsummaryrefslogtreecommitdiffstats
path: root/components/net
diff options
context:
space:
mode:
Diffstat (limited to 'components/net')
-rw-r--r--components/net/Cargo.toml4
-rw-r--r--components/net/connector.rs2
-rw-r--r--components/net/cookie.rs1
-rw-r--r--components/net/cookie_storage.rs5
-rw-r--r--components/net/fetch/methods.rs2
-rw-r--r--components/net/hsts.rs2
-rw-r--r--components/net/http_cache.rs1
-rw-r--r--components/net/http_loader.rs5
-rw-r--r--components/net/image_cache.rs2
-rw-r--r--components/net/lib.rs35
-rw-r--r--components/net/mime_classifier.rs2
-rw-r--r--components/net/resource_thread.rs4
-rw-r--r--components/net/tests/cookie.rs1
-rw-r--r--components/net/tests/hsts.rs1
-rw-r--r--components/net/tests/http_cache.rs1
-rw-r--r--components/net/tests/http_loader.rs2
-rw-r--r--components/net/tests/main.rs26
17 files changed, 11 insertions, 85 deletions
diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml
index 798c85da1bd..ce05657d371 100644
--- a/components/net/Cargo.toml
+++ b/components/net/Cargo.toml
@@ -1,3 +1,5 @@
+cargo-features = ["rename-dependency"]
+
[package]
name = "net"
version = "0.0.1"
@@ -17,7 +19,7 @@ doctest = false
base64 = "0.9"
brotli = "2.5"
bytes = "0.4"
-cookie = "0.11"
+cookie_rs = {package = "cookie", version = "0.11"}
devtools_traits = {path = "../devtools_traits"}
embedder_traits = { path = "../embedder_traits" }
flate2 = "1"
diff --git a/components/net/connector.rs b/components/net/connector.rs
index 38693e70e24..de9f9b2e087 100644
--- a/components/net/connector.rs
+++ b/components/net/connector.rs
@@ -161,7 +161,7 @@ pub fn create_http_client<E>(
executor: E,
) -> Client<Connector, WrappedBody>
where
- E: Executor<Box<Future<Error = (), Item = ()> + Send + 'static>> + Sync + Send + 'static,
+ E: Executor<Box<dyn Future<Error = (), Item = ()> + Send + 'static>> + Sync + Send + 'static,
{
let connector =
HttpsConnector::with_connector(HttpConnector::new(), ssl_connector_builder).unwrap();
diff --git a/components/net/cookie.rs b/components/net/cookie.rs
index 5b9089cc1d3..adfd5e6147b 100644
--- a/components/net/cookie.rs
+++ b/components/net/cookie.rs
@@ -5,7 +5,6 @@
//! Implementation of cookie creation and matching as specified by
//! http://tools.ietf.org/html/rfc6265
-use crate::cookie_rs;
use hyper_serde::{self, Serde};
use net_traits::pub_domains::is_pub_domain;
use net_traits::CookieSource;
diff --git a/components/net/cookie_storage.rs b/components/net/cookie_storage.rs
index 7eefb164439..a0b7484f0c5 100644
--- a/components/net/cookie_storage.rs
+++ b/components/net/cookie_storage.rs
@@ -6,15 +6,12 @@
//! http://tools.ietf.org/html/rfc6265
use crate::cookie::Cookie;
-use crate::cookie_rs;
use net_traits::pub_domains::reg_suffix;
use net_traits::CookieSource;
use servo_url::ServoUrl;
use std::cmp::Ordering;
use std::collections::HashMap;
-use time::Tm;
-
-extern crate time;
+use time::{self, Tm};
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct CookieStorage {
diff --git a/components/net/fetch/methods.rs b/components/net/fetch/methods.rs
index 0ad92f527ef..499070c04d2 100644
--- a/components/net/fetch/methods.rs
+++ b/components/net/fetch/methods.rs
@@ -41,7 +41,7 @@ lazy_static! {
const FILE_CHUNK_SIZE: usize = 32768; //32 KB
-pub type Target<'a> = &'a mut (FetchTaskTarget + Send);
+pub type Target<'a> = &'a mut (dyn FetchTaskTarget + Send);
pub enum Data {
Payload(Vec<u8>),
diff --git a/components/net/hsts.rs b/components/net/hsts.rs
index 693869af0db..7b1329edbd5 100644
--- a/components/net/hsts.rs
+++ b/components/net/hsts.rs
@@ -5,11 +5,9 @@
use embedder_traits::resources::{self, Resource};
use net_traits::pub_domains::reg_suffix;
use net_traits::IncludeSubdomains;
-use serde_json;
use servo_url::ServoUrl;
use std::collections::HashMap;
use std::net::{Ipv4Addr, Ipv6Addr};
-use time;
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct HstsEntry {
diff --git a/components/net/http_cache.rs b/components/net/http_cache.rs
index ab7f99f1e0e..d467a38baf3 100644
--- a/components/net/http_cache.rs
+++ b/components/net/http_cache.rs
@@ -29,7 +29,6 @@ use std::ops::Bound;
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Mutex;
use std::time::SystemTime;
-use time;
use time::{Duration, Timespec, Tm};
/// The key used to differentiate requests in the cache.
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index 8898fdf1924..ab1de55a1c9 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -36,8 +36,6 @@ use http::uri::Authority;
use http::{HeaderMap, Request as HyperRequest};
use hyper::{Body, Client, Method, Response as HyperResponse, StatusCode};
use hyper_serde::Serde;
-use log;
-use mime;
use msg::constellation_msg::{HistoryStateId, PipelineId};
use net_traits::quality::{quality_to_value, Quality, QualityItem};
use net_traits::request::{CacheMode, CredentialsMode, Destination, Origin};
@@ -61,7 +59,6 @@ use std::time::{Duration, SystemTime};
use time::{self, Tm};
use tokio::prelude::{future, Future, Stream};
use tokio::runtime::Runtime;
-use uuid;
lazy_static! {
pub static ref HANDLE: Mutex<Runtime> = { Mutex::new(Runtime::new().unwrap()) };
@@ -380,7 +377,7 @@ fn obtain_response(
request_id: Option<&str>,
is_xhr: bool,
) -> Box<
- Future<
+ dyn Future<
Item = (
HyperResponse<WrappedBody>,
Option<ChromeToDevtoolsControlMsg>,
diff --git a/components/net/image_cache.rs b/components/net/image_cache.rs
index 8dc194a10d1..cf95d3fc1fd 100644
--- a/components/net/image_cache.rs
+++ b/components/net/image_cache.rs
@@ -9,7 +9,6 @@ use net_traits::image_cache::{CanRequestImages, ImageCache, ImageResponder};
use net_traits::image_cache::{ImageOrMetadataAvailable, ImageResponse, ImageState};
use net_traits::image_cache::{PendingImageId, UsePlaceholder};
use net_traits::{FetchMetadata, FetchResponseMsg, NetworkError};
-use pixels;
use servo_url::ServoUrl;
use std::collections::hash_map::Entry::{Occupied, Vacant};
use std::collections::HashMap;
@@ -17,7 +16,6 @@ use std::io;
use std::mem;
use std::sync::{Arc, Mutex};
use std::thread;
-use webrender_api;
///
/// TODO(gw): Remaining work on image cache:
diff --git a/components/net/lib.rs b/components/net/lib.rs
index e4373edee33..7f36629d306 100644
--- a/components/net/lib.rs
+++ b/components/net/lib.rs
@@ -4,53 +4,18 @@
#![deny(unsafe_code)]
-extern crate base64;
-extern crate brotli;
-extern crate bytes;
-extern crate cookie as cookie_rs;
-extern crate devtools_traits;
-extern crate embedder_traits;
-extern crate flate2;
-extern crate headers_core;
-extern crate headers_ext;
-extern crate http;
-extern crate hyper;
-extern crate hyper_openssl;
-extern crate hyper_serde;
-extern crate immeta;
-extern crate ipc_channel;
#[macro_use]
extern crate lazy_static;
#[macro_use]
extern crate log;
-extern crate malloc_size_of;
#[macro_use]
extern crate malloc_size_of_derive;
#[macro_use]
-#[no_link]
extern crate matches;
-extern crate mime;
-extern crate mime_guess;
-extern crate msg;
-extern crate net_traits;
-extern crate openssl;
-extern crate pixels;
#[macro_use]
extern crate profile_traits;
#[macro_use]
extern crate serde;
-extern crate serde_json;
-extern crate servo_allocator;
-extern crate servo_arc;
-extern crate servo_channel;
-extern crate servo_config;
-extern crate servo_url;
-extern crate time;
-extern crate tokio;
-extern crate url;
-extern crate uuid;
-extern crate webrender_api;
-extern crate ws;
mod blob_loader;
pub mod connector;
diff --git a/components/net/mime_classifier.rs b/components/net/mime_classifier.rs
index e6716789033..432cb36dee5 100644
--- a/components/net/mime_classifier.rs
+++ b/components/net/mime_classifier.rs
@@ -454,7 +454,7 @@ impl MIMEChecker for BinaryOrPlaintextClassifier {
}
}
struct GroupedClassifier {
- byte_matchers: Vec<Box<MIMEChecker + Send + Sync>>,
+ byte_matchers: Vec<Box<dyn MIMEChecker + Send + Sync>>,
}
impl GroupedClassifier {
fn image_classifer() -> GroupedClassifier {
diff --git a/components/net/resource_thread.rs b/components/net/resource_thread.rs
index 9793fcb862d..0ae1f548525 100644
--- a/components/net/resource_thread.rs
+++ b/components/net/resource_thread.rs
@@ -3,9 +3,9 @@
* 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 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::{fetch, CancellationListener, FetchContext};
@@ -32,8 +32,6 @@ use profile_traits::mem::ProfilerChan as MemProfilerChan;
use profile_traits::mem::{Report, ReportKind, ReportsChan};
use profile_traits::time::ProfilerChan;
use serde::{Deserialize, Serialize};
-use serde_json;
-use servo_allocator;
use servo_channel::Sender;
use servo_config::opts;
use servo_url::ServoUrl;
diff --git a/components/net/tests/cookie.rs b/components/net/tests/cookie.rs
index 9cf9aa3ac14..7190807ed78 100644
--- a/components/net/tests/cookie.rs
+++ b/components/net/tests/cookie.rs
@@ -2,7 +2,6 @@
* 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 crate::cookie_rs;
use net::cookie::Cookie;
use net::cookie_storage::CookieStorage;
use net_traits::CookieSource;
diff --git a/components/net/tests/hsts.rs b/components/net/tests/hsts.rs
index 1903aec1af4..9389c586110 100644
--- a/components/net/tests/hsts.rs
+++ b/components/net/tests/hsts.rs
@@ -5,7 +5,6 @@
use net::hsts::{HstsEntry, HstsList};
use net_traits::IncludeSubdomains;
use std::collections::HashMap;
-use time;
#[test]
fn test_hsts_entry_is_not_expired_when_it_has_no_timestamp() {
diff --git a/components/net/tests/http_cache.rs b/components/net/tests/http_cache.rs
index c63ba8131c7..f57d1b2df0a 100644
--- a/components/net/tests/http_cache.rs
+++ b/components/net/tests/http_cache.rs
@@ -11,7 +11,6 @@ use net_traits::request::{Destination, Request, RequestInit};
use net_traits::response::{Response, ResponseBody};
use servo_url::ServoUrl;
use std::sync::mpsc::channel;
-use time;
#[test]
diff --git a/components/net/tests/http_loader.rs b/components/net/tests/http_loader.rs
index bc5112f1f58..ba8f2e1a3fd 100644
--- a/components/net/tests/http_loader.rs
+++ b/components/net/tests/http_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 crate::cookie_rs::Cookie as CookiePair;
+use cookie_rs::Cookie as CookiePair;
use crate::fetch;
use crate::fetch_with_context;
use crate::make_server;
diff --git a/components/net/tests/main.rs b/components/net/tests/main.rs
index aa7a6aa9cf6..48063adad81 100644
--- a/components/net/tests/main.rs
+++ b/components/net/tests/main.rs
@@ -4,32 +4,8 @@
#![cfg(test)]
-extern crate cookie as cookie_rs;
-extern crate devtools_traits;
-extern crate embedder_traits;
-extern crate flate2;
-extern crate futures;
-extern crate headers_core;
-extern crate headers_ext;
-extern crate http;
-extern crate hyper;
-extern crate hyper_serde;
-extern crate ipc_channel;
#[macro_use]
extern crate lazy_static;
-extern crate mime;
-extern crate msg;
-extern crate net;
-extern crate net_traits;
-extern crate openssl;
-extern crate profile_traits;
-extern crate servo_channel;
-extern crate servo_config;
-extern crate servo_url;
-extern crate time;
-extern crate tokio;
-extern crate tokio_openssl;
-extern crate url;
mod cookie;
mod cookie_http_state;
@@ -90,7 +66,7 @@ fn create_embedder_proxy() -> EmbedderProxy {
}
impl EventLoopWaker for DummyEventLoopWaker {
fn wake(&self) {}
- fn clone(&self) -> Box<EventLoopWaker + Send> {
+ fn clone(&self) -> Box<dyn EventLoopWaker + Send> {
Box::new(DummyEventLoopWaker {})
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-17 16:45:19 +0000