Bump to prerelease reqwest

Author: jtgeibel

Cargo.lock

@@ -57,7 +57,7 @@ ammonia = "3.0.0"
 docopt = "1.0"
 scheduled-thread-pool = "0.2.0"
 derive_deref = "1.0.0"
-reqwest = "0.9.1"
+reqwest = { git = "https://github.com/seanmonstar/reqwest", features = ["blocking", "gzip", "json"] }
 tempdir = "0.3.7"
 parking_lot = "0.7.1"
 jemallocator = { version = "0.3", features = ['unprefixed_malloc_on_supported_platforms', 'profiling', "background_threads"] }

Cargo.toml

@@ -5,7 +5,7 @@ use std::{path::PathBuf, sync::Arc, time::Duration};
 
 use diesel::r2d2;
 use oauth2::basic::BasicClient;
-use reqwest::Client;
+use reqwest::blocking::Client;
 use scheduled_thread_pool::ScheduledThreadPool;
 
 /// The `App` struct holds the main components of the application like

src/app.rs

@@ -1,3 +1,4 @@
+use reqwest::blocking::Client;
 use std::panic::AssertUnwindSafe;
 use std::sync::{Arc, Mutex, MutexGuard, PoisonError};
 use swirl::PerformError;
@@ -25,7 +26,7 @@ pub struct Environment {
     // FIXME: https://github.com/sfackler/r2d2/pull/70
     pub connection_pool: AssertUnwindSafe<DieselPool>,
     pub uploader: Uploader,
-    http_client: AssertUnwindSafe<reqwest::Client>,
+    http_client: AssertUnwindSafe<Client>,
 }
 
 // FIXME: AssertUnwindSafe should be `Clone`, this can be replaced with
