user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dfs.rs: rustfmt

Browse source
This commit is contained in:
Niko Matsakis 2017-12-05 16:57:43 -05:00
parent 6193c5cc2a
commit fad3d1d7fd
1 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/librustc_mir/borrow_check/nll/region_infer/dfs.rs
View file

@ -13,7 +13,8 @@
use borrow_check::nll::universal_regions::UniversalRegions;
use borrow_check::nll::region_infer::RegionInferenceContext;
use borrow_check::nll::region_infer::values::{RegionElementIndex, RegionValues, RegionValueElements};
use borrow_check::nll::region_infer::values::{RegionElementIndex, RegionValueElements,
RegionValues};
use rustc::mir::{Location, Mir};
use rustc::ty::RegionVid;
use rustc_data_structures::fx::FxHashSet;
@ -112,9 +113,7 @@ pub(super) trait DfsOp {
/// Adds all universal regions in the source region to the target region, returning
/// true if something has changed.
fn add_universal_regions_outlived_by_source_to_target(
&mut self,
) -> Result<bool, Self::Early>;
fn add_universal_regions_outlived_by_source_to_target(&mut self) -> Result<bool, Self::Early>;
}
/// Used during inference to enforce a `R1: R2 @ P` constraint. For
@ -143,16 +142,11 @@ impl<'v> DfsOp for CopyFromSourceToTarget<'v> {
.contains(self.source_region, point_index)
}
fn add_to_target_region(
&mut self,
point_index: RegionElementIndex,
) -> Result<bool, !> {
fn add_to_target_region(&mut self, point_index: RegionElementIndex) -> Result<bool, !> {
Ok(self.inferred_values.add(self.target_region, point_index))
}
fn add_universal_regions_outlived_by_source_to_target(
&mut self,
) -> Result<bool, !> {
fn add_universal_regions_outlived_by_source_to_target(&mut self) -> Result<bool, !> {
Ok(
self.inferred_values
.add_universal_regions_outlived_by(self.source_region, self.target_region),
@ -215,16 +209,19 @@ impl<'v, 'tcx> DfsOp for TestTargetOutlivesSource<'v, 'tcx> {
// (This is implied by the loop below, actually, just an
// irresistible micro-opt. Mm. Premature optimization. So
// tasty.)
if self.inferred_values.contains(self.target_region, ur_in_source) {
if self.inferred_values
.contains(self.target_region, ur_in_source)
{
continue;
}
// If there is some other element X such that `target_region: X` and
// `X: ur_in_source`, OK.
if self.inferred_values
.universal_regions_outlived_by(self.target_region)
.any(|ur_in_target| self.universal_regions.outlives(ur_in_target, ur_in_source))
{
.universal_regions_outlived_by(self.target_region)
.any(|ur_in_target| {
self.universal_regions.outlives(ur_in_target, ur_in_source)
}) {
continue;
}