Skip to content

Commit 606cd71

Browse files
committed
refactor(tree): Don't look up nodes directly
1 parent 7ea222d commit 606cd71

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

src/cargo/ops/tree/graph.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,7 @@ impl<'a> Graph<'a> {
126126
let from_index = self.nodes.len();
127127
self.nodes.push(node);
128128
self.edges.push(Edges::new());
129-
self.index
130-
.insert(self.nodes[from_index].clone(), from_index);
129+
self.index.insert(self.node(from_index).clone(), from_index);
131130
from_index
132131
}
133132

@@ -136,7 +135,7 @@ impl<'a> Graph<'a> {
136135
let edges = self.edges[from].of_kind(kind);
137136
// Created a sorted list for consistent output.
138137
let mut edges = edges.to_owned();
139-
edges.sort_unstable_by(|a, b| self.nodes[a.node()].cmp(&self.nodes[b.node()]));
138+
edges.sort_unstable_by(|a, b| self.node(a.node()).cmp(&self.node(b.node())));
140139
edges
141140
}
142141

@@ -173,8 +172,8 @@ impl<'a> Graph<'a> {
173172
}
174173

175174
fn package_id_for_index(&self, index: usize) -> PackageId {
176-
match self.nodes[index] {
177-
Node::Package { package_id, .. } => package_id,
175+
match self.node(index) {
176+
Node::Package { package_id, .. } => *package_id,
178177
Node::Feature { .. } => panic!("unexpected feature node"),
179178
}
180179
}
@@ -509,7 +508,7 @@ fn add_feature(
509508
to: Edge,
510509
) -> (bool, usize) {
511510
// `to` *must* point to a package node.
512-
assert!(matches! {graph.nodes[to.node()], Node::Package{..}});
511+
assert!(matches! {graph.node(to.node()), Node::Package{..}});
513512
let node = Node::Feature {
514513
node_index: to.node(),
515514
name,

0 commit comments

Comments
 (0)