Move to reqwest 0.10

Cargo.toml

@@ -10,7 +10,7 @@ edition = "2018"
 serde_json = "1"
 openssl = "0.10"
 dotenv = "0.14"
-reqwest = "0.9"
+reqwest = { version = "0.10", features = ["json"] }
 regex = "1"
 lazy_static = "1"
 log = "0.4"
@@ -22,7 +22,7 @@ rust_team_data = { git = "https://github.com/rust-lang/team" }
 glob = "0.3.0"
 toml = "0.5.1"
 hyper = "0.12.32"
-futures-preview = { version = "=0.3.0-alpha.17", features = ["compat"] }
+futures = { version = "0.3", default-features = false, features = ["compat"] }
 uuid = { version = "0.8", features = ["v4"] }
 url = "2.1.0"
 once_cell = "1"

src/github.rs

@@ -1,15 +1,9 @@
 use anyhow::Context;
 
-use futures::{
-    compat::{Future01CompatExt, Stream01CompatExt},
-    stream::{FuturesUnordered, StreamExt},
-};
+use futures::stream::{FuturesUnordered, StreamExt};
 use once_cell::sync::OnceCell;
 use reqwest::header::{AUTHORIZATION, USER_AGENT};
-use reqwest::{
-    r#async::{Client, RequestBuilder, Response},
-    StatusCode,
-};
+use reqwest::{Client, RequestBuilder, Response, StatusCode};
 use std::fmt;
 
 #[derive(Debug, PartialEq, Eq, serde::Deserialize)]
@@ -24,18 +18,17 @@ impl GithubClient {
 
         let req_dbg = format!("{:?}", req);
 
-        let resp = self.client.execute(req).compat().await?;
+        let resp = self.client.execute(req).await?;
 
         resp.error_for_status_ref()?;
 
         Ok((resp, req_dbg))
     }
     async fn send_req(&self, req: RequestBuilder) -> anyhow::Result<Vec<u8>> {
-        let (resp, req_dbg) = self._send_req(req).await?;
+        let (mut resp, req_dbg) = self._send_req(req).await?;
 
         let mut body = Vec::new();
-        let mut stream = resp.into_body().compat();
-        while let Some(chunk) = stream.next().await {
+        while let Some(chunk) = resp.chunk().await.transpose() {
             let chunk = chunk
                 .context("reading stream failed")
                 .map_err(anyhow::Error::from)
@@ -50,9 +43,8 @@ impl GithubClient {
     where
         T: serde::de::DeserializeOwned,
     {
-        let (mut resp, req_dbg) = self._send_req(req).await?;
-
-        Ok(resp.json().compat().await.context(req_dbg)?)
+        let (resp, req_dbg) = self._send_req(req).await?;
+        Ok(resp.json().await.context(req_dbg)?)
     }
 }
 
@@ -514,18 +506,12 @@ impl GithubClient {
         let req = req
             .build()
             .with_context(|| format!("failed to build request {:?}", req_dbg))?;
-        let resp = self
-            .client
-            .execute(req)
-            .compat()
-            .await
-            .context(req_dbg.clone())?;
+        let mut resp = self.client.execute(req).await.context(req_dbg.clone())?;
         let status = resp.status();
         match status {
             StatusCode::OK => {
                 let mut buf = Vec::with_capacity(resp.content_length().unwrap_or(4) as usize);
-                let mut stream = resp.into_body().compat();
-                while let Some(chunk) = stream.next().await {
+                while let Some(chunk) = resp.chunk().await.transpose() {
                     let chunk = chunk
                         .context("reading stream failed")
                         .map_err(anyhow::Error::from)

src/main.rs

@@ -6,7 +6,7 @@ use futures::{
     stream::StreamExt,
 };
 use hyper::{header, service::service_fn, Body, Request, Response, Server, StatusCode};
-use reqwest::r#async::Client;
+use reqwest::Client;
 use std::{env, net::SocketAddr, sync::Arc};
 use triagebot::{github, handlers::Context, payload, EventName};
 use uuid::Uuid;