Merge pull request #1330 from charlespierce/bump_retry

Bump retry to 2.0.0

Author: charlespierce

Cargo.lock

@@ -48,7 +48,7 @@ hyperx = "1.4.0"
 attohttpc = { version = "0.22.0", default-features = false, features = ["json", "compress", "tls-rustls"] }
 chain-map = "0.1.0"
 indexmap = "1.9.1"
-retry = "1.3.1"
+retry = "2"
 fs2 = "0.4.3"
 
 [target.'cfg(windows)'.dependencies]

crates/volta-core/Cargo.toml

@@ -9,7 +9,7 @@ use std::path::Path;
 use crate::error::{Context, ErrorKind, Fallible};
 use crate::layout::volta_home;
 use retry::delay::Fibonacci;
-use retry::{retry, Error as RetryError, OperationResult};
+use retry::{retry, OperationResult};
 use tempfile::{tempdir_in, NamedTempFile, TempDir};
 
 /// Opens a file, creating it if it doesn't exist
@@ -190,8 +190,5 @@ where
             },
         }
     })
-    .map_err(|e| match e {
-        RetryError::Operation { error, .. } => error,
-        RetryError::Internal(message) => io::Error::new(io::ErrorKind::Other, message),
-    })
+    .map_err(|e| e.error)
 }