Use a custom pubgrub report formatter (#521)

Uses astral-sh/pubgrub#10 to drastically simplify
our reporter implementation. This will allow us to make use of upstream
improvements to the reporter e.g.
astral-sh/pubgrub#8 without multiple duplicative
pull requests.

Cargo.toml

@@ -50,7 +50,7 @@ once_cell = { version = "1.18.0" }
 petgraph = { version = "0.6.4" }
 platform-info = { version = "2.0.2" }
 plist = { version = "1.6.0" }
-pubgrub = { git = "https://github.com/zanieb/pubgrub", rev = "725b9a8e323c9ae0727fed2d045bad64eb212167" }
+pubgrub = { git = "https://github.com/zanieb/pubgrub", rev = "c4ffd26715df9f21067983b0eb176dfd14876133" }
 pyo3 = { version = "0.20.0" }
 pyo3-log = { version = "0.9.0"}
 pyproject-toml = { version = "0.8.0" }

crates/puffin-resolver/src/error.rs

@@ -1,7 +1,7 @@
 use std::fmt::Formatter;
 
 use pubgrub::range::Range;
-use pubgrub::report::Reporter;
+use pubgrub::report::{DefaultStringReporter, Reporter};
 use thiserror::Error;
 use url::Url;
 
@@ -11,7 +11,7 @@ use puffin_distribution::DistributionDatabaseError;
 use puffin_normalize::PackageName;
 
 use crate::pubgrub::{PubGrubPackage, PubGrubVersion};
-use crate::ResolutionFailureReporter;
+use crate::PubGrubReportFormatter;
 
 #[derive(Error, Debug)]
 pub enum ResolveError {
@@ -78,7 +78,8 @@ impl std::error::Error for RichPubGrubError {}
 impl std::fmt::Display for RichPubGrubError {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         if let pubgrub::error::PubGrubError::NoSolution(derivation_tree) = &self.source {
-            let report = ResolutionFailureReporter::report(derivation_tree);
+            let formatter = PubGrubReportFormatter;
+            let report = DefaultStringReporter::report_with_formatter(derivation_tree, &formatter);
             write!(f, "{report}")
         } else {
             write!(f, "{}", self.source)

crates/puffin-resolver/src/lib.rs

@@ -2,7 +2,7 @@ pub use error::ResolveError;
 pub use finder::{DistFinder, Reporter as FinderReporter};
 pub use manifest::Manifest;
 pub use prerelease_mode::PreReleaseMode;
-pub use pubgrub::ResolutionFailureReporter;
+pub use pubgrub::PubGrubReportFormatter;
 pub use resolution::Graph;
 pub use resolution_mode::ResolutionMode;
 pub use resolution_options::ResolutionOptions;

crates/puffin-resolver/src/pubgrub/mod.rs

@@ -1,6 +1,6 @@
 pub(crate) use crate::pubgrub::package::PubGrubPackage;
 pub(crate) use crate::pubgrub::priority::{PubGrubPriorities, PubGrubPriority};
-pub use crate::pubgrub::report::ResolutionFailureReporter;
+pub use crate::pubgrub::report::PubGrubReportFormatter;
 
 pub(crate) use crate::pubgrub::version::{PubGrubVersion, MIN_VERSION};