Upgrade headers, headers-core, and hyper_serde.

23 files changed, 43 insertions, 55 deletions

diff --git a/components/devtools/Cargo.toml b/components/devtools/Cargo.toml
index 8ec3b58ae83..2dd80692394 100644
--- a/components/devtools/Cargo.toml
+++ b/components/devtools/Cargo.toml
@@ -13,11 +13,11 @@ path = "lib.rs"
 [dependencies]
 crossbeam-channel = "0.3"
 devtools_traits = {path = "../devtools_traits"}
-headers-core = "0.0.1"
-headers-ext = "0.0.3"
+headers-core = "0.1"
+headers = "0.2"
 http = "0.1"
 hyper = "0.12"
-hyper_serde = "0.9"
+hyper_serde = "0.11"
 ipc-channel = "0.11"
 log = "0.4"
 msg = {path = "../msg"}
diff --git a/components/devtools/actors/network_event.rs b/components/devtools/actors/network_event.rs
index 0de7d7544c1..8af38f52c0c 100644
--- a/components/devtools/actors/network_event.rs
+++ b/components/devtools/actors/network_event.rs
@@ -10,8 +10,7 @@ use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
 use crate::protocol::JsonPacketStream;
 use devtools_traits::HttpRequest as DevtoolsHttpRequest;
 use devtools_traits::HttpResponse as DevtoolsHttpResponse;
-use headers_core::HeaderMapExt;
-use headers_ext::{ContentType, Cookie};
+use headers::{ContentType, Cookie, HeaderMapExt};
 use http::{header, HeaderMap};
 use hyper::{Method, StatusCode};
 use serde_json::{Map, Value};
diff --git a/components/malloc_size_of/Cargo.toml b/components/malloc_size_of/Cargo.toml
index bd351649b5b..271461ad9c5 100644
--- a/components/malloc_size_of/Cargo.toml
+++ b/components/malloc_size_of/Cargo.toml
@@ -30,7 +30,7 @@ cssparser = "0.25"
 euclid = "0.19"
 hashglobe = { path = "../hashglobe" }
 hyper = { version = "0.12", optional = true }
-hyper_serde = { version = "0.9", optional = true }
+hyper_serde = { version = "0.11", optional = true }
 keyboard-types = {version = "0.4.3", optional = true}
 selectors = { path = "../selectors" }
 serde = { version = "1.0.27", optional = true }
diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml
index 560aa612203..e979db00765 100644
--- a/components/net/Cargo.toml
+++ b/components/net/Cargo.toml
@@ -23,11 +23,11 @@ devtools_traits = {path = "../devtools_traits"}
 embedder_traits = { path = "../embedder_traits" }
 flate2 = "1"
 futures = "0.1"
-headers-core = "0.0.1"
-headers-ext = "0.0.3"
+headers-core = "0.1"
+headers = "0.2"
 http = "0.1"
 hyper = "0.12"
-hyper_serde = "0.9"
+hyper_serde = "0.11"
 hyper-openssl = "0.7"
 immeta = "0.4"
 ipc-channel = "0.11"
diff --git a/components/net/fetch/methods.rs b/components/net/fetch/methods.rs
index 4022ca6b9bb..bb7b6595b76 100644
--- a/components/net/fetch/methods.rs
+++ b/components/net/fetch/methods.rs
@@ -10,8 +10,7 @@ use crate::http_loader::{set_default_accept, set_default_accept_language};
 use crate::subresource_integrity::is_response_integrity_valid;
 use crossbeam_channel::{unbounded, Receiver, Sender};
 use devtools_traits::DevtoolsControlMsg;
-use headers_core::HeaderMapExt;
-use headers_ext::{AccessControlExposeHeaders, ContentType, Range};
+use headers::{AccessControlExposeHeaders, ContentType, HeaderMapExt, Range};
 use http::header::{self, HeaderMap, HeaderName, HeaderValue};
 use hyper::Method;
 use hyper::StatusCode;
diff --git a/components/net/filemanager_thread.rs b/components/net/filemanager_thread.rs
index bce75e6a2d6..4e0e37dae77 100644
--- a/components/net/filemanager_thread.rs
+++ b/components/net/filemanager_thread.rs
@@ -5,7 +5,7 @@
 use crate::fetch::methods::{CancellationListener, Data, RangeRequestBounds};
 use crossbeam_channel::Sender;
 use embedder_traits::{EmbedderMsg, EmbedderProxy, FilterPattern};
