---

yaml
---
r: 95046
b: refs/heads/dist-snap
c: abcca1c
h: refs/heads/master
v: v3

Author: blake2-ppc

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 8e69c05b7c31b213c98f1682e65018ba112d5579
+refs/heads/dist-snap: abcca1c7d1136e64db2853b3c7e38a0417155b97
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/metadata/encoder.rs

@@ -1574,7 +1574,7 @@ fn encode_crate_deps(ecx: &EncodeContext,
 fn encode_lang_items(ecx: &EncodeContext, ebml_w: &mut writer::Encoder) {
     ebml_w.start_tag(tag_lang_items);
 
-    do ecx.tcx.lang_items.each_item |def_id, i| {
+    for (i, def_id) in ecx.tcx.lang_items.items() {
         for id in def_id.iter() {
             if id.crate == LOCAL_CRATE {
                 ebml_w.start_tag(tag_lang_items_item);
@@ -1590,8 +1590,7 @@ fn encode_lang_items(ecx: &EncodeContext, ebml_w: &mut writer::Encoder) {
                 ebml_w.end_tag();   // tag_lang_items_item
             }
         }
-        true
-    };
+    }
 
     ebml_w.end_tag();   // tag_lang_items
 }

branches/dist-snap/src/librustc/middle/lang_items.rs

@@ -32,6 +32,8 @@ use syntax::visit;
 use syntax::visit::Visitor;
 
 use std::hashmap::HashMap;
+use std::iter::Enumerate;
+use std::vec;
 
 pub enum LangItem {
     FreezeTraitLangItem,               // 0
@@ -92,8 +94,8 @@ impl LanguageItems {
         }
     }
 
-    pub fn each_item(&self, f: &fn(Option<DefId>, uint) -> bool) -> bool {
-        self.items.iter().enumerate().advance(|(i, &item)| f(item, i))
+    pub fn items<'a>(&'a self) -> Enumerate<vec::VecIterator<'a, Option<DefId>>> {
+        self.items.iter().enumerate()
     }
 
     pub fn item_name(index: uint) -> &'static str {