summaryrefslogtreecommitdiffstats
path: root/src/librustc_mir/borrow_check/mod.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-05-17 21:36:43 +0000
committerbors <bors@rust-lang.org>2018-05-17 21:36:43 +0000
commit612ca14b817a2088ab0b6a697279d9e2aff1fb25 (patch)
tree40807dc0b912f321840c63e146da1e6b023050cb /src/librustc_mir/borrow_check/mod.rs
parentAuto merge of #50629 - Mark-Simulacrum:stage-step, r=alexcrichton (diff)
parent"fix" test region-liveness-two-disjoint-uses (diff)
downloadgrust-612ca14b817a2088ab0b6a697279d9e2aff1fb25.tar.gz
grust-612ca14b817a2088ab0b6a697279d9e2aff1fb25.tar.bz2
grust-612ca14b817a2088ab0b6a697279d9e2aff1fb25.tar.xz
Auto merge of #50593 - nikomatsakis:nll-no-location, r=nikomatsakis
stop considering location when computing outlives relationships This doesn't (yet?) use SEME regions, but it does ignore the location for outlives constraints. This makes (I believe) NLL significantly faster -- but we should do some benchmarks. It regresses the "get-default" family of use cases for NLL, which is a shame, but keeps the other benefits, and thus represents a decent step forward. r? @pnkfelix
Diffstat (limited to 'src/librustc_mir/borrow_check/mod.rs')
-rw-r--r--src/librustc_mir/borrow_check/mod.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/librustc_mir/borrow_check/mod.rs b/src/librustc_mir/borrow_check/mod.rs
index 1cc69351b4..3d39042e9f 100644
--- a/src/librustc_mir/borrow_check/mod.rs
+++ b/src/librustc_mir/borrow_check/mod.rs
@@ -10,7 +10,7 @@
10 10
11//! This query borrow-checks the MIR to (further) ensure it is not broken. 11//! This query borrow-checks the MIR to (further) ensure it is not broken.
12 12
13use borrow_check::nll::region_infer::{RegionCausalInfo, RegionInferenceContext}; 13use borrow_check::nll::region_infer::RegionInferenceContext;
14use rustc::hir; 14use rustc::hir;
15use rustc::hir::def_id::DefId; 15use rustc::hir::def_id::DefId;
16use rustc::hir::map::definitions::DefPathData; 16use rustc::hir::map::definitions::DefPathData;
@@ -248,7 +248,6 @@ fn do_mir_borrowck<'a, 'gcx, 'tcx>(
248 nonlexical_regioncx: regioncx, 248 nonlexical_regioncx: regioncx,
249 used_mut: FxHashSet(), 249 used_mut: FxHashSet(),
250 used_mut_upvars: SmallVec::new(), 250 used_mut_upvars: SmallVec::new(),
251 nonlexical_cause_info: None,
252 borrow_set, 251 borrow_set,
253 dominators, 252 dominators,
254 }; 253 };
@@ -367,7 +366,6 @@ pub struct MirBorrowckCtxt<'cx, 'gcx: 'tcx, 'tcx: 'cx> {
367 /// contains the results from region inference and lets us e.g. 366 /// contains the results from region inference and lets us e.g.
368 /// find out which CFG points are contained in each borrow region. 367 /// find out which CFG points are contained in each borrow region.
369 nonlexical_regioncx: Rc<RegionInferenceContext<'tcx>>, 368 nonlexical_regioncx: Rc<RegionInferenceContext<'tcx>>,
370 nonlexical_cause_info: Option<RegionCausalInfo>,
371 369
372 /// The set of borrows extracted from the MIR 370 /// The set of borrows extracted from the MIR
373 borrow_set: Rc<BorrowSet<'tcx>>, 371 borrow_set: Rc<BorrowSet<'tcx>>,