Skip to content

Commit 5cfcf20

Browse files
committed
rustc: Cleanup unused ext_map
1 parent 5e3ffb6 commit 5cfcf20

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

src/comp/driver/rustc.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,15 +163,15 @@ fn compile_input(sess: session::session, cfg: ast::crate_cfg, input: str,
163163
bind middle::ast_map::map_crate(*crate));
164164
time(time_passes, "external crate/lib resolution",
165165
bind creader::read_crates(sess, *crate));
166-
let {def_map, ext_map, exp_map, impl_map} =
166+
let {def_map, exp_map, impl_map} =
167167
time(time_passes, "resolution",
168168
bind resolve::resolve_crate(sess, ast_map, crate));
169169
let freevars =
170170
time(time_passes, "freevar finding",
171171
bind freevars::annotate_freevars(def_map, crate));
172172
time(time_passes, "const checking",
173173
bind middle::check_const::check_crate(sess, crate));
174-
let ty_cx = ty::mk_ctxt(sess, def_map, ext_map, ast_map, freevars);
174+
let ty_cx = ty::mk_ctxt(sess, def_map, ast_map, freevars);
175175
let method_map = time(time_passes, "typechecking",
176176
bind typeck::check_crate(ty_cx, impl_map, crate));
177177
time(time_passes, "block-use checking",
@@ -270,10 +270,10 @@ fn pretty_print_input(sess: session::session, cfg: ast::crate_cfg, input: str,
270270
ppm_typed. {
271271
crate = syntax::ext::expand::expand_crate(sess, crate);
272272
let amap = middle::ast_map::map_crate(*crate);
273-
let {def_map, ext_map, impl_map, _} =
273+
let {def_map, impl_map, _} =
274274
resolve::resolve_crate(sess, amap, crate);
275275
let freevars = freevars::annotate_freevars(def_map, crate);
276-
let ty_cx = ty::mk_ctxt(sess, def_map, ext_map, amap, freevars);
276+
let ty_cx = ty::mk_ctxt(sess, def_map, amap, freevars);
277277
typeck::check_crate(ty_cx, impl_map, crate);
278278
ann = {pre: ann_paren_for_expr, post: bind ann_typed_post(ty_cx, _)};
279279
}

src/comp/middle/resolve.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,7 @@ tag dir { inside; outside; }
151151
tag namespace { ns_value; ns_type; ns_module; }
152152

153153
fn resolve_crate(sess: session, amap: ast_map::map, crate: @ast::crate) ->
154-
{def_map: def_map, ext_map: ext_map,
155-
exp_map: exp_map, impl_map: impl_map} {
154+
{def_map: def_map, exp_map: exp_map, impl_map: impl_map} {
156155
let e =
157156
@{cstore: sess.get_cstore(),
158157
def_map: new_int_hash(),
@@ -178,8 +177,7 @@ fn resolve_crate(sess: session, amap: ast_map::map, crate: @ast::crate) ->
178177
if sess.get_opts().warn_unused_imports {
179178
check_unused_imports(e);
180179
}
181-
ret {def_map: e.def_map, ext_map: e.ext_map,
182-
exp_map: e.exp_map, impl_map: e.impl_map};
180+
ret {def_map: e.def_map, exp_map: e.exp_map, impl_map: e.impl_map};
183181
}
184182

185183
// Locate all modules and imports and index them, so that the next passes can

src/comp/middle/ty.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,8 +411,7 @@ fn mk_rcache() -> creader_cache {
411411
}
412412

413413

414-
fn mk_ctxt(s: session::session, dm: resolve::def_map,
415-
_em: hashmap<def_id, [ident]>, amap: ast_map::map,
414+
fn mk_ctxt(s: session::session, dm: resolve::def_map, amap: ast_map::map,
416415
freevars: freevars::freevar_map) -> ctxt {
417416
let ntt: node_type_table =
418417
@smallintmap::mk::<ty::ty_param_substs_opt_and_ty>();

0 commit comments

Comments
 (0)