---

yaml
---
r: 11994
b: refs/heads/master
c: f3ed738
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: b994b17be807c7041e8d29b628df238d2a0cb0c9
+refs/heads/master: f3ed738399e0c3c6fba5f3c0e4aca1e3d36bdbf8
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/middle/resolve.rs

@@ -17,7 +17,7 @@ import std::list::{list, nil, cons};
 import option::{is_none, is_some};
 import syntax::print::pprust::*;
 
-export resolve_crate, resolve_crate_reexports;
+export resolve_crate;
 export def_map, ext_map, exp_map, impl_map;
 export _impl, iscopes, method_info;
 
@@ -166,16 +166,6 @@ fn resolve_crate(sess: session, amap: ast_map::map, crate: @ast::crate) ->
     ret {def_map: e.def_map, exp_map: e.exp_map, impl_map: e.impl_map};
 }
 
-// Used by rustdoc
-fn resolve_crate_reexports(sess: session, amap: ast_map::map,
-                           crate: @ast::crate) -> exp_map {
-    let e = create_env(sess, amap);
-    map_crate(e, crate);
-    resolve_imports(*e);
-    check_exports(e);
-    ret e.exp_map;
-}
-
 fn create_env(sess: session, amap: ast_map::map) -> @env {
     @{cstore: sess.cstore,
       def_map: int_hash(),

trunk/src/rustdoc/astsrv.rs

@@ -30,7 +30,8 @@ export exec;
 type ctxt = {
     ast: @ast::crate,
     ast_map: ast_map::map,
-    exp_map: resolve::exp_map
+    exp_map: resolve::exp_map,
+    impl_map: resolve::impl_map
 };
 
 type srv_owner<T> = fn(srv: srv) -> T;
@@ -111,13 +112,14 @@ fn build_ctxt(sess: session::session, ast: @ast::crate,
     let ast = front::test::modify_for_testing(sess, ast);
     let ast_map = ast_map::map_crate(sess, *ast);
     *ignore_errors = true;
-    let exp_map = resolve::resolve_crate_reexports(sess, ast_map, ast);
+    let {exp_map, impl_map, _} = resolve::resolve_crate(sess, ast_map, ast);
     *ignore_errors = false;
 
     {
         ast: ast,
         ast_map: ast_map,
-        exp_map: exp_map
+        exp_map: exp_map,
+        impl_map: impl_map
     }
 }