Merge pull request #1659 from tottoto/replace-hyperx-with-headers

chore: replace hyperx with headers

Author: chriskrycho

Cargo.lock

@@ -44,6 +44,6 @@ winreg = "0.52.0"
 hamcrest2 = "0.3.0"
 envoy = "0.1.3"
 ci_info = "0.14.14"
-hyperx = "1.4.0"
+headers = "0.3"
 
 [workspace]

Cargo.toml

@@ -16,6 +16,6 @@ fs-utils = { path = "../fs-utils" }
 progress-read = { path = "../progress-read" }
 verbatim = "0.1"
 cfg-if = "1.0"
-hyperx = "1.0.0"
+headers = "0.3"
 thiserror = "1.0.16"
 attohttpc = { version = "0.26", default-features = false, features = ["json", "compress", "tls-rustls-native-roots"] }

crates/archive/Cargo.toml

@@ -9,9 +9,7 @@ use super::{Archive, ArchiveError, Origin};
 use attohttpc::header::HeaderMap;
 use flate2::read::GzDecoder;
 use fs_utils::ensure_containing_dir_exists;
-use hyperx::header::{
-    AcceptRanges, ByteRangeSpec, ContentLength, Header, Range, RangeUnit, TypedHeaders,
-};
+use headers::{AcceptRanges, ContentLength, Header, HeaderMapExt, Range};
 use progress_read::ProgressRead;
 use tee::TeeReader;
 
@@ -31,8 +29,7 @@ pub struct Tarball {
 /// the HTTP `"Content-Length"` header.
 fn content_length(headers: &HeaderMap) -> Result<u64, ArchiveError> {
     headers
-        .decode::<ContentLength>()
-        .ok()
+        .typed_get::<ContentLength>()
         .map(|v| v.0)
         .ok_or_else(|| ArchiveError::MissingHeaderError(String::from("Content-Length")))
 }
@@ -117,9 +114,16 @@ impl Archive for Tarball {
 /// downloading the entire gzip file. For very small files it's unlikely to be
 /// more efficient than simply downloading the entire file up front.
 fn fetch_isize(url: &str, len: u64) -> Result<[u8; 4], ArchiveError> {
-    let range_header = Range::Bytes(vec![ByteRangeSpec::FromTo(len - 4, len - 1)]);
+    let mut header_values = Vec::with_capacity(1);
+    Range::bytes(len - 4..len)
+        .unwrap()
+        .encode(&mut header_values);
+    // We just pushed a header in with the `.encode` above, so there will always
+    // be a value at `.first()`.
+    let range_header = header_values.first().unwrap();
+
     let (status, headers, mut response) = attohttpc::get(url)
-        .header(Range::header_name(), range_header.to_string())
+        .header(Range::name(), range_header)
         .send()?
         .split();
 
@@ -150,10 +154,8 @@ fn load_isize(file: &mut File) -> Result<[u8; 4], ArchiveError> {
 
 fn accepts_byte_ranges(headers: &HeaderMap) -> bool {
     headers
-        .decode::<AcceptRanges>()
-        .ok()
-        .map(|v| v.iter().any(|unit| *unit == RangeUnit::Bytes))
-        .unwrap_or(false)
+        .typed_get::<AcceptRanges>()
+        .map_or(false, |v| v == AcceptRanges::bytes())
 }
 
 /// Determines the uncompressed size of a gzip file hosted at the specified

crates/archive/src/tarball.rs

@@ -47,7 +47,7 @@ volta-layout = { path = "../volta-layout" }
 once_cell = "1.19.0"
 dunce = "1.0.4"
 ci_info = "0.14.14"
-hyperx = "1.4.0"
+headers = "0.3"
 attohttpc = { version = "0.26", default-features = false, features = ["json", "compress", "tls-rustls-native-roots"] }
 chain-map = "0.1.0"
 indexmap = "2.1.0"