From 027361115f673787e26f5b740589f657766c512b Mon Sep 17 00:00:00 2001
From: Jose Quintana <joseluisquintana20@gmail.com>
Date: Fri, 15 Oct 2021 09:49:01 +0200
Subject: [PATCH] refactor: prefer `futures-util` over `futures` dependency

it basically removes `futures` dependency since `futures-util` is
already part of other ones like `hyper` or `h2`.
---
 Cargo.lock          | 39 +++++++++------------------------------
 Cargo.toml          |  4 ++--
 src/compression.rs  |  2 +-
 src/static_files.rs |  4 ++--
 src/tls.rs          |  2 +-
 5 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 768b0d0..7c5f007 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -215,27 +215,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
 
 [[package]]
-name = "futures"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
 name = "futures-channel"
 version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888"
 dependencies = [
  "futures-core",
- "futures-sink",
 ]
 
 [[package]]
@@ -245,12 +230,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d"
 
 [[package]]
-name = "futures-io"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377"
-
-[[package]]
 name = "futures-sink"
 version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -703,9 +682,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.29"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d"
+checksum = "edc3358ebc67bc8b7fa0c007f945b0b18226f78437d61bec735a9eb96b61ee70"
 dependencies = [
  "unicode-xid",
 ]
@@ -819,18 +798,18 @@ dependencies = [
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "740223c51853f3145fe7c90360d2d4232f2b62e3449489c207eccde818979982"
+checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
 dependencies = [
  "lazy_static",
 ]
 
 [[package]]
 name = "slab"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590"
+checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"
 
 [[package]]
 name = "smallvec"
@@ -862,7 +841,7 @@ dependencies = [
  "async-compression",
  "bytes",
  "ctrlc",
- "futures",
+ "futures-util",
  "headers",
  "http",
  "humansize",
@@ -965,9 +944,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "154794c8f499c2619acd19e839294703e9e32e7630ef5f46ea80d4ef0fbee5eb"
+checksum = "b2dd85aeaba7b68df939bd357c6afb36c87951be9e80bf9c859f2fc3e9fca0fd"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index 5a3a939..9ef739e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,11 +27,11 @@ path = "src/bin/server.rs"
 [dependencies]
 hyper = { version = "0.14", features = ["stream", "http1", "http2", "tcp", "server"] }
 tokio = { version = "1", features = ["rt-multi-thread", "macros", "fs", "io-util"], default-features = false }
-futures = { version = "0.3", default-features = false }
+tokio-util = { version = "0.6", features = ["io"] }
 async-compression = { version = "0.3", features = ["brotli", "deflate", "gzip", "tokio"] }
 headers = { git = "https://github.com/joseluisq/hyper-headers.git", branch = "headers_encoding" }
 http = "0.2"
-tokio-util = { version = "0.6", features = ["io"] }
+futures-util = { version = "0.3", default-features = false, features = ["sink"] }
 anyhow = "1.0"
 tracing = "0.1"
 tracing-subscriber = "0.2"
diff --git a/src/compression.rs b/src/compression.rs
index 140383e..b8e3e68 100644
--- a/src/compression.rs
+++ b/src/compression.rs
@@ -3,7 +3,7 @@
 
 use async_compression::tokio::bufread::{BrotliEncoder, DeflateEncoder, GzipEncoder};
 use bytes::Bytes;
-use futures::Stream;
+use futures_util::Stream;
 use headers::{AcceptEncoding, ContentCoding, ContentType, HeaderMap, HeaderMapExt};
 use hyper::{
     header::{HeaderValue, CONTENT_ENCODING, CONTENT_LENGTH},
diff --git a/src/static_files.rs b/src/static_files.rs
index f1f4b9e..17509d5 100644
--- a/src/static_files.rs
+++ b/src/static_files.rs
@@ -2,8 +2,8 @@
 // -> Most of the file is borrowed from https://github.com/seanmonstar/warp/blob/master/src/filters/fs.rs
 
 use bytes::{Bytes, BytesMut};
-use futures::future::Either;
-use futures::{future, ready, stream, FutureExt, Stream, StreamExt, TryFutureExt};
+use futures_util::future::Either;
+use futures_util::{future, ready, stream, FutureExt, Stream, StreamExt, TryFutureExt};
 use headers::{
     AcceptRanges, ContentLength, ContentRange, ContentType, HeaderMap, HeaderMapExt, HeaderValue,
     IfModifiedSince, IfRange, IfUnmodifiedSince, LastModified, Range,
diff --git a/src/tls.rs b/src/tls.rs
index 997120a..e03a850 100644
--- a/src/tls.rs
+++ b/src/tls.rs
@@ -11,7 +11,7 @@ use std::sync::Arc;
 use std::task::{Context, Poll};
 use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 
-use futures::ready;
+use futures_util::ready;
 use hyper::server::accept::Accept;
 use hyper::server::conn::{AddrIncoming, AddrStream};
 
--
libgit2 1.7.2