diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2017-12-05 16:57:43 -0500 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2017-12-15 10:10:56 -0500 |
| commit | fad3d1d7fd16fea674bdafe49649fb52e15ab118 (patch) | |
| tree | 06cc953e6e59ea4c38a308cea7b49a6f20bd9c6d | |
| parent | 6193c5cc2acd1c427a372dfdab3d071e880ecf62 (diff) | |
| download | rust-fad3d1d7fd16fea674bdafe49649fb52e15ab118.tar.gz rust-fad3d1d7fd16fea674bdafe49649fb52e15ab118.zip | |
dfs.rs: rustfmt
| -rw-r--r-- | src/librustc_mir/borrow_check/nll/region_infer/dfs.rs | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/librustc_mir/borrow_check/nll/region_infer/dfs.rs b/src/librustc_mir/borrow_check/nll/region_infer/dfs.rs index dcf5d979a4c..59860d61ab9 100644 --- a/src/librustc_mir/borrow_check/nll/region_infer/dfs.rs +++ b/src/librustc_mir/borrow_check/nll/region_infer/dfs.rs @@ -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; } |
