From 3b64a3ece2b8451f46c5bb4b46cb0a7a62066886 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 17 Dec 2021 16:10:35 +1300 Subject: [PATCH] refactor: run `cargo fmt` --- src/brackets.rs | 15 +++++++++------ src/lib.rs | 10 +++++----- src/mock.rs | 5 ++++- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/brackets.rs b/src/brackets.rs index 5df9581..ac03b9f 100644 --- a/src/brackets.rs +++ b/src/brackets.rs @@ -103,7 +103,10 @@ where index_vector.push((start, end)); } - BracketsTransient { index_vector, _phantom: PhantomData } + BracketsTransient { + index_vector, + _phantom: PhantomData, + } } } @@ -151,7 +154,7 @@ where // check all brackets if key is queued for i in 0..self.index_vector.len() { if N::contains_key(i as Bracket, &item_key) { - return false + return false; } } @@ -178,7 +181,7 @@ where /// Will remove the item, but will not update the bounds in storage. fn pop(&mut self, bracket: Bracket) -> Option { if self.is_empty(bracket) { - return None + return None; } let (mut v_start, v_end) = self.index_vector[bracket as usize]; @@ -205,9 +208,9 @@ where let (v_start, v_end) = self.index_vector[bracket as usize]; if v_start <= v_end { - return v_end - v_start + return v_end - v_start; } else { - return (BufferIndex::MAX - v_start) + v_end + return (BufferIndex::MAX - v_start) + v_end; } } @@ -216,7 +219,7 @@ where // check all brackets if key is queued for i in 0..self.index_vector.len() { if N::contains_key(i as Bracket, &item_key) { - return true + return true; } } diff --git a/src/lib.rs b/src/lib.rs index ef97f9a..337fc3b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -164,7 +164,7 @@ impl, I: 'static> Pallet { let player = PlayerStruct { account }; // duplicate check if we can add key to the queue if !queue.push(bracket, player.account.clone(), player.clone()) { - return false + return false; } Self::deposit_event(Event::Queued(player)); @@ -195,23 +195,23 @@ impl, I: 'static> Pallet { for i in 0..Self::brackets_count() { // skip if bracket is empty if queue.size(i) == 0 { - continue + continue; } // iterate for each slot occupied and fill, till player match size reached for _j in 0..queue.size(i) { if brackets.len() == max_players as usize { - break + break; } brackets.push(i); } // leave if brackets is filled with brackets if brackets.len() == max_players as usize { - break + break; } } // vec not filled with enough brackets leave if brackets.len() < max_players as usize { - return result + return result; } // pop from the harvested brackets players diff --git a/src/mock.rs b/src/mock.rs index bee8d6f..ef5adcc 100644 --- a/src/mock.rs +++ b/src/mock.rs @@ -66,5 +66,8 @@ impl pallet_matchmaker::Config for Test { // Build genesis storage according to the mock runtime. pub fn new_test_ext() -> sp_io::TestExternalities { - system::GenesisConfig::default().build_storage::().unwrap().into() + system::GenesisConfig::default() + .build_storage::() + .unwrap() + .into() }