Remove prefix

Author: charliermarsh

crates/uv-cache/src/archive.rs

@@ -1,4 +1,4 @@
-use std::path::PathBuf;
+use std::path::{Path, };
 use std::str::FromStr;
 
 use uv_pypi_types::{HashAlgorithm, HashDigest};
@@ -35,20 +35,9 @@ impl FromStr for ArchiveVersion {
 #[derive(Debug, Clone, Eq, PartialEq, Hash, serde::Serialize, serde::Deserialize)]
 pub struct ArchiveId(SmallString);
 
-impl ArchiveId {
-    /// Return the content-addressed path for the [`ArchiveId`].
-    pub fn to_path_buf(&self) -> PathBuf {
-        if self.0.len() == 21 {
-            // A 21-digit NanoID.
-            PathBuf::from(self.0.as_ref())
-        } else {
-            // A SHA256 hex digest, split into three segments.
-            let mut path = PathBuf::new();
-            path.push(&self.0[0..2]);
-            path.push(&self.0[2..4]);
-            path.push(&self.0[4..]);
-            path
-        }
+impl AsRef<Path> for ArchiveId {
+    fn as_ref(&self) -> &Path {
+        self.0.as_ref().as_ref()
     }
 }
 

crates/uv-cache/src/lib.rs

@@ -263,7 +263,7 @@ impl Cache {
 
     /// Return the path to an archive in the cache.
     pub fn archive(&self, id: &ArchiveId) -> PathBuf {
-        self.bucket(CacheBucket::Archive).join(id.to_path_buf())
+        self.bucket(CacheBucket::Archive).join(id)
     }
 
     /// Create a temporary directory to be used as a Python virtual environment.
@@ -352,7 +352,7 @@ impl Cache {
     ) -> io::Result<ArchiveId> {
         // Move the temporary directory into the directory store.
         let id = ArchiveId::from(hash);
-        let archive_entry = self.bucket(CacheBucket::Archive).join(id.to_path_buf());
+        let archive_entry = self.bucket(CacheBucket::Archive).join(id.as_ref());
         if let Some(parent) = archive_entry.parent() {
             fs_err::create_dir_all(parent)?;
         }

crates/uv/tests/it/common/mod.rs

@@ -845,7 +845,7 @@ impl TestContext {
         ));
         // Filter archive hashes
         filters.push((
-            r"archive-v(\d+)[\\/][0-9a-f]{2}[\\/][0-9a-f]{2}[\\/][0-9a-f]{60}".to_string(),
+            r"archive-v(\d+)[\\/][0-9a-f]{64}".to_string(),
             "archive-v$1/[HASH]".to_string(),
         ));