rebasing

Author: Nick Cameron

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