-use headers_ext::{ContentLength, ContentType, HeaderMap, HeaderMapExt};
+use headers::{ContentLength, ContentType, HeaderMap, HeaderMapExt};
 use http::header::{self, HeaderValue};
 use ipc_channel::ipc::{self, IpcSender};
 use mime::{self, Mime};
diff --git a/components/net/http_cache.rs b/components/net/http_cache.rs
index a228bd39004..7a8fb9aac2b 100644
--- a/components/net/http_cache.rs
+++ b/components/net/http_cache.rs
@@ -9,8 +9,9 @@
 
 use crate::fetch::methods::{Data, DoneChannel};
 use crossbeam_channel::{unbounded, Sender};
-use headers_core::HeaderMapExt;
-use headers_ext::{CacheControl, ContentRange, Expires, LastModified, Pragma, Range, Vary};
+use headers::{
+    CacheControl, ContentRange, Expires, HeaderMapExt, LastModified, Pragma, Range, Vary,
+};
 use http::header::HeaderValue;
 use http::{header, HeaderMap};
 use hyper::{Method, StatusCode};
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index 6574623232d..3f8723ce051 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -19,15 +19,15 @@ use devtools_traits::{
     ChromeToDevtoolsControlMsg, DevtoolsControlMsg, HttpRequest as DevtoolsHttpRequest,
 };
 use devtools_traits::{HttpResponse as DevtoolsHttpResponse, NetworkEvent};
