From 94a0a0f2ee6ab8d20259b3080343616412446e0a Mon Sep 17 00:00:00 2001
From: Andrew Gallant <andrew@astral.sh>
Date: Wed, 21 Aug 2024 13:34:12 -0400
Subject: [PATCH] uv-resolver: rejigger 'trace_resolution'

When I first wrote this routine, it was intended to only emit a trace
for the final "unioned" resolution. But we actually moved that semantic
operation to the construction of the resolution *graph*. So there is no
unioned `Resolution` any more.

But this is still useful to see. So I changed this to just emit a trace
of *every* resolution right before constructing the graph.

It might be nice to also emit a trace of the unioned graph too. Or
perhaps we should do that instead if this proves too noisy. (Although
this is only emitted at TRACE level.)
---
 crates/uv-resolver/src/resolver/mod.rs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/crates/uv-resolver/src/resolver/mod.rs b/crates/uv-resolver/src/resolver/mod.rs
index c5f774ecb63f..b9bd978197bd 100644
--- a/crates/uv-resolver/src/resolver/mod.rs
+++ b/crates/uv-resolver/src/resolver/mod.rs
@@ -366,7 +366,6 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
                         );
                     }
 
-                    Self::trace_resolution(&resolution);
                     resolutions.push(resolution);
                     continue 'FORK;
                 };
@@ -563,6 +562,7 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
                     resolution.nodes.len()
                 );
             }
+            Self::trace_resolution(resolution);
         }
         ResolutionGraph::from_state(
             &resolutions,
@@ -579,7 +579,7 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
     }
 
     /// When trace level logging is enabled, we dump the final
-    /// unioned resolution, including markers, to help with
+    /// set of resolutions, including markers, to help with
     /// debugging. Namely, this tells use precisely the state
     /// emitted by the resolver before going off to construct a
     /// resolution graph.
@@ -587,9 +587,14 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
         if !tracing::enabled!(Level::TRACE) {
             return;
         }
+        if let Some(markers) = combined.markers.fork_markers() {
+            trace!("Resolution: {:?}", markers);
+        } else {
+            trace!("Resolution: <matches all marker environments>");
+        }
         for edge in &combined.edges {
             trace!(
-                "Resolution: {} -> {}",
+                "Resolution edge: {} -> {}",
                 edge.from
                     .as_ref()
                     .map(PackageName::as_str)
@@ -619,7 +624,7 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
             if let Some(marker) = edge.marker.contents() {
                 write!(msg, " ; {marker}").unwrap();
             }
-            trace!("Resolution:     {msg}");
+            trace!("Resolution edge:     {msg}");
         }
     }