OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

move liveness_map into the liveness module

Browse Source
This commit is contained in:
Niko Matsakis 2018-08-07 13:45:37 -04:00
parent 5147d383d3
commit d1ce8e846b
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/librustc_mir/borrow_check/nll/mod.rs
View File

@ -12,8 +12,8 @@ use borrow_check::borrow_set::BorrowSet;
use borrow_check::location::{LocationIndex, LocationTable};
use borrow_check::nll::facts::AllFactsExt;
use borrow_check::nll::type_check::{MirTypeckResults, MirTypeckRegionConstraints};
use borrow_check::nll::type_check::liveness::liveness_map::{NllLivenessMap, LocalWithRegion};
use borrow_check::nll::region_infer::values::RegionValueElements;
use borrow_check::nll::liveness_map::{NllLivenessMap, LocalWithRegion};
use dataflow::indexes::BorrowIndex;
use dataflow::move_paths::MoveData;
use dataflow::FlowAtLocation;
@ -47,7 +47,6 @@ crate mod region_infer;
mod renumber;
crate mod type_check;
mod universal_regions;
crate mod liveness_map;
mod constraints;

0
src/librustc_mir/borrow_check/nll/liveness_map.rs → src/librustc_mir/borrow_check/nll/type_check/liveness/liveness_map.rs
View File

2
src/librustc_mir/borrow_check/nll/type_check/liveness/mod.rs
View File

@ -25,6 +25,8 @@ use util::liveness::{LivenessResults, LiveVariableMap };
use super::TypeChecker;
crate mod liveness_map;
/// Combines liveness analysis with initialization analysis to
/// determine which variables are live at which points, both due to
/// ordinary uses and drops. Returns a set of (ty, location) pairs

4
src/librustc_mir/borrow_check/nll/type_check/mod.rs
View File

@ -15,10 +15,10 @@ use borrow_check::borrow_set::BorrowSet;
use borrow_check::location::LocationTable;
use borrow_check::nll::constraints::{ConstraintSet, OutlivesConstraint};
use borrow_check::nll::facts::AllFacts;
use borrow_check::nll::liveness_map::NllLivenessMap;
use borrow_check::nll::region_infer::values::{RegionValueElements, LivenessValues};
use borrow_check::nll::region_infer::{ClosureRegionRequirementsExt, TypeTest};
use borrow_check::nll::type_check::free_region_relations::{CreateResult, UniversalRegionRelations};
use borrow_check::nll::type_check::liveness::liveness_map::NllLivenessMap;
use borrow_check::nll::universal_regions::UniversalRegions;
use borrow_check::nll::LocalWithRegion;
use borrow_check::nll::ToRegionVid;
@ -75,7 +75,7 @@ macro_rules! span_mirbug_and_err {
mod constraint_conversion;
pub mod free_region_relations;
mod input_output;
mod liveness;
crate mod liveness;
mod relate_tys;
/// Type checks the given `mir` in the context of the inference