Auto merge of #28662 - jdm:tungestenite-upgrade, r=jdm

Tungestenite upgrade

This updates our async-tungstenite/tungstenite dependencies to slightly newer versions that still rely on tokio 0.2 and should make #28661 easier.

5 files changed, 7 insertions, 9 deletions

diff --git a/components/gfx/platform/macos/font_context.rs b/components/gfx/platform/macos/font_context.rs
index f2e2cf04953..753cb97a572 100644
--- a/components/gfx/platform/macos/font_context.rs
+++ b/components/gfx/platform/macos/font_context.rs
@@ -6,13 +6,13 @@ use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
 
 #[derive(Clone, Debug)]
 pub struct FontContextHandle {
-    ctx: (),
+    _ctx: (),
 }
 
 impl FontContextHandle {
     // this is a placeholder until NSFontManager or whatever is bound in here.
     pub fn new() -> FontContextHandle {
-        FontContextHandle { ctx: () }
+        FontContextHandle { _ctx: () }
     }
 }
 
diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml
index dbdeffbbd97..9bca5e1435b 100644
--- a/components/net/Cargo.toml
+++ b/components/net/Cargo.toml
@@ -16,7 +16,7 @@ doctest = false
 
 [dependencies]
 async-recursion = "0.3.2"
-async-tungstenite = { version = "0.7.1", features = ["tokio-openssl"] }
+async-tungstenite = { version = "0.9", features = ["tokio-openssl"] }
 base64 = "0.10.1"
 brotli = "3"
 bytes = "0.4"
@@ -60,7 +60,7 @@ servo_config = { path = "../config" }
 servo_url = { path = "../url" }
 time = "0.1.41"
 tokio = "0.1"
-tokio2 = { version = "0.2", package = "tokio", features = ["sync", "macros", "rt-threaded"] }
+tokio2 = { version = "0.2", package = "tokio", features = ["sync", "macros", "rt-threaded", "tcp"] }
 tokio-compat = "0.1"
 tungstenite = "0.11"
 url = "2.0"
diff --git a/components/net/fetch/methods.rs b/components/net/fetch/methods.rs
index 2d9818a0770..a7d82cac318 100644
--- a/components/net/fetch/methods.rs
+++ b/components/net/fetch/methods.rs
@@ -12,8 +12,6 @@ use crate::subresource_integrity::is_response_integrity_valid;
 use content_security_policy as csp;
 use crossbeam_channel::Sender;
 use devtools_traits::DevtoolsControlMsg;
-use futures_util::compat::*;
-use futures_util::StreamExt;
 use headers::{AccessControlExposeHeaders, ContentType, HeaderMapExt, Range};
 use http::header::{self, HeaderMap, HeaderName};
 use hyper::Method;
diff --git a/components/net/filemanager_thread.rs b/components/net/filemanager_thread.rs
index d56bdd54668..a1e8ff40116 100644
--- a/components/net/filemanager_thread.rs
+++ b/components/net/filemanager_thread.rs
@@ -57,7 +57,7 @@ struct FileStoreEntry {
 struct FileMetaData {
     path: PathBuf,
     /// Modified time in UNIX Epoch format
-    modified: u64,
+    _modified: u64,
     size: u64,
 }
 
@@ -660,7 +660,7 @@ impl FileManagerStore {
 
         let file_impl = FileImpl::MetaDataOnly(FileMetaData {
             path: file_path.to_path_buf(),
-            modified: modified_epoch,
+            _modified: modified_epoch,
             size: file_size,
         });
 
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index 7950f711e48..cb0d43c255c 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -523,7 +523,7 @@ async fn obtain_response(
             .replace("}", "%7D");
 
         let request = if let Some(chunk_requester) = body {
-            let (mut sink, stream) = if source_is_null {
+            let (sink, stream) = if source_is_null {
                 // Step 4.2 of https://fetch.spec.whatwg.org/#concept-http-network-fetch
                 // TODO: this should not be set for HTTP/2(currently not supported?).
                 headers.insert(TRANSFER_ENCODING, HeaderValue::from_static("chunked"));