diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2017-10-30 16:19:24 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2017-10-31 12:41:40 -0400 |
| commit | 7675ea997a72e5eca54baf72210c2c5db41fce62 (patch) | |
| tree | 3ec35a4b9f71d13f0adb5dc44221f2c23e9dee4b | |
| parent | bf57a230eb94b8a513f3c7b1f68ea5779bcb281a (diff) | |
| download | rust-7675ea997a72e5eca54baf72210c2c5db41fce62.tar.gz rust-7675ea997a72e5eca54baf72210c2c5db41fce62.zip | |
remove the NLL pass (it is now invoked by mir borrowck)
| -rw-r--r-- | src/librustc_driver/driver.rs | 1 | ||||
| -rw-r--r-- | src/librustc_mir/transform/nll/mod.rs | 25 |
2 files changed, 2 insertions, 24 deletions
diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs index cd3740f72e0..ea3411f4d07 100644 --- a/src/librustc_driver/driver.rs +++ b/src/librustc_driver/driver.rs @@ -1003,7 +1003,6 @@ pub fn phase_3_run_analysis_passes<'tcx, F, R>(sess: &'tcx Session, passes.push_pass(MIR_VALIDATED, mir::transform::qualify_consts::QualifyAndPromoteConstants); passes.push_pass(MIR_VALIDATED, mir::transform::simplify::SimplifyCfg::new("qualify-consts")); - passes.push_pass(MIR_VALIDATED, mir::transform::nll::NLL); // borrowck runs between MIR_VALIDATED and MIR_OPTIMIZED. diff --git a/src/librustc_mir/transform/nll/mod.rs b/src/librustc_mir/transform/nll/mod.rs index 66a9da2c72a..d4938dc40bf 100644 --- a/src/librustc_mir/transform/nll/mod.rs +++ b/src/librustc_mir/transform/nll/mod.rs @@ -8,9 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use rustc::ty::{self, RegionKind, TyCtxt}; +use rustc::ty::{self, RegionKind}; use rustc::mir::{Location, Mir}; -use rustc::mir::transform::{MirPass, MirSource}; +use rustc::mir::transform::MirSource; use rustc::infer::InferCtxt; use rustc::util::nodemap::FxHashMap; use rustc_data_structures::indexed_vec::Idx; @@ -29,27 +29,6 @@ use self::region_infer::RegionInferenceContext; mod renumber; -// MIR Pass for non-lexical lifetimes -pub struct NLL; - -impl MirPass for NLL { - fn run_pass<'a, 'tcx>( - &self, - tcx: TyCtxt<'a, 'tcx, 'tcx>, - source: MirSource, - input_mir: &mut Mir<'tcx>, - ) { - if !tcx.sess.opts.debugging_opts.nll { - return; - } - - tcx.infer_ctxt().enter(|ref infcx| { - let mut mir = input_mir.clone(); - let _ = compute_regions(infcx, source, &mut mir); - }); - } -} - /// Computes the (non-lexical) regions from the input MIR. /// /// This may result in errors being reported. |