---

yaml
---
r: 27886
b: refs/heads/try
c: 75d3e3c
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: eb834fdb81930c676010a184db1eda9a622edc44
+refs/heads/try: 75d3e3c7553fd384dbedc5426cde5fb533222e21
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

branches/try/src/rustc/metadata/cstore.rs

@@ -96,7 +96,7 @@ fn get_crate_vers(cstore: cstore, cnum: ast::crate_num) -> @~str {
 fn set_crate_data(cstore: cstore, cnum: ast::crate_num,
                   data: crate_metadata) {
     p(cstore).metas.insert(cnum, data);
-    do vec::iter(decoder::get_crate_module_paths(data.data)) |dp| {
+    do vec::iter(decoder::get_crate_module_paths(data)) |dp| {
         let (did, path) = dp;
         let d = {crate: cnum, node: did.node};
         p(cstore).mod_path_map.insert(d, @path);

branches/try/src/rustc/metadata/decoder.rs

@@ -919,37 +919,18 @@ fn get_crate_vers(data: @~[u8]) -> @~str {
     };
 }
 
-fn list_crate_items(bytes: @~[u8], md: ebml::doc, out: io::Writer) {
-    out.write_str(~"=Items=\n");
-    let items = ebml::get_doc(md, tag_items);
-    do iter_crate_items(bytes) |tag, path, did| {
-      // Don't print out any metadata info about intrinsics
-       if tag != tag_paths_foreign_path {
-            out.write_str(fmt!{"%s (%s)\n", path,
-                               describe_def(items, did)});
-       }
+fn iter_crate_items(cdata: cmd, proc: fn(~str, ast::def_id)) {
+    for each_path(cdata) |path_entry| {
+        match path_entry.def_like {
+            dl_impl(*) | dl_field => {}
+            dl_def(def) => {
+                proc(path_entry.path_string, ast_util::def_id_of_def(def))
+            }
+        }
     }
-    out.write_str(~"\n");
-}
-
-fn iter_crate_items(bytes: @~[u8], proc: fn(uint, ~str, ast::def_id)) {
-    let md = ebml::doc(bytes);
-    let paths = ebml::get_doc(md, tag_paths);
-    let index = ebml::get_doc(paths, tag_index);
-    let bs = ebml::get_doc(index, tag_index_buckets);
-    for ebml::tagged_docs(bs, tag_index_buckets_bucket) |bucket| {
-        let et = tag_index_buckets_bucket_elt;
-        for ebml::tagged_docs(bucket, et) |elt| {
-            let data = read_path(elt);
-            let {tag:t, doc:def} = ebml::doc_at(bytes, data.pos);
-            let did_doc = ebml::get_doc(def, tag_def_id);
-            let did = ebml::with_doc_data(did_doc, |d| parse_def_id(d));
-            proc(t, data.path, did);
-        };
-    };
 }
 
-fn get_crate_module_paths(bytes: @~[u8]) -> ~[(ast::def_id, ~str)] {
+fn get_crate_module_paths(cdata: cmd) -> ~[(ast::def_id, ~str)] {
     fn mod_of_path(p: ~str) -> ~str {
         str::connect(vec::init(str::split_str(p, ~"::")), ~"::")
     }
@@ -958,7 +939,7 @@ fn get_crate_module_paths(bytes: @~[u8]) -> ~[(ast::def_id, ~str)] {
     // fowarded path due to renamed import or reexport
     let mut res = ~[];
     let mods = map::str_hash();
-    do iter_crate_items(bytes) |_tag, path, did| {
+    do iter_crate_items(cdata) |path, did| {
         let m = mod_of_path(path);
         if str::is_not_empty(m) {
             // if m has a sub-item, it must be a module
@@ -980,7 +961,6 @@ fn list_crate_metadata(bytes: @~[u8], out: io::Writer) {
     let md = ebml::doc(bytes);
     list_crate_attributes(md, hash, out);
     list_crate_deps(bytes, out);
-    list_crate_items(bytes, md, out);
 }
 
 // Translates a def_id from an external crate to a def_id for the current