about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorAriel Ben-Yehuda <ariel.byd@gmail.com>2017-09-20 16:34:31 +0300
committerAriel Ben-Yehuda <ariel.byd@gmail.com>2017-09-24 12:46:00 +0300
commit9c4898eaddd7e54ba442899e0a6b2acf4d14f6c4 (patch)
tree9f2a0c0e93dbee2d600c2ac12291a29e1e6f7a08 /src
parentc72a979979fef0cc00c3023cd4a4ce550a22935b (diff)
downloadrust-9c4898eaddd7e54ba442899e0a6b2acf4d14f6c4.tar.gz
rust-9c4898eaddd7e54ba442899e0a6b2acf4d14f6c4.zip
address review comments
Diffstat (limited to 'src')
-rw-r--r--src/librustc/mir/mod.rs2
-rw-r--r--src/librustc_driver/driver.rs4
2 files changed, 1 insertions, 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);