about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-04-16 13:44:22 +0000
committerbors <bors@rust-lang.org>2017-04-16 13:44:22 +0000
commitfef1026bae4a0cc59c4bd204021eea4e1a976b4f (patch)
treef7bf0f5b161acce9413cfdbaed1992d76b33398e /src
parent13fd5e93deb41045c4de88c257d2b02ada2b1730 (diff)
parentc5979945daf502a690514b117dbbb4d20f1528cd (diff)
downloadrust-fef1026bae4a0cc59c4bd204021eea4e1a976b4f.tar.gz
rust-fef1026bae4a0cc59c4bd204021eea4e1a976b4f.zip
Auto merge of #41308 - eddyb:order-must-be-preserved, r=nagisa
[rustbuild] Side-step HashMap iteration to preserve command-line step order.

The new `HashMap` was introduced by #41227 and it accidentally randomized step order.

r? @alexcrichton
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/step.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/step.rs b/src/bootstrap/step.rs
index 6008fa81c66..34705040e8a 100644
--- a/src/bootstrap/step.rs
+++ b/src/bootstrap/step.rs
@@ -1217,8 +1217,8 @@ invalid rule dependency graph detected, was a rule added and maybe typo'd?
         let mut visited = HashSet::new();
         visited.insert(0);
         let idx_to_node = nodes.iter().map(|p| (*p.1, p.0)).collect::<HashMap<_, _>>();
-        for idx in nodes.values() {
-            self.topo_sort(*idx, &idx_to_node, &edges, &mut visited, &mut order);
+        for idx in 0..nodes.len() {
+            self.topo_sort(idx, &idx_to_node, &edges, &mut visited, &mut order);
         }
         return order
     }