Merge pull request #2747 from kinnison/anyhow-download

download: Fix some error paths for anyhow
rust-lang · May 4, 2021 · 11c855e · 11c855e
2 parents 55ba10d + e2678d3
commit 11c855e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/download/src/errors.rs b/download/src/errors.rs
@@ -15,6 +15,7 @@ pub enum DownloadError {
     #[cfg(feature = "reqwest-backend")]
     #[error(transparent)]
     Reqwest(#[from] ::reqwest::Error),
+    #[cfg(feature = "curl-backend")]
     #[error(transparent)]
     CurlError(#[from] curl::Error),
 }
diff --git a/download/src/lib.rs b/download/src/lib.rs
@@ -354,13 +354,13 @@ pub mod reqwest_be {
             TlsBackend::Rustls => &CLIENT_RUSTLS_TLS,
             #[cfg(not(feature = "reqwest-rustls-tls"))]
             TlsBackend::Rustls => {
-                return Err(ErrorKind::BackendUnavailable("reqwest rustls").into());
+                return Err(DownloadError::BackendUnavailable("reqwest rustls"));
             }
             #[cfg(feature = "reqwest-default-tls")]
             TlsBackend::Default => &CLIENT_DEFAULT_TLS,
             #[cfg(not(feature = "reqwest-default-tls"))]
             TlsBackend::Default => {
-                return Err(ErrorKind::BackendUnavailable("reqwest default TLS").into());
+                return Err(DownloadError::BackendUnavailable("reqwest default TLS"));
             }
         };
         let mut req = client.get(url.as_str());
@@ -414,22 +414,26 @@ pub mod reqwest_be {
 #[cfg(not(feature = "curl-backend"))]
 pub mod curl {
 
+    use anyhow::{anyhow, Result};
+
     use super::Event;
     use crate::errors::*;
     use url::Url;
 
     pub fn download(
         _url: &Url,
         _resume_from: u64,
-        _callback: &dyn Fn(Event<'_>) -> Result<(), DownloadError>,
-    ) -> Result<(), DownloadError> {
-        Err(ErrorKind::BackendUnavailable("curl").into())
+        _callback: &dyn Fn(Event<'_>) -> Result<()>,
+    ) -> Result<()> {
+        Err(anyhow!(DownloadError::BackendUnavailable("curl")))
     }
 }
 
 #[cfg(not(feature = "reqwest-backend"))]
 pub mod reqwest_be {
 
+    use anyhow::{anyhow, Result};
+
     use super::Event;
     use super::TlsBackend;
     use crate::errors::*;
@@ -438,9 +442,9 @@ pub mod reqwest_be {
     pub fn download(
         _url: &Url,
         _resume_from: u64,
-        _callback: &dyn Fn(Event<'_>) -> Result<(), DownloadError>,
+        _callback: &dyn Fn(Event<'_>) -> Result<()>,
         _tls: TlsBackend,
-    ) -> Result<(), DownloadError> {
-        Err(ErrorKind::BackendUnavailable("reqwest").into())
+    ) -> Result<()> {
+        Err(anyhow!(DownloadError::BackendUnavailable("reqwest")))
     }
 }