Merge branch 'master' into less-ar-copying

Author: glandium

Cargo.lock

@@ -22,6 +22,7 @@ name = "sccache-dist"
 required-features = ["dist-server"]
 
 [dependencies]
+anyhow = "1.0"
 ar = { version = "0.8", optional = true }
 atty = "0.2.6"
 base64 = "0.11.0"
@@ -34,7 +35,6 @@ clap = "2.23.0"
 counted-array = "0.1"
 directories = "1"
 env_logger = "0.5"
-error-chain = { version = "0.12.1", default-features = false }
 filetime = "0.2"
 flate2 = { version = "1.0", optional = true, default-features = false, features = ["rust_backend"] }
 futures = "0.1.11"

Cargo.toml

@@ -110,7 +110,7 @@ impl BlobContainer {
         Box::new(
             self.client
                 .execute(request)
-                .chain_err(move || format!("failed GET: {}", uri_copy))
+                .fwith_context(move || format!("failed GET: {}", uri_copy))
                 .and_then(|res| {
                     if res.status().is_success() {
                         let content_length = res
@@ -119,15 +119,15 @@ impl BlobContainer {
                             .map(|header::ContentLength(len)| len);
                         Ok((res.into_body(), content_length))
                     } else {
-                        Err(ErrorKind::BadHTTPStatus(res.status()).into())
+                        Err(BadHttpStatusError(res.status()).into())
                     }
                 })
                 .and_then(|(body, content_length)| {
                     body.fold(Vec::new(), |mut body, chunk| {
                         body.extend_from_slice(&chunk);
                         Ok::<_, reqwest::Error>(body)
                     })
-                    .chain_err(|| "failed to read HTTP body")
+                    .fcontext("failed to read HTTP body")
                     .and_then(move |bytes| {
                         if let Some(len) = content_length {
                             if len != bytes.len() as u64 {
@@ -211,7 +211,7 @@ impl BlobContainer {
                     Ok(())
                 } else {
                     trace!("PUT failed with HTTP status: {}", res.status());
-                    Err(ErrorKind::BadHTTPStatus(res.status()).into())
+                    Err(BadHttpStatusError(res.status()).into())
                 }
             }
             Err(e) => {

src/azure/blobstore.rs

@@ -78,10 +78,10 @@ impl AzureCredentialsProvider for EnvironmentProvider {
 
 fn credentials_from_environment() -> Result<AzureCredentials> {
     let env_conn_str = var("SCCACHE_AZURE_CONNECTION_STRING")
-        .chain_err(|| "No SCCACHE_AZURE_CONNECTION_STRING in environment")?;
+        .context("No SCCACHE_AZURE_CONNECTION_STRING in environment")?;
 
     let container_name = var("SCCACHE_AZURE_BLOB_CONTAINER")
-        .chain_err(|| "No SCCACHE_AZURE_BLOB_CONTAINER in environment")?;
+        .context("No SCCACHE_AZURE_BLOB_CONTAINER in environment")?;
 
     parse_connection_string(&env_conn_str, container_name)
 }