rustc: Fix the collision with Tim's change

src/rustc/metadata/decoder.rs

@@ -457,7 +457,10 @@ fn each_path(cdata: cmd, f: fn(path_entry) -> bool) {
 
     let outer_paths = ebml::get_doc(root, tag_paths);
     let inner_paths = ebml::get_doc(outer_paths, tag_paths);
-    do ebml::tagged_docs(inner_paths, tag_paths_data_item) |path_doc| {
+
+    fn g(cdata: cmd, items: ebml::doc, path_doc: ebml::doc, &broken: bool,
+         f: fn(path_entry) -> bool) {
+
         if !broken {
             let path = item_name(path_doc);
 
@@ -486,6 +489,14 @@ fn each_path(cdata: cmd, f: fn(path_entry) -> bool) {
             }
         }
     }
+
+    do ebml::tagged_docs(inner_paths, tag_paths_data_item) |path_doc| {
+        g(cdata, items, path_doc, broken, f);
+    }
+
+    do ebml::tagged_docs(inner_paths, tag_paths_foreign_path) |path_doc| {
+        g(cdata, items, path_doc, broken, f);
+    }
 }
 
 fn get_item_path(cdata: cmd, id: ast::node_id) -> ast_map::path {

src/rustc/middle/resolve3.rs

@@ -1264,6 +1264,11 @@ fn build_reduced_graph_for_external_crate(root: @Module) {
                                                 }
                                             }
 
+                                            #debug("(building reduced graph \
+                                                     for external crate) \
+                                                     ... creating import \
+                                                     resolution");
+
                                             new_parent.import_resolutions.
                                                 insert(atom, resolution);
                                         }