Rename to nodes

astral-sh · Jul 22, 2024 · 0a08734 · 0a08734
1 parent b002213
commit 0a08734
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/crates/uv-resolver/src/resolution/graph.rs b/crates/uv-resolver/src/resolution/graph.rs
@@ -73,16 +73,16 @@ impl ResolutionGraph {
         );
 
         let mut petgraph: Graph<ResolutionGraphNode, Option<MarkerTree>, Directed> =
-            Graph::with_capacity(resolution.packages.len(), resolution.packages.len());
+            Graph::with_capacity(resolution.nodes.len(), resolution.nodes.len());
         let mut inverse: FxHashMap<NodeKey, NodeIndex<u32>> =
-            FxHashMap::with_capacity_and_hasher(resolution.packages.len(), FxBuildHasher);
+            FxHashMap::with_capacity_and_hasher(resolution.nodes.len(), FxBuildHasher);
         let mut diagnostics = Vec::new();
 
         // Add the root node.
         let root_index = petgraph.add_node(ResolutionGraphNode::Root);
 
         // Add every package to the graph.
-        for (package, versions) in &resolution.packages {
+        for (package, versions) in &resolution.nodes {
             let ResolutionPackage {
                 name,
                 extra,

diff --git a/crates/uv-resolver/src/resolver/mod.rs b/crates/uv-resolver/src/resolver/mod.rs
@@ -382,7 +382,7 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
                     let resolution = state.into_resolution();
 
                     // Walk over the selected versions, and mark them as preferences.
-                    for (package, versions) in &resolution.packages {
+                    for (package, versions) in &resolution.nodes {
                         if let Entry::Vacant(entry) = preferences.entry(package.name.clone()) {
                             if let Some(version) = versions.iter().next() {
                                 entry.insert(version.clone().into());
@@ -2351,7 +2351,7 @@ impl ForkState {
             .collect();
 
         Resolution {
-            packages,
+            nodes: packages,
             edges: dependencies,
             pins: self.pins,
         }
@@ -2364,7 +2364,7 @@ impl ForkState {
 /// version specifiers to support diverging versions and requirements in different forks.
 #[derive(Debug, Default)]
 pub(crate) struct Resolution {
-    pub(crate) packages: FxHashMap<ResolutionPackage, FxHashSet<Version>>,
+    pub(crate) nodes: FxHashMap<ResolutionPackage, FxHashSet<Version>>,
     /// If `foo` requires `bar>=3` and `foo` requires `bar <3` in another fork, we'd store it as
     /// `(foo, bar) -> {>=3, <3}`.
     pub(crate) edges: FxHashSet<ResolutionDependencyEdge>,
@@ -2401,8 +2401,8 @@ pub(crate) struct ResolutionDependencyEdge {
 
 impl Resolution {
     fn union(&mut self, other: Resolution) {
-        for (other_package, other_versions) in other.packages {
-            self.packages
+        for (other_package, other_versions) in other.nodes {
+            self.nodes
                 .entry(other_package)
                 .or_default()
                 .extend(other_versions);