async,blocking: refactor get_with_retry

Author: ValuedMammal

src/async.rs

@@ -432,18 +432,18 @@ impl AsyncClient {
         let mut attempts = 0;
 
         loop {
-            match self.client.get(url).send().await {
-                Ok(resp)
-                    if attempts < self.max_retries
-                        && RETRYABLE_ERROR_CODES.contains(&resp.status().as_u16()) =>
-                {
+            match self.client.get(url).send().await? {
+                resp if attempts <= self.max_retries && is_status_retryable(resp.status()) => {
                     task::sleep(delay).await;
                     attempts += 1;
                     delay *= 2;
                 }
-                Ok(resp) => return Ok(resp),
-                Err(e) => return Err(Error::Reqwest(e)),
+                resp => return Ok(resp),
             }
         }
     }
 }
+
+fn is_status_retryable(status: reqwest::StatusCode) -> bool {
+    RETRYABLE_ERROR_CODES.contains(&status.as_u16())
+}

src/blocking.rs

@@ -354,16 +354,13 @@ impl BlockingClient {
         let mut attempts = 0;
 
         loop {
-            match self.get_request(url)?.send() {
-                Ok(resp)
-                    if attempts < self.max_retries && is_status_retryable(resp.status_code) =>
-                {
+            match self.get_request(url)?.send()? {
+                resp if attempts <= self.max_retries && is_status_retryable(resp.status_code) => {
                     thread::sleep(delay);
                     attempts += 1;
                     delay *= 2;
                 }
-                Ok(resp) => return Ok(resp),
-                Err(e) => return Err(Error::Minreq(e)),
+                resp => return Ok(resp),
             }
         }
     }