v2/{auth,catalog}: make use of error_chain features

camallo · Jan 29, 2020 · a68a3fc · a68a3fc
1 parent aea2077
commit a68a3fc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 19 deletions.
diff --git a/src/v2/auth.rs b/src/v2/auth.rs
@@ -23,10 +23,7 @@ impl Client {
             match reqwest::Url::parse(&ep) {
                 Ok(url) => url,
                 Err(e) => {
-                    return Err(Error::from(format!(
-                        "failed to parse url from string '{}': {}",
-                        ep, e
-                    )));
+                    bail!("failed to parse url from string '{}': {}", ep, e);
                 }
             }
         };

diff --git a/src/v2/catalog.rs b/src/v2/catalog.rs
@@ -1,4 +1,4 @@
-use crate::errors::{Error, Result};
+use crate::errors::{Result, ResultExt};
 use crate::v2;
 use async_stream::try_stream;
 use futures::stream::Stream;
@@ -40,19 +40,14 @@ impl v2::Client {
 }
 
 async fn fetch_catalog(req: RequestBuilder) -> Result<Catalog> {
-    match req.send().await {
-        Ok(r) => {
-            let status = r.status();
-            trace!("Got status: {:?}", status);
-            match status {
-                StatusCode::OK => r
-                    .json::<Catalog>()
-                    .await
-                    .map_err(|e| format!("get_catalog: failed to fetch the whole body: {}", e)),
-                _ => Err(format!("get_catalog: wrong HTTP status '{}'", status)),
-            }
-        }
-        Err(err) => Err(format!("{}", err)),
+    let r = req.send().await?;
+    let status = r.status();
+    trace!("Got status: {:?}", status);
+    match status {
+        StatusCode::OK => r
+            .json::<Catalog>()
+            .await
+            .chain_err(|| "get_catalog: failed to fetch the whole body"),
+        _ => bail!("get_catalog: wrong HTTP status '{}'", status),
     }
-    .map_err(Error::from)
 }