rustc: Resolve external modules and native modules to definition IDs as well

1 files changed, 8 insertions, 5 deletions

diff --git a/src/comp/front/creader.rs b/src/comp/front/creader.rs
index 735dbcb4..a08de2ab 100644
--- a/src/comp/front/creader.rs
+++ b/src/comp/front/creader.rs
@@ -360,6 +360,7 @@ impure fn move_to_item(&ebml.reader ebml_r, int item_id) {
     }
 
     log #fmt("move_to_item: item not found: %d", item_id);
+    fail;
 }
 
 // Looks up an item in the given metadata and returns an EBML reader pointing
@@ -559,11 +560,13 @@ fn lookup_def(session.session sess, &span sp, int cnum, vec[ast.ident] path)
     did = tup(cnum, did._1);
 
     // FIXME: It'd be great if we had u8 char literals.
-    if (kind_ch == ('c' as u8))      { ret ast.def_const(did);  }
-    else if (kind_ch == ('f' as u8)) { ret ast.def_fn(did);     }
-    else if (kind_ch == ('y' as u8)) { ret ast.def_ty(did);     }
-    else if (kind_ch == ('o' as u8)) { ret ast.def_obj(did);    }
-    else if (kind_ch == ('t' as u8)) { ret ast.def_ty(did);     }
+    if (kind_ch == ('c' as u8))      { ret ast.def_const(did);      }
+    else if (kind_ch == ('f' as u8)) { ret ast.def_fn(did);         }
+    else if (kind_ch == ('y' as u8)) { ret ast.def_ty(did);         }
+    else if (kind_ch == ('o' as u8)) { ret ast.def_obj(did);        }
+    else if (kind_ch == ('t' as u8)) { ret ast.def_ty(did);         }
+    else if (kind_ch == ('m' as u8)) { ret ast.def_mod(did);        }
+    else if (kind_ch == ('n' as u8)) { ret ast.def_native_mod(did); }
     else if (kind_ch == ('v' as u8)) {
         auto tid = get_variant_tag_id(ebml_r);
         tid = tup(cnum, tid._1);