---

yaml
---
r: 21207
b: refs/heads/snap-stage3
c: 10c997a
h: refs/heads/master
i:
  21205: 4267c30
  21203: 74ed1ee
  21199: 6d8207c
v: v3

Author: pcwalton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 1ed94a56744c0ed4056c22da297d84222f4327f2
+refs/heads/snap-stage3: 10c997a746178085b6b447a76e237dd08c5446fa
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/rustc/metadata/encoder.rs

@@ -262,32 +262,26 @@ fn encode_info_for_mod(ecx: @encode_ctxt, ebml_w: ebml::writer, md: _mod,
     encode_family(ebml_w, 'm');
     encode_name(ebml_w, name);
     debug!{"(encoding info for module) encoding info for module ID %d", id};
-    // the impl map contains ref_ids
-    let impls = ecx.impl_map(id);
-    for impls.each |i| {
-        let (ident, did) = i;
-        debug!{"(encoding info for module) ... encoding impl %s (%?/%?), \
-                exported? %?",
-               *ident,
-               did,
-               ast_map::node_id_to_str(ecx.tcx.items, did.node),
-               ast_util::is_exported(ident, md)};
-
-        ebml_w.start_tag(tag_mod_impl);
-        match ecx.tcx.items.find(did.node) {
-          some(ast_map::node_item(it@@{node: cl@item_class(*),_},_)) => {
-        /* If did stands for a trait
-        ref, we need to map it to its parent class */
-            ebml_w.wr_str(def_to_str(local_def(it.id)));
-          }
-          _ => {
-            // Must be a re-export, then!
-            // ...or a trait ref
-            ebml_w.wr_str(def_to_str(did));
-          }
-        };
-        ebml_w.end_tag();
-    } // for
+
+    // Encode info about all the module children.
+    for md.items.each |item| {
+        match item.node {
+            item_impl(*) | item_class(*) => {
+                let (ident, did) = (item.ident, item.id);
+                debug!{"(encoding info for module) ... encoding impl %s \
+                        (%?/%?), exported? %?",
+                       *ident,
+                       did,
+                       ast_map::node_id_to_str(ecx.tcx.items, did),
+                       ast_util::is_exported(ident, md)};
+
+                ebml_w.start_tag(tag_mod_impl);
+                ebml_w.wr_str(def_to_str(local_def(did)));
+                ebml_w.end_tag();
+            }
+            _ => {} // XXX: Encode these too.
+        }
+    }
 
     encode_path(ebml_w, path, ast_map::path_mod(name));