From 07746429bb5fa9461d7fa2dce0083f23a981e200 Mon Sep 17 00:00:00 2001
From: Anthony Oteri <anthony.oteri@gmail.com>
Date: Thu, 16 Nov 2023 10:30:03 -0500
Subject: [PATCH] Be consistent with use of `http` and `reqwest` libraries

The types may have similar names but are distinct types and should be used consistently.  This changes
the code to use the header and status code information directly from the `reqwests` library instead of
mixing the two.

Signed-off-by: Anthony Oteri <anthony.oteri@gmail.com>
---
 src/api.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/api.rs b/src/api.rs
index 1a26cf1..a79cefe 100644
--- a/src/api.rs
+++ b/src/api.rs
@@ -7,7 +7,9 @@
  * copied, modified, or distributed except according to those terms.
  */
 
-use http::header;
+use reqwest::header;
+use reqwest::header::HeaderValue;
+use reqwest::StatusCode;
 use serde::Deserialize;
 use url::Url;
 
@@ -52,7 +54,7 @@ pub async fn fetch_paginated<T: for<'de> Deserialize<'de>>(
             responses.push(json);
         }
 
-        if let Some(p) = parse_rfc5988(headers.get(http::header::LINK))? {
+        if let Some(p) = parse_rfc5988(headers.get(header::LINK))? {
             next_path = p;
         } else {
             break;
@@ -73,7 +75,7 @@ pub async fn fetch_paginated<T: for<'de> Deserialize<'de>>(
 ///
 /// Returns and `ApiError` if there is a problem parsing contents of the
 /// supplied header value.
-fn parse_rfc5988(header_value: Option<&http::HeaderValue>) -> Result<Option<String>, ApiError> {
+fn parse_rfc5988(header_value: Option<&HeaderValue>) -> Result<Option<String>, ApiError> {
     log::trace!("parse_rfc5988(header_value: {header_value:?})");
 
     if let Some(link_value) = header_value {
@@ -127,7 +129,7 @@ pub fn parse_response_status(response: &reqwest::Response) -> Result<(), ApiErro
     log::trace!("parse_response_status(response: {response:?})");
 
     match response.status() {
-        http::StatusCode::OK | http::StatusCode::ACCEPTED => {
+        StatusCode::OK | StatusCode::ACCEPTED => {
             let headers = response.headers();
             if let Some(header_value) = headers.get("Docker-Distribution-API-Version") {
                 if header_value.to_str()? == "registry/2.0" {
@@ -141,8 +143,8 @@ pub fn parse_response_status(response: &reqwest::Response) -> Result<(), ApiErro
                 ))
             }
         }
-        http::StatusCode::METHOD_NOT_ALLOWED => Err(ApiError::MethodNotAllowed),
-        http::StatusCode::UNAUTHORIZED => {
+        StatusCode::METHOD_NOT_ALLOWED => Err(ApiError::MethodNotAllowed),
+        StatusCode::UNAUTHORIZED => {
             let headers = response.headers();
             if let Some(header_value) = headers.get("Docker-Distribution-API-Version") {
                 if header_value.to_str()? == "registry/2.0" {
@@ -156,7 +158,7 @@ pub fn parse_response_status(response: &reqwest::Response) -> Result<(), ApiErro
                 ))
             }
         }
-        http::StatusCode::NOT_FOUND => Err(ApiError::NotFound),
+        StatusCode::NOT_FOUND => Err(ApiError::NotFound),
         e => Err(ApiError::UnexpectedResponse(format!(
             "Undocumented status code: {e:?}"
         ))),
@@ -192,8 +194,6 @@ pub async fn get_digest(client: &reqwest::Client, url: &Url) -> Result<String, A
 
 #[cfg(test)]
 mod tests {
-    use http::header::HeaderValue;
-
     use super::*;
 
     /// Test parsing a valid RFC5988 header value.