itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(tree): Don't look up nodes directly

Browse Source
This commit is contained in:
Ed Page 2025-02-26 13:43:05 -06:00
parent 7ea222d21d
commit 606cd71c38
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/cargo/ops/tree/graph.rs
View File

@ -126,8 +126,7 @@ impl<'a> Graph<'a> {
let from_index = self.nodes.len();
self.nodes.push(node);
self.edges.push(Edges::new());
self.index
.insert(self.nodes[from_index].clone(), from_index);
self.index.insert(self.node(from_index).clone(), from_index);
from_index
}
@ -136,7 +135,7 @@ impl<'a> Graph<'a> {
let edges = self.edges[from].of_kind(kind);
// Created a sorted list for consistent output.
let mut edges = edges.to_owned();
edges.sort_unstable_by(|a, b| self.nodes[a.node()].cmp(&self.nodes[b.node()]));
edges.sort_unstable_by(|a, b| self.node(a.node()).cmp(&self.node(b.node())));
edges
}
@ -173,8 +172,8 @@ impl<'a> Graph<'a> {
}
fn package_id_for_index(&self, index: usize) -> PackageId {
match self.nodes[index] {
Node::Package { package_id, .. } => package_id,
match self.node(index) {
Node::Package { package_id, .. } => *package_id,
Node::Feature { .. } => panic!("unexpected feature node"),
}
}
@ -509,7 +508,7 @@ fn add_feature(
to: Edge,
) -> (bool, usize) {
// `to` *must* point to a package node.
assert!(matches! {graph.nodes[to.node()], Node::Package{..}});
assert!(matches! {graph.node(to.node()), Node::Package{..}});
let node = Node::Feature {
node_index: to.node(),
name,