diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2017-05-01 11:09:36 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2017-05-01 11:09:36 -0400 |
| commit | c0434e2babf59393b1677eef60d4b56b52ca6e18 (patch) | |
| tree | 801721716de8ec73c5a859b90e8997f441ffc0a6 | |
| parent | d4d74dafe8e7ef059e27d69b4ec518fa0228f4b2 (diff) | |
| download | rust-c0434e2babf59393b1677eef60d4b56b52ca6e18.tar.gz rust-c0434e2babf59393b1677eef60d4b56b52ca6e18.zip | |
pacify the mercilous tidy
| -rw-r--r-- | src/librustc/infer/region_inference/mod.rs | 4 | ||||
| -rw-r--r-- | src/librustc/middle/mem_categorization.rs | 4 | ||||
| -rw-r--r-- | src/librustc_mir/build/scope.rs | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/src/librustc/infer/region_inference/mod.rs b/src/librustc/infer/region_inference/mod.rs index fb699bbd2d2..39554d1fa3a 100644 --- a/src/librustc/infer/region_inference/mod.rs +++ b/src/librustc/infer/region_inference/mod.rs @@ -1053,7 +1053,9 @@ impl<'a, 'gcx, 'tcx> RegionVarBindings<'a, 'gcx, 'tcx> { } } - fn expansion(&self, region_rels: &RegionRelations<'a, 'gcx, 'tcx>, var_values: &mut [VarValue<'tcx>]) { + fn expansion(&self, + region_rels: &RegionRelations<'a, 'gcx, 'tcx>, + var_values: &mut [VarValue<'tcx>]) { self.iterate_until_fixed_point("Expansion", |constraint, origin| { debug!("expansion: constraint={:?} origin={:?}", constraint, origin); diff --git a/src/librustc/middle/mem_categorization.rs b/src/librustc/middle/mem_categorization.rs index cbe69de4010..11a364f92c3 100644 --- a/src/librustc/middle/mem_categorization.rs +++ b/src/librustc/middle/mem_categorization.rs @@ -408,7 +408,9 @@ impl<'a, 'gcx, 'tcx> MemCategorizationContext<'a, 'gcx, 'tcx> { pub fn new(infcx: &'a InferCtxt<'a, 'gcx, 'tcx>, region_maps: &'a RegionMaps<'tcx>) -> MemCategorizationContext<'a, 'gcx, 'tcx> { - MemCategorizationContext::with_options(infcx, region_maps, MemCategorizationOptions::default()) + MemCategorizationContext::with_options(infcx, + region_maps, + MemCategorizationOptions::default()) } pub fn with_options(infcx: &'a InferCtxt<'a, 'gcx, 'tcx>, diff --git a/src/librustc_mir/build/scope.rs b/src/librustc_mir/build/scope.rs index fcd06835d98..f9c08f34eaf 100644 --- a/src/librustc_mir/build/scope.rs +++ b/src/librustc_mir/build/scope.rs @@ -270,7 +270,11 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> { /// Convenience wrapper that pushes a scope and then executes `f` /// to build its contents, popping the scope afterwards. - pub fn in_scope<F, R>(&mut self, extent: CodeExtent<'tcx>, mut block: BasicBlock, f: F) -> BlockAnd<R> + pub fn in_scope<F, R>(&mut self, + extent: CodeExtent<'tcx>, + mut block: BasicBlock, + f: F) + -> BlockAnd<R> where F: FnOnce(&mut Builder<'a, 'gcx, 'tcx>) -> BlockAnd<R> { debug!("in_scope(extent={:?}, block={:?})", extent, block); |
