From 89d64b007f1389432b0492b70eb0b83c71c873bb Mon Sep 17 00:00:00 2001
From: Paul Hauner <paul@paulhauner.com>
Date: Sat, 27 Apr 2019 19:04:26 +1000
Subject: [PATCH] Run cargofmt --all

---
 eth2/types/src/beacon_state.rs               |  5 +++--
 eth2/utils/cached_tree_hash/src/impls/vec.rs | 20 +++++++++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/eth2/types/src/beacon_state.rs b/eth2/types/src/beacon_state.rs
index 015816403c..6948997c53 100644
--- a/eth2/types/src/beacon_state.rs
+++ b/eth2/types/src/beacon_state.rs
@@ -1,7 +1,7 @@
 use self::epoch_cache::{get_active_validator_indices, EpochCache, Error as EpochCacheError};
 use crate::test_utils::TestRandom;
 use crate::*;
-use cached_tree_hash::{TreeHashCache, Error as TreeHashCacheError};
+use cached_tree_hash::{Error as TreeHashCacheError, TreeHashCache};
 use int_to_bytes::int_to_bytes32;
 use pubkey_cache::PubkeyCache;
 use rand::RngCore;
@@ -827,7 +827,8 @@ impl BeaconState {
     /// Returns an error if the cache is not initialized or if an error is encountered during the
     /// cache update.
     pub fn cached_tree_hash_root(&self) -> Result<Hash256, Error> {
-        self.tree_hash_cache.root()
+        self.tree_hash_cache
+            .root()
             .and_then(|b| Ok(Hash256::from_slice(b)))
             .map_err(|e| e.into())
     }
diff --git a/eth2/utils/cached_tree_hash/src/impls/vec.rs b/eth2/utils/cached_tree_hash/src/impls/vec.rs
index b3c5dc4124..046a1f97ef 100644
--- a/eth2/utils/cached_tree_hash/src/impls/vec.rs
+++ b/eth2/utils/cached_tree_hash/src/impls/vec.rs
@@ -165,7 +165,12 @@ pub fn update_tree_hash_cache<T: CachedTreeHash<T>>(
                     //
                     // Splice the tree for the new item into the current chunk_index.
                     (LeafNode::DoesNotExist, LeafNode::Exists(new)) => {
-                        splice_in_new_tree(&vec[i], new.start..new.start, new_overlay.depth + 1, cache)?;
+                        splice_in_new_tree(
+                            &vec[i],
+                            new.start..new.start,
+                            new_overlay.depth + 1,
+                            cache,
+                        )?;
 
                         cache.chunk_index = new.end;
                     }
@@ -174,7 +179,12 @@ pub fn update_tree_hash_cache<T: CachedTreeHash<T>>(
                     //
                     // Splice the tree for the new item over the padding chunk.
                     (LeafNode::Padding, LeafNode::Exists(new)) => {
-                        splice_in_new_tree(&vec[i], new.start..new.start + 1, new_overlay.depth + 1, cache)?;
+                        splice_in_new_tree(
+                            &vec[i],
+                            new.start..new.start + 1,
+                            new_overlay.depth + 1,
+                            cache,
+                        )?;
 
                         cache.chunk_index = new.end;
                     }
@@ -255,10 +265,10 @@ fn splice_in_new_tree<T>(
     depth: usize,
     cache: &mut TreeHashCache,
 ) -> Result<(), Error>
-where T: CachedTreeHash<T>
+where
+    T: CachedTreeHash<T>,
 {
-    let (bytes, mut bools, schemas) =
-        TreeHashCache::new(item, depth)?.into_components();
+    let (bytes, mut bools, schemas) = TreeHashCache::new(item, depth)?.into_components();
 
     // Record the number of schemas, this will be used later in the fn.
     let num_schemas = schemas.len();