mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-04 19:08:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove unnecessary is_dir in clone_recursive (#1247)

Browse source
This commit is contained in:
Charlie Marsh 2024-02-04 15:54:22 -08:00 • committed by GitHub
parent 9d42cfd09b
commit be9125b0f0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

32
crates/install-wheel-rs/src/linker.rs
View file

@ -6,7 +6,7 @@ use std::str::FromStr;
use configparser::ini::Ini;
use fs_err as fs;
use fs_err::File;
use fs_err::{DirEntry, File};
use tempfile::tempdir_in;
use tracing::{debug, instrument};
@ -286,13 +286,7 @@ fn clone_wheel_files(
// subdirectory unless the subdirectory exists already in which case we'll need to recursively
// merge its contents with the existing directory.
for entry in fs::read_dir(wheel.as_ref())? {
let entry = entry?;
let from = entry.path();
let to = site_packages
.as_ref()
.join(from.strip_prefix(&wheel).unwrap());
clone_recursive(site_packages.as_ref(), &from, &to)?;
clone_recursive(site_packages.as_ref(), wheel.as_ref(), &entry?)?;
count += 1;
}
@ -300,22 +294,24 @@ fn clone_wheel_files(
}
/// Recursively clone the contents of `from` into `to`.
fn clone_recursive(site_packages: &Path, from: &Path, to: &Path) -> Result<(), Error> {
// Attempt to copy the file or directory
fn clone_recursive(site_packages: &Path, wheel: &Path, entry: &DirEntry) -> Result<(), Error> {
// Determine the existing and destination paths.
let from = entry.path();
let to = site_packages.join(from.strip_prefix(wheel).unwrap());
debug!("Cloning {} to {}", from.display(), to.display());
let reflink = reflink_copy::reflink(from, to);
// Attempt to copy the file or directory
let reflink = reflink_copy::reflink(&from, &to);
if reflink
.as_ref()
.is_err_and(|err| matches!(err.kind(), std::io::ErrorKind::AlreadyExists))
{
// If copying fails and the directory exists already, it must be merged recursively.
if from.is_dir() {
if entry.file_type()?.is_dir() {
for entry in fs::read_dir(from)? {
let entry = entry?;
let child_from = entry.path();
let child_to = to.join(child_from.strip_prefix(from).unwrap());
clone_recursive(site_packages, child_from.as_path(), child_to.as_path())?;
clone_recursive(site_packages, wheel, &entry?)?;
}
} else {
// If file already exists, overwrite it.
@ -327,8 +323,8 @@ fn clone_recursive(site_packages: &Path, from: &Path, to: &Path) -> Result<(), E
} else {
// Other errors should be tracked
reflink.map_err(|err| Error::Reflink {
from: from.to_path_buf(),
to: to.to_path_buf(),
from: from.clone(),
to: to.clone(),
err,
})?;
}