Auto merge of #2268 - JohnTitor:futures, r=jtgeibel

Reduce `futures` dependencies size

Use `futures-channel` and `futures-util` to reduce dependencies size. When we introduce new conduit-hyper version, we should be able to remove some deps.

r? @jtgeibel

Author: bors

Cargo.lock

@@ -77,7 +77,8 @@ conduit-git-http-backend = "0.8"
 civet = "0.9"
 conduit-hyper = "0.2.0"
 
-futures = "0.3"
+futures-util = "0.3"
+futures-channel = { version = "0.3.1", default-features = false }
 tokio = { version = "0.2", default-features = false, features = ["net", "signal", "io-std"]}
 hyper = "0.13"
 ctrlc = { version = "3.0", features = ["termination"] }

Cargo.toml

@@ -10,7 +10,7 @@ use std::{
 
 use civet::Server as CivetServer;
 use conduit_hyper::Service;
-use futures::prelude::*;
+use futures_util::future::FutureExt;
 use reqwest::blocking::Client;
 
 enum Server {
@@ -84,7 +84,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
         let server = server.with_graceful_shutdown(async move {
             // Wait for either signal
-            futures::select! {
+            futures_util::select! {
                 _ = sig_int.recv().fuse() => (),
                 _ = sig_term.recv().fuse() => (),
             };

src/bin/server.rs

@@ -4,6 +4,7 @@ use std::{
     borrow::Cow,
     collections::HashSet,
     fs::{self, File},
+    future::Future,
     io::{self, prelude::*},
     path::PathBuf,
     pin::Pin,
@@ -13,7 +14,8 @@ use std::{
     thread,
 };
 
-use futures::{channel::oneshot, future, prelude::*};
+use futures_channel::oneshot;
+use futures_util::future;
 use hyper::{body::to_bytes, Body, Error, Request, Response, Server, StatusCode, Uri};
 use tokio::{
     net::{TcpListener, TcpStream},