rustc: Switch over to resolve3

1 files changed, 3 insertions, 20 deletions

diff --git a/src/rustc/driver/driver.rs b/src/rustc/driver/driver.rs
index 799f34377ed..606bcd77e1a 100644
--- a/src/rustc/driver/driver.rs
+++ b/src/rustc/driver/driver.rs
@@ -168,26 +168,9 @@ fn compile_upto(sess: session, cfg: ast::crate_cfg,
                              session::sess_os_to_meta_os(sess.targ_cfg.os),
                              sess.opts.static));
 
-    let mut def_map;
-    let mut impl_map;
-    let mut exp_map;
-    if sess.fast_resolve() {
-        let { def_map: fast_dm, exp_map: fast_em, impl_map: fast_im } =
-            time(time_passes, "fast resolution", ||
-                 middle::resolve3::resolve_crate(sess, ast_map, crate));
-
-        def_map = fast_dm;
-        impl_map = fast_im;
-        exp_map = fast_em;
-    } else {
-        let { def_map: normal_dm, exp_map: normal_em, impl_map: normal_im } =
-            time(time_passes, "resolution", ||
-                 resolve::resolve_crate(sess, ast_map, crate));
-
-        def_map = normal_dm;
-        impl_map = normal_im;
-        exp_map = normal_em;
-    }
+    let { def_map: def_map, exp_map: exp_map, impl_map: impl_map } =
+        time(time_passes, "resolution", ||
+             middle::resolve3::resolve_crate(sess, ast_map, crate));
 
     let freevars = time(time_passes, "freevar finding", ||
         freevars::annotate_freevars(def_map, crate));