From b6816b2b56f5e1044f100e0ab7da0d9540d8f9cf Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sat, 22 Jul 2017 01:04:16 -0700
Subject: [PATCH] please the tidy

---
 src/librustc/ich/impls_mir.rs                   | 3 ++-
 src/librustc/mir/mod.rs                         | 3 ++-
 src/librustc_mir/transform/add_validation.rs    | 4 ++--
 src/librustc_mir/transform/clean_end_regions.rs | 5 ++++-
 src/librustc_mir/transform/erase_regions.rs     | 4 ++--
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/librustc/ich/impls_mir.rs b/src/librustc/ich/impls_mir.rs
index bef35fdc2578..c20864183f47 100644
--- a/src/librustc/ich/impls_mir.rs
+++ b/src/librustc/ich/impls_mir.rs
@@ -243,7 +243,8 @@ for mir::StatementKind<'tcx> {
     }
 }
 
-impl<'a, 'gcx, 'tcx, T> HashStable<StableHashingContext<'a, 'gcx, 'tcx>> for mir::ValidationOperand<'tcx, T>
+impl<'a, 'gcx, 'tcx, T> HashStable<StableHashingContext<'a, 'gcx, 'tcx>>
+    for mir::ValidationOperand<'tcx, T>
     where T: HashStable<StableHashingContext<'a, 'gcx, 'tcx>>
 {
     fn hash_stable<W: StableHasherResult>(&self,
diff --git a/src/librustc/mir/mod.rs b/src/librustc/mir/mod.rs
index f8261f806296..3ee86dbdc846 100644
--- a/src/librustc/mir/mod.rs
+++ b/src/librustc/mir/mod.rs
@@ -1596,7 +1596,8 @@ impl<'tcx> TypeFoldable<'tcx> for Statement<'tcx> {
             // trait with a `fn visit_extent`.
             EndRegion(ref _extent) => false,
 
-            Validate(ref _op, ref lvalues) => lvalues.iter().any(|ty_and_lvalue| ty_and_lvalue.visit_with(visitor)),
+            Validate(ref _op, ref lvalues) =>
+                lvalues.iter().any(|ty_and_lvalue| ty_and_lvalue.visit_with(visitor)),
 
             Nop => false,
         }
diff --git a/src/librustc_mir/transform/add_validation.rs b/src/librustc_mir/transform/add_validation.rs
index e400683e8b4e..d91db41d20d3 100644
--- a/src/librustc_mir/transform/add_validation.rs
+++ b/src/librustc_mir/transform/add_validation.rs
@@ -89,7 +89,7 @@ impl MirPass for AddValidation {
             return;
         }
 
-        let local_decls = mir.local_decls.clone(); // TODO: Find a way to get rid of this clone.
+        let local_decls = mir.local_decls.clone(); // FIXME: Find a way to get rid of this clone.
 
         /// Convert an lvalue to a validation operand.
         let lval_to_operand = |lval: Lvalue<'tcx>| -> ValidationOperand<'tcx, Lvalue<'tcx>> {
@@ -104,7 +104,7 @@ impl MirPass for AddValidation {
             let acquire_stmt = Statement {
                 source_info: SourceInfo {
                     scope: ARGUMENT_VISIBILITY_SCOPE,
-                    span: mir.span, // TODO: Consider using just the span covering the function
+                    span: mir.span, // FIXME: Consider using just the span covering the function
                                     // argument declaration.
                 },
                 kind: StatementKind::Validate(ValidationOp::Acquire,
diff --git a/src/librustc_mir/transform/clean_end_regions.rs b/src/librustc_mir/transform/clean_end_regions.rs
index 28311a5e68cc..1a31bf975307 100644
--- a/src/librustc_mir/transform/clean_end_regions.rs
+++ b/src/librustc_mir/transform/clean_end_regions.rs
@@ -43,7 +43,10 @@ impl MirPass for CleanEndRegions {
                           _tcx: TyCtxt<'a, 'tcx, 'tcx>,
                           _source: MirSource,
                           mir: &mut Mir<'tcx>) {
-        let mut gather = GatherBorrowedRegions { seen_regions: FxHashSet(), in_validation_statement: false };
+        let mut gather = GatherBorrowedRegions {
+            seen_regions: FxHashSet(),
+            in_validation_statement: false
+        };
         gather.visit_mir(mir);
 
         let mut delete = DeleteTrivialEndRegions { seen_regions: &mut gather.seen_regions };
diff --git a/src/librustc_mir/transform/erase_regions.rs b/src/librustc_mir/transform/erase_regions.rs
index 05376ff3d526..f01d71fde264 100644
--- a/src/librustc_mir/transform/erase_regions.rs
+++ b/src/librustc_mir/transform/erase_regions.rs
@@ -11,8 +11,8 @@
 //! This pass erases all early-bound regions from the types occuring in the MIR.
 //! We want to do this once just before trans, so trans does not have to take
 //! care erasing regions all over the place.
-//! NOTE:  We do NOT erase regions of statements that are relevant for "types-as-contracts"-validation,
-//! namely, AcquireValid, ReleaseValid, and EndRegion.
+//! NOTE:  We do NOT erase regions of statements that are relevant for
+//! "types-as-contracts"-validation, namely, AcquireValid, ReleaseValid, and EndRegion.
 
 use rustc::ty::subst::Substs;
 use rustc::ty::{Ty, TyCtxt, ClosureSubsts};