From 89490e416b9eff7d22cbea235475db1cba581ff6 Mon Sep 17 00:00:00 2001 From: Marijn Haverbeke Date: Fri, 13 May 2011 10:51:36 +0200 Subject: Change resolve to use walk instead of fold Possibly, at some point, we should add a state-passing variant of walk, or a wrapper that makes it easier to thread state. (See the repetetive pop_state_for_* functions in this commit.) --- src/comp/driver/rustc.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/comp/driver') diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs index 5d5ba1d5..ad89ac9c 100644 --- a/src/comp/driver/rustc.rs +++ b/src/comp/driver/rustc.rs @@ -92,10 +92,8 @@ fn compile_input(session::session sess, crate = time(time_passes, "external crate reading", bind creader::read_crates(sess, crate)); - auto res = time(time_passes, "resolution", - bind resolve::resolve_crate(sess, crate)); - crate = res._0; - auto def_map = res._1; + auto def_map = time(time_passes, "resolution", + bind resolve::resolve_crate(sess, crate)); time[()](time_passes, "capture checking", bind capture::check_for_captures(sess, crate, def_map)); -- cgit v1.2.3