-use headers_core::HeaderMapExt;
-use headers_ext::{AccessControlAllowCredentials, AccessControlAllowHeaders};
-use headers_ext::{
+use headers::authorization::Basic;
+use headers::{AccessControlAllowCredentials, AccessControlAllowHeaders, HeaderMapExt};
+use headers::{
     AccessControlAllowMethods, AccessControlRequestHeaders, AccessControlRequestMethod,
     Authorization,
 };
-use headers_ext::{AccessControlAllowOrigin, AccessControlMaxAge, Basic};
-use headers_ext::{CacheControl, ContentEncoding, ContentLength};
-use headers_ext::{
+use headers::{AccessControlAllowOrigin, AccessControlMaxAge};
+use headers::{CacheControl, ContentEncoding, ContentLength};
+use headers::{
     Host, IfModifiedSince, LastModified, Origin as HyperOrigin, Pragma, Referer, UserAgent,
 };
 use http::header::{self, HeaderName, HeaderValue};
diff --git a/components/net/tests/data_loader.rs b/components/net/tests/data_loader.rs
index 03f6bd11fa4..9d1943def74 100644
--- a/components/net/tests/data_loader.rs
+++ b/components/net/tests/data_loader.rs
@@ -3,8 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use crate::fetch;
-use headers_core::HeaderMapExt;
-use headers_ext::ContentType;
+use headers::{ContentType, HeaderMapExt};
 use hyper_serde::Serde;
 use mime::{self, Mime};
 use net_traits::request::{Origin, Request};
diff --git a/components/net/tests/fetch.rs b/components/net/tests/fetch.rs
index 147e1167086..b05635ee3b9 100644
--- a/components/net/tests/fetch.rs
+++ b/components/net/tests/fetch.rs
@@ -12,12 +12,9 @@ use crate::{
 use crossbeam_channel::{unbounded, Sender};
 use devtools_traits::HttpRequest as DevtoolsHttpRequest;
 use devtools_traits::HttpResponse as DevtoolsHttpResponse;
-use headers_core::HeaderMapExt;
-use headers_ext::{
-    AccessControlAllowCredentials, AccessControlAllowHeaders, AccessControlAllowOrigin,
-};
-use headers_ext::{AccessControlAllowMethods, AccessControlMaxAge};
-use headers_ext::{
+use headers::{AccessControlAllowCredentials, AccessControlAllowHeaders, AccessControlAllowOrigin};
+use headers::{AccessControlAllowMethods, AccessControlMaxAge, HeaderMapExt};
+use headers::{
     CacheControl, ContentLength, ContentType, Expires, Host, LastModified, Pragma, UserAgent,
 };
 use http::header::{self, HeaderMap, HeaderName, HeaderValue};
diff --git a/components/net/tests/http_loader.rs b/components/net/tests/http_loader.rs
index a28c07fd867..de01076c595 100644
--- a/components/net/tests/http_loader.rs
+++ b/components/net/tests/http_loader.rs
@@ -14,11 +14,11 @@ use devtools_traits::{ChromeToDevtoolsControlMsg, DevtoolsControlMsg, NetworkEve
 use flate2::write::{DeflateEncoder, GzEncoder};
 use flate2::Compression;
 use futures::{self, Future, Stream};
-use headers_core::HeaderMapExt;
-use headers_ext::{
-    AccessControlAllowOrigin, Authorization, Basic, ContentLength, Date, Host, Origin,
+use headers::authorization::Basic;
+use headers::{
+    AccessControlAllowOrigin, Authorization, ContentLength, Date, HeaderMapExt, Host, Origin,
+    StrictTransportSecurity, UserAgent,
 };
-use headers_ext::{StrictTransportSecurity, UserAgent};
 use http::header::{self, HeaderMap, HeaderValue};
 use http::uri::Authority;
 use http::{Method, StatusCode};
diff --git a/components/net/websocket_loader.rs b/components/net/websocket_loader.rs
index 67e6e256274..451ec6930e6 100644
--- a/components/net/websocket_loader.rs
+++ b/components/net/websocket_loader.rs
@@ -8,7 +8,7 @@ use crate::fetch::methods::should_be_blocked_due_to_bad_port;
 use crate::hosts::replace_host;
 use crate::http_loader::HttpState;
 use embedder_traits::resources::{self, Resource};
-use headers_ext::Host;
+use headers::Host;
 use http::header::{self, HeaderMap, HeaderName, HeaderValue};
 use http::uri::Authority;
 use ipc_channel::ipc::{IpcReceiver, IpcSender};
diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml
index 5455a56badf..56aacf38197 100644
--- a/components/net_traits/Cargo.toml
+++ b/components/net_traits/Cargo.toml
@@ -15,11 +15,11 @@ doctest = false
 [dependencies]
 cookie = "0.11"
 embedder_traits = { path = "../embedder_traits" }
-headers-core = "0.0.1"
-headers-ext = "0.0.3"
+headers-core = "0.1"
+headers = "0.2"
 http = "0.1"
 hyper = "0.12"
-hyper_serde = "0.9"
+hyper_serde = "0.11"
 piston_image = {package = "image", version = "0.21"}
 ipc-channel = "0.11"
 lazy_static = "1"
diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs
index 8bbd72bdbb5..c2cba5a0356 100644
--- a/components/net_traits/lib.rs
+++ b/components/net_traits/lib.rs
@@ -22,8 +22,7 @@ use crate::request::{Request, RequestBuilder};
 use crate::response::{HttpsState, Response, ResponseInit};
 use crate::storage_thread::StorageThreadMsg;
 use cookie::Cookie;
-use headers_core::HeaderMapExt;
-use headers_ext::{ContentType, ReferrerPolicy as ReferrerPolicyHeader};
+use headers::{ContentType, HeaderMapExt, ReferrerPolicy as ReferrerPolicyHeader};
 use http::{Error as HttpError, HeaderMap};
 use hyper::Error as HyperError;
 use hyper::StatusCode;
diff --git a/components/net_traits/response.rs b/components/net_traits/response.rs
index 2656b5187f5..f8959163834 100644
--- a/components/net_traits/response.rs
+++ b/components/net_traits/response.rs
@@ -6,8 +6,7 @@
 //! resulting from a [fetch operation](https://fetch.spec.whatwg.org/#concept-fetch)
 use crate::{FetchMetadata, FilteredMetadata, Metadata, NetworkError, ReferrerPolicy};
 use crate::{ResourceFetchTiming, ResourceTimingType};
-use headers_core::HeaderMapExt;
-use headers_ext::{AccessControlExposeHeaders, ContentType};
+use headers::{AccessControlExposeHeaders, ContentType, HeaderMapExt};
 use http::{HeaderMap, StatusCode};
 use hyper_serde::Serde;
 use servo_arc::Arc;
diff --git a/components/rand/Cargo.toml b/components/rand/Cargo.toml
index f76d3b17bc3..8550b6763cd 100644
--- a/components/rand/Cargo.toml
+++ b/components/rand/Cargo.toml
@@ -13,5 +13,5 @@ path = "lib.rs"
 [dependencies]
 lazy_static = "1"
 log = "0.4"
-rand = "0.6"
+rand = "0.4"
 uuid = "0.7"
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index 28b508f5b60..0639ed72013 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -54,12 +54,11 @@ enum-iterator = "0.2.0"
 euclid = "0.19.7"
 fnv = "1.0"
 gleam = "0.6"
-headers-core = "0.0.1"
-headers-ext = "0.0.3"
+headers = "0.2"
 html5ever = "0.23"
 http = "0.1"
 hyper = "0.12"
-hyper_serde = "0.9"
+hyper_serde = "0.11"
 image = "0.21"
 indexmap = "1.0.2"
 ipc-channel = "0.11"
diff --git a/components/script/dom/eventsource.rs b/components/script/dom/eventsource.rs
index cad3e268a8c..8223d444d3a 100644
--- a/components/script/dom/eventsource.rs
+++ b/components/script/dom/eventsource.rs
@@ -23,7 +23,7 @@ use crate::task_source::{TaskSource, TaskSourceName};
 use crate::timers::OneshotTimerCallback;
 use dom_struct::dom_struct;
 use euclid::Length;
-use headers_ext::ContentType;
+use headers::ContentType;
 use http::header::{self, HeaderName, HeaderValue};
 use ipc_channel::ipc;
 use ipc_channel::router::ROUTER;
diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs
index 9e988515ac0..006d2f5d20c 100755
--- a/components/script/dom/htmlformelement.rs
+++ b/components/script/dom/htmlformelement.rs
@@ -50,8 +50,7 @@ use crate::script_thread::MainThreadScriptMsg;
 use crate::task_source::TaskSource;
 use dom_struct::dom_struct;
 use encoding_rs::{Encoding, UTF_8};
-use headers_core::HeaderMapExt;
-use headers_ext::ContentType;
+use headers::{ContentType, HeaderMapExt};
 use html5ever::{LocalName, Prefix};
 use hyper::Method;
 use mime::{self, Mime};
diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs
index 364870688b6..f39166657c5 100644
--- a/components/script/dom/htmlmediaelement.rs
+++ b/components/script/dom/htmlmediaelement.rs
@@ -59,8 +59,7 @@ use crate::network_listener::{self, NetworkListener, PreInvoke, ResourceTimingLi
 use crate::script_thread::ScriptThread;
 use crate::task_source::TaskSource;
 use dom_struct::dom_struct;
-use headers_core::HeaderMapExt;
-use headers_ext::{ContentLength, ContentRange};
+use headers::{ContentLength, ContentRange, HeaderMapExt};
 use html5ever::{LocalName, Prefix};
 use http::header::{self, HeaderMap, HeaderValue};
 use ipc_channel::ipc;
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs
index 83f9502f885..583a179e43a 100644
--- a/components/script/dom/xmlhttprequest.rs
+++ b/components/script/dom/xmlhttprequest.rs
@@ -44,8 +44,7 @@ use crate::timers::{OneshotTimerCallback, OneshotTimerHandle};
 use dom_struct::dom_struct;
 use encoding_rs::{Encoding, UTF_8};
 use euclid::Length;
-use headers_core::HeaderMapExt;
-use headers_ext::{ContentLength, ContentType};
+use headers::{ContentLength, ContentType, HeaderMapExt};
 use html5ever::serialize;
 use html5ever::serialize::SerializeOpts;
 use http::header::{self, HeaderMap, HeaderName, HeaderValue};
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index d05e38569fc..90012015b1c 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -92,9 +92,8 @@ use devtools_traits::{DevtoolScriptControlMsg, DevtoolsPageInfo};
 use devtools_traits::{ScriptToDevtoolsControlMsg, WorkerId};
 use embedder_traits::EmbedderMsg;
 use euclid::{Point2D, Rect, Vector2D};
-use headers_core::HeaderMapExt;
-use headers_ext::LastModified;
-use headers_ext::ReferrerPolicy as ReferrerPolicyHeader;
+use headers::ReferrerPolicy as ReferrerPolicyHeader;
+use headers::{HeaderMapExt, LastModified};
 use hyper_serde::Serde;
 use ipc_channel::ipc::{self, IpcSender};
 use ipc_channel::router::ROUTER;
diff --git a/components/script_traits/Cargo.toml b/components/script_traits/Cargo.toml
index 40628cce234..5316d261881 100644
--- a/components/script_traits/Cargo.toml
+++ b/components/script_traits/Cargo.toml
@@ -21,7 +21,7 @@ euclid = "0.19"
 gfx_traits = {path = "../gfx_traits"}
 http = "0.1"
 hyper = "0.12"
-hyper_serde = "0.9"
+hyper_serde = "0.11"
 ipc-channel = "0.11"
 keyboard-types = "0.4.3"
 libc = "0.2"