From 3aaab32a9de7cb3de1b10d5ecef3590a48e32404 Mon Sep 17 00:00:00 2001
From: Charlie Marsh <charlie.r.marsh@gmail.com>
Date: Tue, 12 Dec 2023 12:41:18 -0500
Subject: [PATCH] Omit extra in resolver progress (#623)

Closes #621.
---
 crates/puffin-cli/src/commands/reporters.rs | 22 ++++-----------------
 crates/puffin-resolver/src/resolver.rs      | 16 ++++++---------
 2 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/crates/puffin-cli/src/commands/reporters.rs b/crates/puffin-cli/src/commands/reporters.rs
index 9902b1336..e61951861 100644
--- a/crates/puffin-cli/src/commands/reporters.rs
+++ b/crates/puffin-cli/src/commands/reporters.rs
@@ -6,7 +6,6 @@ use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
 use url::Url;
 
 use distribution_types::{CachedDist, Dist, Metadata, SourceDist, VersionOrUrl};
-use puffin_normalize::ExtraName;
 use puffin_normalize::PackageName;
 
 use crate::printer::Printer;
@@ -217,27 +216,14 @@ impl From<Printer> for ResolverReporter {
 }
 
 impl puffin_resolver::ResolverReporter for ResolverReporter {
-    fn on_progress(
-        &self,
-        name: &PackageName,
-        extra: Option<&ExtraName>,
-        version_or_url: VersionOrUrl,
-    ) {
-        match (extra, version_or_url) {
-            (None, VersionOrUrl::Version(version)) => {
+    fn on_progress(&self, name: &PackageName, version_or_url: VersionOrUrl) {
+        match version_or_url {
+            VersionOrUrl::Version(version) => {
                 self.progress.set_message(format!("{name}=={version}"));
             }
-            (None, VersionOrUrl::Url(url)) => {
+            VersionOrUrl::Url(url) => {
                 self.progress.set_message(format!("{name} @ {url}"));
             }
-            (Some(extra), VersionOrUrl::Version(version)) => {
-                self.progress
-                    .set_message(format!("{name}[{extra}]=={version}"));
-            }
-            (Some(extra), VersionOrUrl::Url(url)) => {
-                self.progress
-                    .set_message(format!("{name}[{extra}] @ {url}"));
-            }
         }
     }
 
diff --git a/crates/puffin-resolver/src/resolver.rs b/crates/puffin-resolver/src/resolver.rs
index 0f69b8d48..37f9cbbf7 100644
--- a/crates/puffin-resolver/src/resolver.rs
+++ b/crates/puffin-resolver/src/resolver.rs
@@ -24,7 +24,7 @@ use platform_tags::Tags;
 use puffin_cache::CanonicalUrl;
 use puffin_client::RegistryClient;
 use puffin_distribution::{DistributionDatabase, DistributionDatabaseError};
-use puffin_normalize::{ExtraName, PackageName};
+use puffin_normalize::PackageName;
 use puffin_traits::{BuildContext, OnceMap};
 use pypi_types::{IndexUrl, Metadata21};
 
@@ -711,15 +711,11 @@ impl<'a, Provider: ResolverProvider> Resolver<'a, Provider> {
         if let Some(reporter) = self.reporter.as_ref() {
             match package {
                 PubGrubPackage::Root(_) => {}
-                PubGrubPackage::Package(package_name, extra, Some(url)) => {
-                    reporter.on_progress(package_name, extra.as_ref(), VersionOrUrl::Url(url));
+                PubGrubPackage::Package(package_name, _extra, Some(url)) => {
+                    reporter.on_progress(package_name, VersionOrUrl::Url(url));
                 }
-                PubGrubPackage::Package(package_name, extra, None) => {
-                    reporter.on_progress(
-                        package_name,
-                        extra.as_ref(),
-                        VersionOrUrl::Version(version.into()),
-                    );
+                PubGrubPackage::Package(package_name, _extra, None) => {
+                    reporter.on_progress(package_name, VersionOrUrl::Version(version.into()));
                 }
             }
         }
@@ -736,7 +732,7 @@ pub type BuildId = usize;
 
 pub trait Reporter: Send + Sync {
     /// Callback to invoke when a dependency is resolved.
-    fn on_progress(&self, name: &PackageName, extra: Option<&ExtraName>, version: VersionOrUrl);
+    fn on_progress(&self, name: &PackageName, version: VersionOrUrl);
 
     /// Callback to invoke when the resolution is complete.
     fn on_complete(&self);