about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNick Cameron <ncameron@mozilla.com>2016-01-26 18:28:31 +1300
committerNick Cameron <ncameron@mozilla.com>2016-01-26 18:28:31 +1300
commit7b47f5e34e92d12eea2efe0dcc790e0ebf673e14 (patch)
tree9d803bd05b59cc3801ad745094686220d5fc5269
parent0b511e82abe48f40808453de2f013e7c5ebab4c3 (diff)
downloadrust-7b47f5e34e92d12eea2efe0dcc790e0ebf673e14.tar.gz
rust-7b47f5e34e92d12eea2efe0dcc790e0ebf673e14.zip
rebasing
-rw-r--r--src/librustc_driver/driver.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs
index 87ac9a2052b..6189416dd57 100644
--- a/src/librustc_driver/driver.rs
+++ b/src/librustc_driver/driver.rs
@@ -778,7 +778,7 @@ pub fn phase_3_run_analysis_passes<'tcx, F, R>(sess: &'tcx Session,
 
         time(time_passes,
              "const checking",
-             || middle::check_const::check_crate(tcx));
+             || consts::check_crate(tcx));
 
         let access_levels =
             time(time_passes, "privacy checking", || {
@@ -819,7 +819,7 @@ pub fn phase_3_run_analysis_passes<'tcx, F, R>(sess: &'tcx Session,
 
         time(time_passes,
              "rvalue checking",
-             || middle::check_rvalues::check_crate(tcx));
+             || rvalues::check_crate(tcx));
 
         // Avoid overwhelming user with errors if type checking failed.
         // I'm not sure how helpful this is, to be honest, but it avoids