Re-add both tar backends

Signed-off-by: William Woodruff <william@yossarian.net>

Author: woodruffw

Cargo.lock

@@ -99,6 +99,7 @@ anstream = { version = "1.0.0" }
 anyhow = { version = "1.0.89" }
 arcstr = { version = "1.2.0" }
 arrayvec = { version = "0.7.6" }
+astral-tokio-tar = { version = "0.6.3" }
 async-channel = { version = "2.3.1" }
 async-compression = { version = "0.4.12", features = [
   "bzip2",

Cargo.toml

@@ -42,7 +42,7 @@ uv-pep440 = { workspace = true }
 uv-pep508 = { workspace = true }
 uv-performance-memory-allocator = { workspace = true }
 uv-platform-tags = { workspace = true }
-uv-preview = { workspace = true }
+uv-preview = { workspace = true, features = ["testing"] }
 uv-pypi-types = { workspace = true }
 uv-python = { workspace = true }
 uv-resolver = { workspace = true }

crates/uv-bench/Cargo.toml

@@ -20,7 +20,7 @@ use uv_client::{BaseClientBuilder, Connectivity, RegistryClientBuilder};
 use uv_distribution_filename::{SourceDistExtension, WheelFilename};
 use uv_distribution_types::Requirement;
 use uv_install_wheel::{InstallState, Layout, LinkMode};
-use uv_preview::Preview;
+use uv_preview::{Preview, PreviewFeature};
 use uv_pypi_types::Scheme;
 use uv_python::PythonEnvironment;
 use uv_resolver::Manifest;
@@ -108,32 +108,41 @@ fn unpack_sdist_many_files(c: &mut Criterion<WallTime>) {
         .build()
         .expect("Failed to create Tokio runtime");
 
-    c.bench_function("unpack_sdist_many_files", |b| {
-        b.iter_batched(
-            || {
-                (
-                    runtime
-                        .block_on(fs_err::tokio::File::open(archive.path()))
-                        .expect("Failed to open temporary archive"),
-                    create_sdist_extraction_directory(),
-                )
-            },
-            |(archive, extracted_sdist)| {
-                let files = runtime
-                    .block_on(uv_extract::stream::archive(
-                        MANY_FILES_SDIST_FILENAME,
-                        archive,
-                        SourceDistExtension::TarGz,
-                        extracted_sdist.path(),
-                    ))
-                    .expect("Failed to unpack sdist");
-                let source_tree = uv_extract::strip_component(extracted_sdist.path())
-                    .expect("Failed to strip top-level sdist directory");
-                black_box((files, extracted_sdist, source_tree))
-            },
-            BatchSize::PerIteration,
-        );
-    });
+    for (name, preview_features) in [
+        ("unpack_sdist_many_files/astral_tokio_tar", &[][..]),
+        (
+            "unpack_sdist_many_files/tar_codec",
+            &[PreviewFeature::TarCodec][..],
+        ),
+    ] {
+        let _preview = uv_preview::test::with_features(preview_features);
+        c.bench_function(name, |b| {
+            b.iter_batched(
+                || {
+                    (
+                        runtime
+                            .block_on(fs_err::tokio::File::open(archive.path()))
+                            .expect("Failed to open temporary archive"),
+                        create_sdist_extraction_directory(),
+                    )
+                },
+                |(archive, extracted_sdist)| {
+                    let files = runtime
+                        .block_on(uv_extract::stream::archive(
+                            MANY_FILES_SDIST_FILENAME,
+                            archive,
+                            SourceDistExtension::TarGz,
+                            extracted_sdist.path(),
+                        ))
+                        .expect("Failed to unpack sdist");
+                    let source_tree = uv_extract::strip_component(extracted_sdist.path())
+                        .expect("Failed to strip top-level sdist directory");
+                    black_box((files, extracted_sdist, source_tree))
+                },
+                BatchSize::PerIteration,
+            );
+        });
+    }
 }
 
 fn unzip_wheel_many_files(c: &mut Criterion<WallTime>) {

crates/uv-bench/benches/uv.rs

@@ -29,6 +29,7 @@ uv-version = { workspace = true }
 uv-toml = { workspace = true }
 uv-warnings = { workspace = true }
 
+astral-tokio-tar = { workspace = true }
 async_zip = { workspace = true }
 base64 = { workspace = true }
 csv = { workspace = true }

crates/uv-build-backend/Cargo.toml

@@ -84,7 +84,9 @@ pub enum Error {
     #[error("Inconsistent metadata between prepare and build step: {0}")]
     InconsistentSteps(&'static str),
     #[error("Failed to write tar archive to {}", _0.user_display())]
-    TarWrite(
+    TarWrite(PathBuf, #[source] io::Error),
+    #[error("Failed to write tar archive to {}", _0.user_display())]
+    TarCodecWrite(
         PathBuf,
         #[source] tar_codec::BuildError<tar_codec::EncodeError>,
     ),
@@ -710,7 +712,25 @@ mod tests {
     /// platform-independent deterministic builds.
     #[test]
     fn built_by_uv_building() {
-        let _preview = uv_preview::test::with_features(&[]);
+        built_by_uv_building_with_backend(
+            &[],
+            "8bed1f7a8059064bcbeedb61a867cca7f63a474306011d0114280de631ac705e",
+        );
+    }
+
+    #[test]
+    fn built_by_uv_building_tar_codec() {
+        built_by_uv_building_with_backend(
+            &[PreviewFeature::TarCodec],
+            "8cb4da783db5873762b0640f83e8d14e317e6bb4edb8934936f8a4ee0d946098",
+        );
+    }
+
+    fn built_by_uv_building_with_backend(
+        preview_features: &[PreviewFeature],
+        expected_source_dist_hash: &str,
+    ) {
+        let _preview = uv_preview::test::with_features(preview_features);
         let built_by_uv = Path::new("../../test/packages/built-by-uv");
         let src = TempDir::new().unwrap();
         for dir in [
@@ -781,9 +801,12 @@ mod tests {
             "built_by_uv-0.1.0.tar.gz"
         );
         // Check that the source dist is reproducible across platforms.
-        assert_snapshot!(
-            format!("{:x}", sha2::Sha256::digest(fs_err::read(&source_dist_path).unwrap())),
-            @"8cb4da783db5873762b0640f83e8d14e317e6bb4edb8934936f8a4ee0d946098"
+        assert_eq!(
+            format!(
+                "{:x}",
+                sha2::Sha256::digest(fs_err::read(&source_dist_path).unwrap())
+            ),
+            expected_source_dist_hash
         );
         // Check both the files we report and the actual files
         assert_snapshot!(format_file_list(build.source_dist_list_files, src.path()), @"