---

yaml
---
r: 81995
b: refs/heads/master
c: abcca1c
h: refs/heads/master
i:
  81993: adff9f9
  81991: 9dd59f8
v: v3

Author: blake2-ppc

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8e69c05b7c31b213c98f1682e65018ba112d5579
+refs/heads/master: abcca1c7d1136e64db2853b3c7e38a0417155b97
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
 refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729

trunk/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
 }

trunk/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 {