From 9b4a3ad3f47e72a03a7592e2b64b59f35b7b74b7 Mon Sep 17 00:00:00 2001
From: Andrey Cizov <acizov@gmail.com>
Date: Thu, 1 Aug 2019 19:56:28 +0100
Subject: [PATCH] rustfmt not passing

---
 src/storage.rs | 58 +++++++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/storage.rs b/src/storage.rs
index 480cee2..4d945ad 100644
--- a/src/storage.rs
+++ b/src/storage.rs
@@ -95,22 +95,21 @@ impl MemoryStorage {
 impl TokenStorage for MemoryStorage {
     type Error = NullError;
 
-    fn set(&mut self,
-           scope_hash: u64,
-           scopes: &Vec<&str>,
-           token: Option<Token>)
-           -> Result<(), NullError> {
+    fn set(
+        &mut self,
+        scope_hash: u64,
+        scopes: &Vec<&str>,
+        token: Option<Token>,
+    ) -> Result<(), NullError> {
         match token {
             Some(t) => {
-                self.tokens.push(
-                    JSONToken {
-                        hash: scope_hash,
-                        scopes: Some(scopes.iter().map(|x| x.to_string()).collect()),
-                        token: t.clone(),
-                    }
-                );
+                self.tokens.push(JSONToken {
+                    hash: scope_hash,
+                    scopes: Some(scopes.iter().map(|x| x.to_string()).collect()),
+                    token: t.clone(),
+                });
                 ()
-            },
+            }
             None => {
                 let matched = self.tokens.iter().find_position(|x| x.hash == scope_hash);
                 if let Some((idx, _)) = matched {
@@ -126,7 +125,10 @@ impl TokenStorage for MemoryStorage {
 
         for t in &self.tokens {
             if let Some(token_scopes) = &t.scopes {
-                let matched = token_scopes.iter().filter(|x| scopes.contains(&&&x[..])).count();
+                let matched = token_scopes
+                    .iter()
+                    .filter(|x| scopes.contains(&&&x[..]))
+                    .count();
                 if matched >= scopes.len() {
                     return Result::Ok(Some(t.token.clone()));
                 }
@@ -227,11 +229,12 @@ impl DiskTokenStorage {
 
 impl TokenStorage for DiskTokenStorage {
     type Error = io::Error;
-    fn set(&mut self,
-           scope_hash: u64,
-           scopes: &Vec<&str>,
-           token: Option<Token>)
-           -> Result<(), Self::Error> {
+    fn set(
+        &mut self,
+        scope_hash: u64,
+        scopes: &Vec<&str>,
+        token: Option<Token>,
+    ) -> Result<(), Self::Error> {
         match token {
             None => {
                 let matched = self.tokens.iter().find_position(|x| x.hash == scope_hash);
@@ -241,13 +244,11 @@ impl TokenStorage for DiskTokenStorage {
                 ()
             }
             Some(t) => {
-                self.tokens.push(
-                    JSONToken {
-                        hash: scope_hash,
-                        scopes: Some(scopes.iter().map(|x| x.to_string()).collect()),
-                        token: t.clone(),
-                    }
-                );
+                self.tokens.push(JSONToken {
+                    hash: scope_hash,
+                    scopes: Some(scopes.iter().map(|x| x.to_string()).collect()),
+                    token: t.clone(),
+                });
                 ()
             }
         }
@@ -258,7 +259,10 @@ impl TokenStorage for DiskTokenStorage {
 
         for t in &self.tokens {
             if let Some(token_scopes) = &t.scopes {
-                let matched = token_scopes.iter().filter(|x| scopes.contains(&&&x[..])).count();
+                let matched = token_scopes
+                    .iter()
+                    .filter(|x| scopes.contains(&&&x[..]))
+                    .count();
                 // we may have some of the tokens as denormalized (many namespaces repeated)
                 if matched >= scopes.len() {
                     return Result::Ok(Some(t.token.clone()));