From 35940cb88537dc64907ccf6ab3b6c0b19dfe0d1f Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Sat, 6 Apr 2024 10:58:23 -0400 Subject: [PATCH] Remove additional 'because' (#2849) ## Summary Is this, perhaps, not totally necessary? It doesn't show up in any fixtures beyond those that I added recently. Closes https://github.com/astral-sh/uv/issues/2846. --- crates/uv-resolver/src/resolver/mod.rs | 10 +--------- crates/uv/tests/pip_compile.rs | 14 ++++++-------- .../dependent_editables/second_editable/.gitignore | 1 + 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/crates/uv-resolver/src/resolver/mod.rs b/crates/uv-resolver/src/resolver/mod.rs index b90748b1e..7aaed6ce7 100644 --- a/crates/uv-resolver/src/resolver/mod.rs +++ b/crates/uv-resolver/src/resolver/mod.rs @@ -429,18 +429,10 @@ impl< .await? { Dependencies::Unavailable(reason) => { - let message = { - if matches!(package, PubGrubPackage::Root(_)) { - // Including front-matter for the root package is redundant - reason.clone() - } else { - format!("its dependencies are unusable because {reason}") - } - }; state.add_incompatibility(Incompatibility::unavailable( package.clone(), version.clone(), - message, + reason.clone(), )); continue; } diff --git a/crates/uv/tests/pip_compile.rs b/crates/uv/tests/pip_compile.rs index 909099aa2..718a3f281 100644 --- a/crates/uv/tests/pip_compile.rs +++ b/crates/uv/tests/pip_compile.rs @@ -4569,10 +4569,9 @@ fn invalid_metadata_requires_python() -> Result<()> { ----- stderr ----- × No solution found when resolving dependencies: - ╰─▶ Because validation==2.0.0 is unusable because its dependencies are - unusable because the package metadata could not be parsed and you - require validation==2.0.0, we can conclude that the requirements are - unsatisfiable. + ╰─▶ Because validation==2.0.0 is unusable because the package metadata could + not be parsed and you require validation==2.0.0, we can conclude that + the requirements are unsatisfiable. "### ); @@ -4598,10 +4597,9 @@ fn invalid_metadata_multiple_dist_info() -> Result<()> { ----- stderr ----- × No solution found when resolving dependencies: - ╰─▶ Because validation==3.0.0 is unusable because its dependencies - are unusable because the package has an invalid format and you - require validation==3.0.0, we can conclude that the requirements are - unsatisfiable. + ╰─▶ Because validation==3.0.0 is unusable because the package has an invalid + format and you require validation==3.0.0, we can conclude that the + requirements are unsatisfiable. "### ); diff --git a/scripts/packages/dependent_editables/second_editable/.gitignore b/scripts/packages/dependent_editables/second_editable/.gitignore index eaa9f051b..c847724a5 100644 --- a/scripts/packages/dependent_editables/second_editable/.gitignore +++ b/scripts/packages/dependent_editables/second_editable/.gitignore @@ -1,2 +1,3 @@ # Artifacts from the build process. *.egg-info/ +build/