From 9c4898eaddd7e54ba442899e0a6b2acf4d14f6c4 Mon Sep 17 00:00:00 2001 From: Ariel Ben-Yehuda Date: Wed, 20 Sep 2017 16:34:31 +0300 Subject: [PATCH] address review comments --- src/librustc/mir/mod.rs | 2 +- src/librustc_driver/driver.rs | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/librustc/mir/mod.rs b/src/librustc/mir/mod.rs index a5fe4828453..ba221ef6ae1 100644 --- a/src/librustc/mir/mod.rs +++ b/src/librustc/mir/mod.rs @@ -491,7 +491,7 @@ pub struct LocalDecl<'tcx> { /// The *lexical* visibility scope the local is defined /// in. If the local was defined in a let-statement, this /// is *within* the let-statement, rather than outside - /// of iit. + /// of it. pub lexical_scope: VisibilityScope, } diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs index 4725f6e2c78..d9df2e1f9ad 100644 --- a/src/librustc_driver/driver.rs +++ b/src/librustc_driver/driver.rs @@ -1005,10 +1005,6 @@ pub fn phase_3_run_analysis_passes<'tcx, F, R>(sess: &'tcx Session, // What we need to run borrowck etc. passes.push_pass(MIR_VALIDATED, mir::transform::qualify_consts::QualifyAndPromoteConstants); - - // FIXME: ariel points SimplifyBranches should run after - // mir-borrowck; otherwise code within `if false { ... }` would - // not be checked. passes.push_pass(MIR_VALIDATED, mir::transform::simplify::SimplifyCfg::new("qualify-consts")); passes.push_pass(MIR_VALIDATED, mir::transform::nll::NLL);