---

yaml
---
r: 148073
b: refs/heads/try2
c: 7e446af
h: refs/heads/master
i:
  148071: 5456aba
v: v3

Author: huonw

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 3395f9d6a10aa912ab88de2e8d5b4f7de407413a
+refs/heads/try2: 7e446af759e86e77a5f4a8e9bc6d6c22072b25ae
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/trie.rs

@@ -198,24 +198,24 @@ macro_rules! bound {
             addr!(loop {
                     let children = unsafe {addr!(& $($mut_)* (*node).children)};
                     let child_id = chunk(key, idx);
-                    match children[child_id] {
+                    let (slice_idx, ret) = match children[child_id] {
                         Internal(ref $($mut_)* n) => {
                             node = addr!(& $($mut_)* **n as * $($mut_)* TrieNode<T>);
+                            (child_id + 1, false)
                         }
                         External(stored, _) => {
-                            if stored < key || ($upper && stored == key) {
-                                it.stack.push(children.$slice_from(child_id + 1).$iter());
+                            (if stored < key || ($upper && stored == key) {
+                                child_id + 1
                             } else {
-                                it.stack.push(children.$slice_from(child_id).$iter());
-                            }
-                            return it;
+                                child_id
+                            }, true)
                         }
                         Nothing => {
-                            it.stack.push(children.$slice_from(child_id + 1).$iter());
-                            return it
+                            (child_id + 1, true)
                         }
-                    }
-                    it.stack.push(children.$slice_from(child_id + 1).$iter());
+                    };
+                    it.stack.push(children.$slice_from(slice_idx).$iter());
+                    if ret { return it }
                     idx += 1;
                 })
         }