]> git.lizzy.rs Git - rust.git/commitdiff
pacify the mercilous tidy
authorNiko Matsakis <niko@alum.mit.edu>
Mon, 1 May 2017 15:09:36 +0000 (11:09 -0400)
committerNiko Matsakis <niko@alum.mit.edu>
Mon, 1 May 2017 15:09:36 +0000 (11:09 -0400)
src/librustc/infer/region_inference/mod.rs
src/librustc/middle/mem_categorization.rs
src/librustc_mir/build/scope.rs

index fb699bbd2d25f90d194d7e48401e67911777798f..39554d1fa3a3ae77cce418d08d76881bcc838c33 100644 (file)
@@ -1053,7 +1053,9 @@ fn expand_givens(&self, graph: &RegionGraph) {
         }
     }
 
-    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);
index cbe69de4010322404032be88775a12510d6bf924..11a364f92c316858538f83518a1aaef00d171bf2 100644 (file)
@@ -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>,
index fcd06835d98699d5606906c1063e74fd4d38d968..f9c08f34eaf3f4fde47daac87c75282d3391760b 100644 (file)
@@ -270,7 +270,11 @@ pub fn in_breakable_scope<F, R>(&mut self,
 
     /// 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);