Auto merge of #23560 - jdm:rand-upgrades, r=asajeffrey

Upgrade various old versions of rand

Old versions of rand rely on Windows APIs that are forbidden in UWP applications. These changes upgrade various dependencies that transitively depend on them.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] There are tests for these changes
- [x] Fixes #22767.

<!-- 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/23560)
<!-- Reviewable:end -->

components/debugger/Cargo.toml

@@ -14,4 +14,4 @@ crate_type = ["rlib"]
 [dependencies]
 crossbeam-channel = "0.3"
 log = "0.4"
-ws = "0.7.3"
+ws = "0.8"

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"}

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};

components/hashglobe/Cargo.toml

@@ -13,4 +13,4 @@ readme = "README.md"
 libc = "0.2"
 
 [dev-dependencies]
-rand = "0.4"
+rand = "0.6"

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 }

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"
@@ -58,7 +58,7 @@ time = "0.1.17"
 url = "1.2"
 uuid = {version = "0.7", features = ["v4"]}
 webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
-ws = { version = "0.7", features = ["ssl"] }
+ws = { version = "0.8", features = ["ssl"] }
 
 [dev-dependencies]
 std_test_override = { path = "../std_test_override" }

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;

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};

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};

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};

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};

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};

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};

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};

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"

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;

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;

components/rand/lib.rs

@@ -29,7 +29,7 @@ use std::mem;
 use std::rc::Rc;
 use std::sync::Mutex;
 use std::u64;
-use uuid::Uuid;
+use uuid::{Builder, Uuid, Variant, Version};
 
 // Slightly annoying having to cast between sizes.
 
@@ -162,5 +162,8 @@ pub fn random<T: Rand>() -> T {
 pub fn random_uuid() -> Uuid {
     let mut bytes = [0; 16];
     thread_rng().fill_bytes(&mut bytes);
-    Uuid::from_random_bytes(bytes)
+    Builder::from_bytes(bytes)
+        .set_variant(Variant::RFC4122)
+        .set_version(Version::Random)
+        .build()
 }

components/script/Cargo.toml

@@ -24,8 +24,8 @@ js_backtrace = ["backtrace"]
 
 [build-dependencies]
 cmake = "0.1"
-phf_codegen = "0.7.18"
-phf_shared = "0.7.18"
+phf_codegen = "0.7"
+phf_shared = "0.7"
 serde_json = "1.0"
 
 [target.'cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))'.dependencies]
@@ -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"
@@ -80,7 +79,7 @@ msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
 num-traits = "0.2"
 parking_lot = "0.8"
-phf = "0.7.18"
+phf = "0.7"
 pixels = {path = "../pixels"}
 profile_traits = {path = "../profile_traits"}
 ref_filter_map = "1.0.1"

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;

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};

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;

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};

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;

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"

components/selectors/Cargo.toml

@@ -26,7 +26,7 @@ cssparser = "0.25"
 derive_more = "0.13"
 log = "0.4"
 fxhash = "0.2"
-phf = "0.7.18"
+phf = "0.7"
 precomputed-hash = "0.1"
 servo_arc = { version = "0.1", path = "../servo_arc" }
 smallvec = "0.6"
@@ -35,4 +35,4 @@ to_shmem = { path = "../to_shmem" }
 to_shmem_derive = { path = "../to_shmem_derive" }
 
 [build-dependencies]
-phf_codegen = "0.7.18"
+phf_codegen = "0.7"