diff --git a/crates/puffin-distribution/src/distribution_database.rs b/crates/puffin-distribution/src/distribution_database.rs index 08f82c71a..0ca3efd6b 100644 --- a/crates/puffin-distribution/src/distribution_database.rs +++ b/crates/puffin-distribution/src/distribution_database.rs @@ -118,8 +118,7 @@ impl<'a, Context: BuildContext + Send + Sync> DistributionDatabase<'a, Context> let wheel_filename = WheelFilename::from_str(&wheel.file.filename)?; let cache_entry = self.cache.entry( CacheBucket::Wheels, - WheelCache::Index(&wheel.index) - .remote_wheel_dir(wheel_filename.name.as_ref()), + WheelCache::Index(&wheel.index).remote_wheel_dir(wheel_filename.name.as_ref()), wheel_filename.stem(), ); @@ -197,7 +196,7 @@ impl<'a, Context: BuildContext + Send + Sync> DistributionDatabase<'a, Context> CacheBucket::Wheels, WheelCache::Index(&wheel.index) .remote_wheel_dir(wheel_filename.name.as_ref()), - filename, // TODO should this be filename.stem() to match the other branch? + filename, // TODO should this be filename.stem() to match the other branch? ); fs::create_dir_all(&cache_entry.dir()).await?; tokio::fs::rename(temp_file, &cache_entry.path()).await?; diff --git a/crates/puffin-extract/src/lib.rs b/crates/puffin-extract/src/lib.rs index a4abafdcc..ff454d487 100644 --- a/crates/puffin-extract/src/lib.rs +++ b/crates/puffin-extract/src/lib.rs @@ -1,9 +1,9 @@ use std::path::{Path, PathBuf}; use rayon::prelude::*; +use tokio_util::compat::FuturesAsyncReadCompatExt; use zip::result::ZipError; use zip::ZipArchive; -use tokio_util::compat::FuturesAsyncReadCompatExt; pub use crate::vendor::{CloneableSeekableReader, HasLength}; diff --git a/crates/puffin-installer/src/downloader.rs b/crates/puffin-installer/src/downloader.rs index 69f0b944a..9e36bef71 100644 --- a/crates/puffin-installer/src/downloader.rs +++ b/crates/puffin-installer/src/downloader.rs @@ -235,8 +235,8 @@ impl<'a, Context: BuildContext + Send + Sync> Downloader<'a, Context> { Ok(download.target().to_path_buf()) } }) - .await? - .map_err(|err| Error::Unzip(remote.clone(), err))? + .await? + .map_err(|err| Error::Unzip(remote.clone(), err))? }; Ok(CachedDist::from_remote(remote, filename, normalized_path))