mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-11-03 05:03:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Don't user display empty string for absolute path CWD (#15897)

Browse source 
With the previous order an absolute path would become an empty string.
This commit is contained in:
konsti 2025-09-16 19:49:08 +02:00 • committed by GitHub
parent 422863ffde
commit 60f2ca3388
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/uv-fs/src/path.rs
View file

@ -69,15 +69,15 @@ impl<T: AsRef<Path>> Simplified for T {
return path.display(); return path.display();
} }
// Attempt to strip the current working directory, then the canonicalized current working
// directory, in case they differ.
let path = path.strip_prefix(CWD.simplified()).unwrap_or(path);
if path.as_os_str() == "" { if path.as_os_str() == "" {
// Avoid printing an empty string for the current directory // Avoid printing an empty string for the current directory
return Path::new(".").display(); return Path::new(".").display();
} }
// Attempt to strip the current working directory, then the canonicalized current working
// directory, in case they differ.
let path = path.strip_prefix(CWD.simplified()).unwrap_or(path);
path.display() path.display()
} }

2
crates/uv-workspace/src/dependency_groups.rs
View file

@ -253,7 +253,7 @@ impl IntoIterator for FlatDependencyGroups {
#[derive(Debug, Error)] #[derive(Debug, Error)]
#[error("{} has malformed dependency groups", if path.is_empty() && package.is_empty() { #[error("{} has malformed dependency groups", if path.is_empty() && package.is_empty() {
"Project".to_string() "Project".to_string()
} else if path.is_empty() { } else if path.is_empty() || path == "." {
format!("Project `{package}`") format!("Project `{package}`")
} else if package.is_empty() { } else if package.is_empty() {
format!("`{path}`") format!("`{path}`")