@@ -46,7 +47,7 @@ impl Environment {
         index: Repository,
         connection_pool: DieselPool,
         uploader: Uploader,
-        http_client: reqwest::Client,
+        http_client: Client,
     ) -> Self {
         Self {
             index: Arc::new(Mutex::new(index)),
@@ -69,7 +70,7 @@ impl Environment {
     }
 
     /// Returns a client for making HTTP requests to upload crate files.
-    pub(crate) fn http_client(&self) -> &reqwest::Client {
+    pub(crate) fn http_client(&self) -> &Client {
         &self.http_client
     }
 }

src/background_jobs.rs

@@ -15,6 +15,7 @@
 use cargo_registry::git::{Repository, RepositoryConfig};
 use cargo_registry::{background_jobs::*, db};
 use diesel::r2d2;
+use reqwest::blocking::Client;
 use std::thread::sleep;
 use std::time::Duration;
 
@@ -42,12 +43,7 @@ fn main() {
     let repository_config = RepositoryConfig::from_environment();
     let repository = Repository::open(&repository_config).expect("Failed to clone index");
 
-    let environment = Environment::new(
-        repository,
-        db_pool.clone(),
-        config.uploader,
-        reqwest::Client::new(),
-    );
+    let environment = Environment::new(repository, db_pool.clone(), config.uploader, Client::new());
 
     let build_runner = || {
         swirl::Runner::builder(db_pool.clone(), environment.clone())

src/bin/background-worker.rs

@@ -1,6 +1,6 @@
 use cargo_registry::util::{internal, AppResult};
 
-use reqwest::{header, StatusCode as Status};
+use reqwest::{blocking::Client, header, StatusCode as Status};
 
 #[derive(serde::Serialize, Debug)]
 #[serde(rename_all = "snake_case", tag = "event_type")]
@@ -29,7 +29,7 @@ impl Event {
         let api_token = dotenv::var("PAGERDUTY_API_TOKEN")?;
         let service_key = dotenv::var("PAGERDUTY_INTEGRATION_KEY")?;
 
-        let mut response = reqwest::Client::new()
+        let response = Client::new()
             .post("https://events.pagerduty.com/generic/2010-04-15/create_event.json")
             .header(header::ACCEPT, "application/vnd.pagerduty+json;version=2")
             .header(header::AUTHORIZATION, format!("Token token={}", api_token))

src/bin/on_call/mod.rs

@@ -21,7 +21,7 @@ use chrono::{TimeZone, Utc};
 use diesel::{dsl::any, prelude::*};
 use docopt::Docopt;
 use flate2::read::GzDecoder;
-use reqwest::{header, Client};
+use reqwest::{blocking::Client, header};
 use tar::{self, Archive};
 
 const CACHE_CONTROL_README: &str = "public,max-age=604800";
@@ -170,7 +170,7 @@ fn get_readme(
         .uploader
         .crate_location(krate_name, &version.num.to_string());
 
-    let mut response = match client.get(&location).send() {
+    let response = match client.get(&location).send() {
         Ok(r) => r,
         Err(err) => {
             println!(

src/bin/render-readmes.rs

@@ -11,7 +11,7 @@ use std::{
 use civet::Server as CivetServer;
 use conduit_hyper::Service;
 use futures::prelude::*;
-use reqwest::Client;
+use reqwest::blocking::Client;
 
 enum Server {
     Civet(CivetServer),

src/bin/server.rs

@@ -16,4 +16,4 @@ path = "lib.rs"
 base64 = "0.6"
 chrono = "0.4"
 openssl = "0.10.13"
-reqwest = "0.9.1"
+reqwest = { git = "https://github.com/seanmonstar/reqwest", features = ["blocking"] }

src/s3/Cargo.toml

@@ -10,7 +10,10 @@ use chrono::prelude::Utc;
 use openssl::hash::MessageDigest;
 use openssl::pkey::PKey;
 use openssl::sign::Signer;
-use reqwest::header;
+use reqwest::{
+    blocking::{Body, Client, Response},
+    header,
+};
 
 #[derive(Clone, Debug)]
 pub struct Bucket {
@@ -40,13 +43,13 @@ impl Bucket {
 
     pub fn put<R: std::io::Read + Send + 'static>(
         &self,
-        client: &reqwest::Client,
+        client: &Client,
         path: &str,
         content: R,
         content_length: u64,
         content_type: &str,
         extra_headers: header::HeaderMap,
-    ) -> reqwest::Result<reqwest::Response> {
+    ) -> reqwest::Result<Response> {
         let path = if path.starts_with('/') {
             &path[1..]
         } else {
@@ -62,16 +65,12 @@ impl Bucket {
             .header(header::CONTENT_TYPE, content_type)
             .header(header::DATE, date)
             .headers(extra_headers)
-            .body(reqwest::Body::sized(content, content_length))
+            .body(Body::sized(content, content_length))
             .send()?
             .error_for_status()
     }
 
-    pub fn delete(
-        &self,
-        client: &reqwest::Client,
-        path: &str,
-    ) -> reqwest::Result<reqwest::Response> {
+    pub fn delete(&self, client: &Client, path: &str) -> reqwest::Result<Response> {
         let path = if path.starts_with('/') {
             &path[1..]
         } else {

src/s3/lib.rs

@@ -146,7 +146,7 @@ impl DumpTarball {
     }
 
     fn upload(&self, target_name: &str, uploader: &Uploader) -> Result<(), PerformError> {
-        let client = reqwest::Client::new();
+        let client = reqwest::blocking::Client::new();
         let tarfile = File::open(&self.tarball_path)?;
         let content_length = tarfile.metadata()?.len();
         // TODO Figure out the correct content type.

src/tasks/dump_db.rs

@@ -30,7 +30,7 @@ use std::{
 
 use conduit_test::MockRequest;
 use diesel::prelude::*;
-use reqwest::{Client, Proxy};
+use reqwest::{blocking::Client, Proxy};
 
 macro_rules! t {
     ($e:expr) => {

src/tests/all.rs

@@ -366,7 +366,7 @@ impl GhUser {
             client_id: String,
             client_secret: String,
         }
-        let client = reqwest::Client::new();
+        let client = reqwest::blocking::Client::new();
         let req = client
             .post("https://api.github.com/authorizations")
             .json(&Authorization {
@@ -377,7 +377,9 @@ impl GhUser {
             })
             .basic_auth(self.login, Some(password));
 
-        let mut response = t!(req.send().and_then(reqwest::Response::error_for_status));
+        let response = t!(req
+            .send()
+            .and_then(reqwest::blocking::Response::error_for_status));
 
         #[derive(Deserialize)]
         struct Response {

src/tests/record.rs

@@ -1,7 +1,7 @@
 use conduit::Request;
 use flate2::read::GzDecoder;
 use openssl::hash::{Hasher, MessageDigest};
-use reqwest::header;
+use reqwest::{blocking::Client, header};
 
 use crate::util::LimitErrorReader;
 use crate::util::{cargo_err, internal, AppResult, ChainError, Maximums};
@@ -90,7 +90,7 @@ impl Uploader {
     /// It returns the path of the uploaded file.
     pub fn upload<R: std::io::Read + Send + 'static>(
         &self,
-        client: &reqwest::Client,
+        client: &Client,
         path: &str,
         mut content: R,
         content_length: u64,
@@ -153,7 +153,7 @@ impl Uploader {
 
     pub(crate) fn upload_readme(
         &self,
-        http_client: &reqwest::Client,
+        http_client: &Client,
         crate_name: &str,
         vers: &str,
         readme: String,