fix format

z-korp · Mar 8, 2024 · be8773e · be8773e
1 parent 54f2214
commit be8773e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 35 deletions.
diff --git a/src/models/tile.cairo b/src/models/tile.cairo
@@ -480,9 +480,7 @@ fn _connected_iter(
             }
             return _connected_iter(target, owner, tiles, ref visiteds, ref unvisiteds);
         },
-        Option::None => {
-            return false;
-        },
+        Option::None => { return false; },
     }
 }
 
@@ -509,9 +507,7 @@ fn _owned_dedup(ref array: Span<u8>, tiles: Span<Tile>, drops: Span<u8>, owner:
                     result.append(element);
                 };
             },
-            Option::None => {
-                break;
-            },
+            Option::None => { break; },
         };
     };
     result.span()
@@ -665,9 +661,7 @@ mod tests {
                         break index;
                     };
                 },
-                Option::None => {
-                    panic(array!['Tile: foreigner not found']);
-                },
+                Option::None => { panic(array!['Tile: foreigner not found']); },
             };
         };
         let mut to = TileTrait::new(GAME_ID, *index, 2, PLAYER_1);
@@ -771,14 +765,10 @@ mod tests {
         let mut allies = config::neighbors(attacker.id).expect('Tile: invalid id');
         let index = loop {
             match allies.pop_front() {
-                Option::Some(index) => {
-                    if index != @defender.id {
-                        break index;
-                    };
-                },
-                Option::None => {
-                    panic(array!['Tile: ally not found']);
-                },
+                Option::Some(index) => { if index != @defender.id {
+                    break index;
+                }; },
+                Option::None => { panic(array!['Tile: ally not found']); },
             };
         };
         let mut ally = TileTrait::new(GAME_ID, *index, 2, PLAYER_1);
@@ -862,9 +852,7 @@ mod tests {
                         break index;
                     };
                 },
-                Option::None => {
-                    panic(array!['Tile: foreigner not found']);
-                },
+                Option::None => { panic(array!['Tile: foreigner not found']); },
             };
         };
         let mut foreigner = TileTrait::new(GAME_ID, *index, 2, PLAYER_2);
@@ -958,9 +946,7 @@ mod tests {
                         break index;
                     };
                 },
-                Option::None => {
-                    panic(array!['Tile: ally not found']);
-                },
+                Option::None => { panic(array!['Tile: ally not found']); },
             };
         };
         attacker.attack(1, ref defender, 'ATTACK');

diff --git a/src/systems/play.cairo b/src/systems/play.cairo
@@ -225,9 +225,7 @@ mod play {
                         battle.tx_hash = get_tx_info().unbox().transaction_hash;
                         emit!(world, battle);
                     },
-                    Option::None => {
-                        break;
-                    },
+                    Option::None => { break; },
                 };
             };
         }
@@ -457,9 +455,7 @@ mod play {
                         let hand = HandTrait::load(player);
                         deck.remove(hand.cards.span());
                     },
-                    Option::None => {
-                        break;
-                    },
+                    Option::None => { break; },
                 };
             };
 
@@ -498,12 +494,8 @@ mod play {
             let mut tiles: Array<Tile> = array![];
             loop {
                 match player_tiles.pop_front() {
-                    Option::Some(tile) => {
-                        tiles.append(*tile);
-                    },
-                    Option::None => {
-                        break;
-                    },
+                    Option::Some(tile) => { tiles.append(*tile); },
+                    Option::None => { break; },
                 };
             };
             tiles.span()