Remove plural from unavailable package

Author: konstin

crates/uv-resolver/src/pubgrub/report.rs

@@ -114,12 +114,19 @@ impl ReportFormatter<PubGrubPackage, Range<Version>, UnavailableReason>
                 PubGrubPackage::Root(None) => {
                     format!("your requirements cannot be used because {reason}")
                 }
-                _ => {
-                    format!(
-                        "{}{reason}",
-                        Padded::new("", &PackageRange::compatibility(package, set), " ")
-                    )
-                }
+                _ => match reason {
+                    UnavailableReason::Package(reason) => {
+                        // While there may be a term attached, this error applies to the entire
+                        // package, so we show it for the entire package
+                        format!("{}{reason}", Padded::new("", &package, " "))
+                    }
+                    UnavailableReason::Version(reason) => {
+                        format!(
+                            "{}{reason}",
+                            Padded::new("", &PackageRange::compatibility(package, set), " ")
+                        )
+                    }
+                },
             },
             External::FromDependencyOf(package, package_set, dependency, dependency_set) => {
                 let package_set = self.simplify_set(package_set, package);

crates/uv-resolver/src/resolver/mod.rs

@@ -14,7 +14,6 @@ use itertools::Itertools;
 use pubgrub::error::PubGrubError;
 use pubgrub::range::Range;
 use pubgrub::solver::{Incompatibility, State};
-use pubgrub::term::Term;
 use rustc_hash::{FxHashMap, FxHashSet};
 use tokio_stream::wrappers::ReceiverStream;
 use tracing::{debug, enabled, info_span, instrument, trace, warn, Instrument, Level};
@@ -69,58 +68,22 @@ mod urls;
 
 /// The reason why a package or a version cannot be used.
 #[derive(Debug, Clone, Eq, PartialEq)]
-pub(crate) struct UnavailableReason {
-    term: Term<Range<Version>>,
-    reason: UnavailableMetadataTypes,
-}
-
-impl UnavailableReason {
-    /// Returns a boolean indicating if the predicate following this package range should
-    /// be singular or plural e.g. if false use "<range> has <...>" and
-    /// if true use "<range> have <...>"
-    fn plural(&self) -> bool {
-        self.term == Term::Positive(Range::full())
-    }
+pub(crate) enum UnavailableReason {
+    /// The entire package cannot be used.
+    Package(UnavailablePackage),
+    /// A single version cannot be used.
+    Version(UnavailableVersion),
 }
 
 impl Display for UnavailableReason {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        match &self.reason {
-            UnavailableMetadataTypes::Version(version) => Display::fmt(version, f),
-            UnavailableMetadataTypes::Package(package) => match package {
-                UnavailablePackage::NoIndex => {
-                    f.write_str(if self.plural() { "were" } else { "was" })?;
-                    f.write_str(" not found in the provided package locations")
-                }
-                UnavailablePackage::Offline => {
-                    f.write_str(if self.plural() { "were" } else { "was" })?;
-                    f.write_str(" not found in the cache")
-                }
-                UnavailablePackage::NotFound => {
-                    f.write_str(if self.plural() { "were" } else { "was" })?;
-                    f.write_str(" not found in the package registry")
-                }
-                UnavailablePackage::InvalidMetadata(_) => {
-                    f.write_str(if self.plural() { "have" } else { "has" })?;
-                    f.write_str(" invalid metadata")
-                }
-                UnavailablePackage::InvalidStructure(_) => {
-                    f.write_str(if self.plural() { "have" } else { "has" })?;
-                    f.write_str(" an invalid package format")
-                }
-            },
+        match self {
+            Self::Version(version) => Display::fmt(version, f),
+            Self::Package(package) => Display::fmt(package, f),
         }
     }
 }
 
-#[derive(Debug, Clone, Eq, PartialEq)]
-pub(crate) enum UnavailableMetadataTypes {
-    /// The entire package cannot be used.
-    Package(UnavailablePackage),
-    /// A single version cannot be used.
-    Version(UnavailableVersion),
-}
-
 /// The package version is unavailable and cannot be used. Unlike [`PackageUnavailable`], this
 /// applies to a single version of the package.
 ///
@@ -172,6 +135,24 @@ pub(crate) enum UnavailablePackage {
     InvalidStructure(String),
 }
 
+impl UnavailablePackage {
+    pub(crate) fn as_str(&self) -> &'static str {
+        match self {
+            UnavailablePackage::NoIndex => "was not found in the provided package locations",
+            UnavailablePackage::Offline => "was not found in the cache",
+            UnavailablePackage::NotFound => "was not found in the package registry",
+            UnavailablePackage::InvalidMetadata(_) => "has invalid metadata",
+            UnavailablePackage::InvalidStructure(_) => "has an invalid package format",
+        }
+    }
+}
+
+impl Display for UnavailablePackage {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.write_str(self.as_str())
+    }
+}
+
 /// The package is unavailable at specific versions.
 #[derive(Debug, Clone)]
 pub(crate) enum IncompletePackage {
@@ -444,15 +425,11 @@ impl<'a, Provider: ResolverProvider, InstalledPackages: InstalledPackagesProvide
 
                     // Check if the decision was due to the package being unavailable
                     if let PubGrubPackage::Package(ref package_name, _, _) = next {
-                        if let Some(entry) = self.unavailable_packages.borrow()
-                                .get(package_name) {
+                        if let Some(entry) = self.unavailable_packages.borrow().get(package_name) {
                             state.add_incompatibility(Incompatibility::custom_term(
                                 next.clone(),
                                 term_intersection.clone(),
-                                UnavailableReason {
-                                    term: term_intersection.clone(),
-                                    reason: UnavailableMetadataTypes::Package(entry.clone()),
-                                },
+                                UnavailableReason::Package(entry.clone()),
                             ));
                             continue;
                         }
@@ -500,10 +477,7 @@ impl<'a, Provider: ResolverProvider, InstalledPackages: InstalledPackagesProvide
                     state.add_incompatibility(Incompatibility::custom_version(
                         next.clone(),
                         version.clone(),
-                        UnavailableReason {
-                            term: term_intersection.clone(),
-                            reason: UnavailableMetadataTypes::Version(reason),
-                        },
+                        UnavailableReason::Version(reason),
                     ));
                     continue;
                 }
@@ -537,10 +511,7 @@ impl<'a, Provider: ResolverProvider, InstalledPackages: InstalledPackagesProvide
                         state.add_incompatibility(Incompatibility::custom_version(
                             package.clone(),
                             version.clone(),
-                            UnavailableReason {
-                                term: term_intersection.clone(),
-                                reason: UnavailableMetadataTypes::Version(reason),
-                            },
+                            UnavailableReason::Version(reason),
                         ));
                         continue;
                     }

crates/uv/tests/pip_compile.rs

@@ -4560,7 +4560,7 @@ fn no_index_requirements_txt() -> Result<()> {
 
     ----- stderr -----
       × No solution found when resolving dependencies:
-      ╰─▶ Because all versions of tqdm were not found in the provided package locations and you require tqdm, we can conclude that the requirements are unsatisfiable.
+      ╰─▶ Because tqdm was not found in the provided package locations and you require tqdm, we can conclude that the requirements are unsatisfiable.
 
           hint: Packages were unavailable because index lookups were disabled and no additional package locations were provided (try: `--find-links <uri>`)
     "###
@@ -4668,7 +4668,7 @@ fn offline_registry() -> Result<()> {
 
     ----- stderr -----
       × No solution found when resolving dependencies:
-      ╰─▶ Because black==23.10.1 was not found in the cache and you require black==23.10.1, we can conclude that the requirements are unsatisfiable.
+      ╰─▶ Because black was not found in the cache and you require black==23.10.1, we can conclude that the requirements are unsatisfiable.
 
           hint: Packages were unavailable because the network was disabled
     "###
@@ -4795,7 +4795,7 @@ fn offline_find_links() -> Result<()> {
 
     ----- stderr -----
       × No solution found when resolving dependencies:
-      ╰─▶ Because all versions of tqdm were not found in the cache and you require tqdm, we can conclude that the requirements are unsatisfiable.
+      ╰─▶ Because tqdm was not found in the cache and you require tqdm, we can conclude that the requirements are unsatisfiable.
 
           hint: Packages were unavailable because the network was disabled
     "###
@@ -4814,7 +4814,7 @@ fn offline_find_links() -> Result<()> {
 
     ----- stderr -----
       × No solution found when resolving dependencies:
-      ╰─▶ Because all versions of tqdm were not found in the cache and you require tqdm, we can conclude that the requirements are unsatisfiable.
+      ╰─▶ Because tqdm was not found in the cache and you require tqdm, we can conclude that the requirements are unsatisfiable.
 
           hint: Packages were unavailable because the network was disabled
     "###
@@ -5171,7 +5171,7 @@ fn index_url_in_requirements() -> Result<()> {
 
     ----- stderr -----
       × No solution found when resolving dependencies:
-      ╰─▶ Because anyio<4 was not found in the package registry and you require anyio<4, we can conclude that the requirements are unsatisfiable.
+      ╰─▶ Because anyio was not found in the package registry and you require anyio<4, we can conclude that the requirements are unsatisfiable.
     "###
     );
 

crates/uv/tests/pip_install.rs

@@ -994,7 +994,7 @@ fn install_no_index() {
 
     ----- stderr -----
       × No solution found when resolving dependencies:
-      ╰─▶ Because all versions of flask were not found in the provided package locations and you require flask, we can conclude that the requirements are unsatisfiable.
+      ╰─▶ Because flask was not found in the provided package locations and you require flask, we can conclude that the requirements are unsatisfiable.
 
           hint: Packages were unavailable because index lookups were disabled and no additional package locations were provided (try: `--find-links <uri>`)
     "###
@@ -1018,7 +1018,7 @@ fn install_no_index_version() {
 
     ----- stderr -----
       × No solution found when resolving dependencies:
-      ╰─▶ Because flask==3.0.0 was not found in the provided package locations and you require flask==3.0.0, we can conclude that the requirements are unsatisfiable.
+      ╰─▶ Because flask was not found in the provided package locations and you require flask==3.0.0, we can conclude that the requirements are unsatisfiable.
 
           hint: Packages were unavailable because index lookups were disabled and no additional package locations were provided (try: `--find-links <uri>`)
     "###
@@ -3564,7 +3564,7 @@ fn reinstall_no_index() {
 
     ----- stderr -----
       × No solution found when resolving dependencies:
-      ╰─▶ Because all versions of anyio were not found in the provided package locations and you require anyio, we can conclude that the requirements are unsatisfiable.
+      ╰─▶ Because anyio was not found in the provided package locations and you require anyio, we can conclude that the requirements are unsatisfiable.
 
           hint: Packages were unavailable because index lookups were disabled and no additional package locations were provided (try: `--find-links <uri>`)
     "###
@@ -3682,7 +3682,7 @@ fn already_installed_dependent_editable() {
 
     ----- stderr -----
       × No solution found when resolving dependencies:
-      ╰─▶ Because all versions of first-editable were not found in the provided package locations and second-editable==0.0.1 depends on first-editable, we can conclude that second-editable==0.0.1 cannot be used.
+      ╰─▶ Because first-editable was not found in the provided package locations and second-editable==0.0.1 depends on first-editable, we can conclude that second-editable==0.0.1 cannot be used.
           And because only second-editable==0.0.1 is available and you require second-editable, we can conclude that the requirements are unsatisfiable.
     "###
     );
@@ -3778,7 +3778,7 @@ fn already_installed_local_path_dependent() {
 
     ----- stderr -----
       × No solution found when resolving dependencies:
-      ╰─▶ Because all versions of first-local were not found in the provided package locations and second-local==0.1.0 depends on first-local, we can conclude that second-local==0.1.0 cannot be used.
+      ╰─▶ Because first-local was not found in the provided package locations and second-local==0.1.0 depends on first-local, we can conclude that second-local==0.1.0 cannot be used.
           And because only second-local==0.1.0 is available and you require second-local, we can conclude that the requirements are unsatisfiable.
     "###
     );
@@ -3818,7 +3818,7 @@ fn already_installed_local_path_dependent() {
 
     ----- stderr -----
       × No solution found when resolving dependencies:
-      ╰─▶ Because all versions of first-local were not found in the provided package locations and second-local==0.1.0 depends on first-local, we can conclude that second-local==0.1.0 cannot be used.
+      ╰─▶ Because first-local was not found in the provided package locations and second-local==0.1.0 depends on first-local, we can conclude that second-local==0.1.0 cannot be used.
           And because only second-local==0.1.0 is available and you require second-local, we can conclude that the requirements are unsatisfiable.
     "###
     );
@@ -3890,7 +3890,7 @@ fn already_installed_local_version_of_remote_package() {
 
     ----- stderr -----
       × No solution found when resolving dependencies:
-      ╰─▶ Because anyio==4.2.0 was not found in the provided package locations and you require anyio==4.2.0, we can conclude that the requirements are unsatisfiable.
+      ╰─▶ Because anyio was not found in the provided package locations and you require anyio==4.2.0, we can conclude that the requirements are unsatisfiable.
 
           hint: Packages were unavailable because index lookups were disabled and no additional package locations were provided (try: `--find-links <uri>`)
     "###
@@ -4143,7 +4143,7 @@ fn already_installed_remote_url() {
 
     ----- stderr -----
       × No solution found when resolving dependencies:
-      ╰─▶ Because all versions of uv-public-pypackage were not found in the provided package locations and you require uv-public-pypackage, we can conclude that the requirements are unsatisfiable.
+      ╰─▶ Because uv-public-pypackage was not found in the provided package locations and you require uv-public-pypackage, we can conclude that the requirements are unsatisfiable.
 
           hint: Packages were unavailable because index lookups were disabled and no additional package locations were provided (try: `--find-links <uri>`)
     "###);
@@ -4188,7 +4188,7 @@ fn already_installed_remote_url() {
 
     ----- stderr -----
       × No solution found when resolving dependencies:
-      ╰─▶ Because uv-public-pypackage==0.2.0 was not found in the provided package locations and you require uv-public-pypackage==0.2.0, we can conclude that the requirements are unsatisfiable.
+      ╰─▶ Because uv-public-pypackage was not found in the provided package locations and you require uv-public-pypackage==0.2.0, we can conclude that the requirements are unsatisfiable.
 
           hint: Packages were unavailable because index lookups were disabled and no additional package locations were provided (try: `--find-links <uri>`)
     "###);

crates/uv/tests/pip_install_scenarios.rs

@@ -91,7 +91,7 @@ fn requires_package_does_not_exist() {
 
     ----- stderr -----
       × No solution found when resolving dependencies:
-      ╰─▶ Because all versions of package-a were not found in the package registry and you require package-a, we can conclude that the requirements are unsatisfiable.
+      ╰─▶ Because package-a was not found in the package registry and you require package-a, we can conclude that the requirements are unsatisfiable.
     "###);
 
     assert_not_installed(
@@ -254,7 +254,7 @@ fn transitive_requires_package_does_not_exist() {
 
     ----- stderr -----
       × No solution found when resolving dependencies:
-      ╰─▶ Because all versions of package-b were not found in the package registry and package-a==1.0.0 depends on package-b, we can conclude that package-a==1.0.0 cannot be used.
+      ╰─▶ Because package-b was not found in the package registry and package-a==1.0.0 depends on package-b, we can conclude that package-a==1.0.0 cannot be used.
           And because only package-a==1.0.0 is available and you require package-a, we can conclude that the requirements are unsatisfiable.
     "###);