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

4 files changed, 4 insertions, 7 deletions

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