---

yaml
---
r: 20966
b: refs/heads/snap-stage3
c: 76d04af
h: refs/heads/master
v: v3

Author: msullivan

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 19c86c1e71fd17d88f0d3ffdf31987db5876dcd2
+refs/heads/snap-stage3: 76d04af71a64e9c79ea21c8d4b956ef0591e3c61
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

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

@@ -122,8 +122,7 @@ fn item_parent_item(d: ebml::doc) -> option<ast::def_id> {
     none
 }
 
-// XXX: This has nothing to do with classes.
-fn class_member_id(d: ebml::doc, cdata: cmd) -> ast::def_id {
+fn item_def_id(d: ebml::doc, cdata: cmd) -> ast::def_id {
     let tagdoc = ebml::get_doc(d, tag_def_id);
     return translate_def_id(cdata, ebml::with_doc_data(tagdoc,
                                                     |d| parse_def_id(d)));
@@ -358,7 +357,7 @@ fn get_class_method(cdata: cmd, id: ast::node_id,
                               when looking up method %s", *name})
     };
     for ebml::tagged_docs(cls_items, tag_item_trait_method) |mid| {
-        let m_did = class_member_id(mid, cdata);
+        let m_did = item_def_id(mid, cdata);
         if item_name(mid) == name {
             found = some(m_did);
         }
@@ -432,7 +431,7 @@ fn each_path(cdata: cmd, f: fn(path_entry) -> bool) {
                                                      ~"::");
             if name != ~"" {
                 // Extract the def ID.
-                let def_id = class_member_id(item_doc, cdata);
+                let def_id = item_def_id(item_doc, cdata);
 
                 // Construct the def for this item.
                 debug!{"(each_path) yielding explicit item: %s", name};
@@ -467,7 +466,7 @@ fn each_path(cdata: cmd, f: fn(path_entry) -> bool) {
             let path = item_name(path_doc);
 
             // Extract the def ID.
-            let def_id = class_member_id(path_doc, cdata);
+            let def_id = item_def_id(path_doc, cdata);
 
             // Get the item.
             match maybe_find_item(def_id.node, items) {
@@ -738,7 +737,7 @@ fn get_class_members(cdata: cmd, id: ast::node_id,
        let f = item_family(an_item);
        if p(f) {
           let name = item_name(an_item);
-          let did = class_member_id(an_item, cdata);
+          let did = item_def_id(an_item, cdata);
           let mt = field_mutability(an_item);
           vec::push(result, {ident: name, id: did, vis:
                   family_to_visibility(f), mutability: mt});