Update all Option::None(()) to remove (()) (#153)

Updated: - break (); => break; - Option::None(()) => Option::None - Option::None(_) => Option::None
keep-starknet-strange · Aug 9, 2023 · a573a5e · a573a5e
1 parent 06103a3
commit a573a5e
Show file tree

Hide file tree

Showing 20 changed files with 71 additions and 71 deletions.
diff --git a/src/data_structures/array_ext.cairo b/src/data_structures/array_ext.cairo
@@ -52,22 +52,22 @@ impl ArrayImpl<T, impl TCopy: Copy<T>, impl TDrop: Drop<T>> of ArrayTraitExt<T>
                 self.append(v);
                 self.append_all(ref arr);
             },
-            Option::None(()) => (),
+            Option::None => (),
         }
     }
 
     fn pop_front_n(ref self: Array<T>, mut n: usize) {
         // Can't do self.span().pop_front_n();
         loop {
             if n == 0 {
-                break ();
+                break;
             }
             match self.pop_front() {
                 Option::Some(v) => {
                     n -= 1;
                 },
-                Option::None(_) => {
-                    break ();
+                Option::None => {
+                    break;
                 },
             };
         };
@@ -141,14 +141,14 @@ impl SpanImpl<T, impl TCopy: Copy<T>, impl TDrop: Drop<T>> of SpanTraitExt<T> {
     fn pop_front_n(ref self: Span<T>, mut n: usize) {
         loop {
             if n == 0 {
-                break ();
+                break;
             }
             match self.pop_front() {
                 Option::Some(v) => {
                     n -= 1;
                 },
-                Option::None(_) => {
-                    break ();
+                Option::None => {
+                    break;
                 },
             };
         };
@@ -157,14 +157,14 @@ impl SpanImpl<T, impl TCopy: Copy<T>, impl TDrop: Drop<T>> of SpanTraitExt<T> {
     fn pop_back_n(ref self: Span<T>, mut n: usize) {
         loop {
             if n == 0 {
-                break ();
+                break;
             }
             match self.pop_back() {
                 Option::Some(v) => {
                     n -= 1;
                 },
-                Option::None(_) => {
-                    break ();
+                Option::None => {
+                    break;
                 },
             };
         };
@@ -177,8 +177,8 @@ impl SpanImpl<T, impl TCopy: Copy<T>, impl TDrop: Drop<T>> of SpanTraitExt<T> {
                 Option::Some(v) => {
                     response.append(*v);
                 },
-                Option::None(_) => {
-                    break (); // Can't `break response;` "Variable was previously moved"
+                Option::None => {
+                    break; // Can't `break response;` "Variable was previously moved"
                 },
             };
         };
@@ -193,7 +193,7 @@ impl SpanImpl<T, impl TCopy: Copy<T>, impl TDrop: Drop<T>> of SpanTraitExt<T> {
                         break true;
                     }
                 },
-                Option::None(_) => {
+                Option::None => {
                     break false;
                 },
             };
@@ -232,8 +232,8 @@ impl SpanImpl<T, impl TCopy: Copy<T>, impl TDrop: Drop<T>> of SpanTraitExt<T> {
                     }
                     index += 1;
                 },
-                Option::None(_) => {
-                    break Option::None(());
+                Option::None => {
+                    break Option::None;
                 },
             };
         }
@@ -248,7 +248,7 @@ impl SpanImpl<T, impl TCopy: Copy<T>, impl TDrop: Drop<T>> of SpanTraitExt<T> {
                         count += 1;
                     }
                 },
-                Option::None(_) => {
+                Option::None => {
                     break count;
                 },
             };
@@ -260,8 +260,8 @@ impl SpanImpl<T, impl TCopy: Copy<T>, impl TDrop: Drop<T>> of SpanTraitExt<T> {
     ) -> Option<T> {
         let mut min = match self.pop_front() {
             Option::Some(item) => *item,
-            Option::None(_) => {
-                return Option::None(());
+            Option::None => {
+                return Option::None;
             },
         };
         loop {
@@ -271,7 +271,7 @@ impl SpanImpl<T, impl TCopy: Copy<T>, impl TDrop: Drop<T>> of SpanTraitExt<T> {
                         min = *item
                     }
                 },
-                Option::None(_) => {
+                Option::None => {
                     break Option::Some(min);
                 },
             };
@@ -285,8 +285,8 @@ impl SpanImpl<T, impl TCopy: Copy<T>, impl TDrop: Drop<T>> of SpanTraitExt<T> {
         let mut index_of_min = 0;
         let mut min: T = match self.pop_front() {
             Option::Some(item) => *item,
-            Option::None(_) => {
-                return Option::None(());
+            Option::None => {
+                return Option::None;
             },
         };
         loop {
@@ -297,7 +297,7 @@ impl SpanImpl<T, impl TCopy: Copy<T>, impl TDrop: Drop<T>> of SpanTraitExt<T> {
                         min = *item;
                     }
                 },
-                Option::None(_) => {
+                Option::None => {
                     break Option::Some(index_of_min);
                 },
             };
@@ -310,8 +310,8 @@ impl SpanImpl<T, impl TCopy: Copy<T>, impl TDrop: Drop<T>> of SpanTraitExt<T> {
     ) -> Option<T> {
         let mut max = match self.pop_front() {
             Option::Some(item) => *item,
-            Option::None(_) => {
-                return Option::None(());
+            Option::None => {
+                return Option::None;
             },
         };
         loop {
@@ -321,7 +321,7 @@ impl SpanImpl<T, impl TCopy: Copy<T>, impl TDrop: Drop<T>> of SpanTraitExt<T> {
                         max = *item
                     }
                 },
-                Option::None(_) => {
+                Option::None => {
                     break Option::Some(max);
                 },
             };
@@ -335,8 +335,8 @@ impl SpanImpl<T, impl TCopy: Copy<T>, impl TDrop: Drop<T>> of SpanTraitExt<T> {
         let mut index_of_max = 0;
         let mut max = match self.pop_front() {
             Option::Some(item) => *item,
-            Option::None(_) => {
-                return Option::None(());
+            Option::None => {
+                return Option::None;
             },
         };
         loop {
@@ -347,7 +347,7 @@ impl SpanImpl<T, impl TCopy: Copy<T>, impl TDrop: Drop<T>> of SpanTraitExt<T> {
                         max = *item
                     }
                 },
-                Option::None(_) => {
+                Option::None => {
                     break Option::Some(index_of_max);
                 },
             };

diff --git a/src/data_structures/merkle_tree.cairo b/src/data_structures/merkle_tree.cairo
@@ -60,7 +60,7 @@ impl MerkleTreeImpl of MerkleTreeTrait {
                         current_node = LegacyHash::hash(*proof_element, current_node);
                     }
                 },
-                Option::None(()) => {
+                Option::None => {
                     break current_node;
                 },
             };

diff --git a/src/data_structures/stack.cairo b/src/data_structures/stack.cairo
@@ -74,7 +74,7 @@ impl Felt252StackImpl<
     /// * Option<u256> The item removed or None if the stack is empty.
     fn pop(ref self: Felt252Stack<T>) -> Option<T> {
         if self.is_empty() {
-            return Option::None(());
+            return Option::None;
         }
 
         self.len -= 1;
@@ -88,7 +88,7 @@ impl Felt252StackImpl<
     /// * Option<u256> The last item of the stack
     fn peek(ref self: Felt252Stack<T>) -> Option<T> {
         if self.is_empty() {
-            return Option::None(());
+            return Option::None;
         }
         Option::Some(self.elements.get((self.len - 1).into()))
     }
@@ -138,7 +138,7 @@ impl NullableStackImpl<
 
     fn pop(ref self: NullableStack<T>) -> Option<T> {
         if self.is_empty() {
-            return Option::None(());
+            return Option::None;
         }
 
         self.len -= 1;
@@ -148,7 +148,7 @@ impl NullableStackImpl<
 
     fn peek(ref self: NullableStack<T>) -> Option<T> {
         if self.is_empty() {
-            return Option::None(());
+            return Option::None;
         }
         Option::Some(self.elements.get((self.len - 1).into()).deref())
     }

diff --git a/src/data_structures/tests/queue_test.cairo b/src/data_structures/tests/queue_test.cairo
@@ -45,8 +45,8 @@ fn queue_peek_front_test() {
         Option::Some(result) => {
             assert(*(result.unbox()) == 1, 'wrong result');
         },
-        Option::None(_) => {
-            assert(0 == 1, 'should return value');
+        Option::None => {
+            assert(false, 'should return value');
         },
     };
 
@@ -66,8 +66,8 @@ fn queue_dequeue_test() {
         Option::Some(result) => {
             assert(result == 1, 'wrong result');
         },
-        Option::None(_) => {
-            assert(0 == 1, 'should return a value');
+        Option::None => {
+            assert(false, 'should return a value');
         },
     };
 

diff --git a/src/data_structures/tests/stack_test.cairo b/src/data_structures/tests/stack_test.cairo
@@ -44,8 +44,8 @@ fn stack_peek_test<
         Option::Some(result) => {
             assert(result == val_2, 'wrong result');
         },
-        Option::None(_) => {
-            assert(0 == 1, 'should return value');
+        Option::None => {
+            assert(false, 'should return value');
         },
     };
 
@@ -71,8 +71,8 @@ fn stack_pop_test<
         Option::Some(result) => {
             assert(result == val_2, 'wrong result');
         },
-        Option::None(_) => {
-            assert(0 == 1, 'should return a value');
+        Option::None => {
+            assert(false, 'should return a value');
         },
     };
 

diff --git a/src/data_structures/vec.cairo b/src/data_structures/vec.cairo
@@ -95,7 +95,7 @@ impl Felt252VecImpl<
             let item = self.items.get(index.into());
             Option::Some(item)
         } else {
-            Option::None(())
+            Option::None
         }
     }
 
@@ -140,7 +140,7 @@ impl NullableVecImpl<T, impl TDrop: Drop<T>, impl TCopy: Copy<T>> of VecTrait<Nu
         if index < self.len() {
             Option::Some(self.items.get(index.into()).deref())
         } else {
-            Option::None(())
+            Option::None
         }
     }
 

diff --git a/src/linalg/dot.cairo b/src/linalg/dot.cairo
@@ -30,7 +30,7 @@ fn dot<
                 let y_value = ys.pop_front().unwrap();
                 value += *x_value * *y_value;
             },
-            Option::None(_) => {
+            Option::None => {
                 break value;
             },
         };

diff --git a/src/math/collatz_sequence.cairo b/src/math/collatz_sequence.cairo
@@ -15,7 +15,7 @@ fn sequence(mut number: u128) -> Array<u128> {
     loop {
         arr.append(number);
         if number == 1 {
-            break ();
+            break;
         }
 
         if number % 2 == 0 {

diff --git a/src/math/ed25519.cairo b/src/math/ed25519.cairo
@@ -169,7 +169,7 @@ impl SpanU8TryIntoPoint of TryInto<Span<u8>, Point> {
 
         let mut y: u256 = self.into();
         if (y >= p) {
-            return Option::None(());
+            return Option::None;
         }
         // bitshit of 255
         let bitshift_255: u256 =
@@ -197,12 +197,12 @@ impl SpanU8TryIntoPoint of TryInto<Span<u8>, Point> {
             let p_minus_one_over_4: u256 = div_mod(sub_mod(p, 1, p), 4, p);
             x = mult_mod(x_candidate_root, pow_mod(2, p_minus_one_over_4, p), p);
         } else {
-            return Option::None(());
+            return Option::None;
         }
 
         if (x == 0) {
             if (x_0 == 1) {
-                return Option::None(());
+                return Option::None;
             }
         }
         if (x_0 != x % 2) {
@@ -234,7 +234,7 @@ fn point_mult(mut scalar: u256, mut P: ExtendedHomogeneousPoint) -> ExtendedHomo
     // Double and add method
     loop {
         if (scalar == zero_u512) {
-            break ();
+            break;
         }
         if ((scalar.low & 1) == 1) {
             Q = Q + P;

diff --git a/src/math/gcd_of_n_numbers.cairo b/src/math/gcd_of_n_numbers.cairo
@@ -18,7 +18,7 @@ fn gcd(mut n: Span<u128>) -> u128 {
             Option::Some(b) => {
                 a = gcd_two_numbers(a, *b);
             },
-            Option::None(()) => {
+            Option::None => {
                 break a;
             },
         };

diff --git a/src/math/perfect_number.cairo b/src/math/perfect_number.cairo
@@ -39,7 +39,7 @@ fn perfect_numbers(max: u128) -> Array<u128> {
 
     loop {
         if index == max {
-            break ();
+            break;
         }
         if is_perfect_number(index) {
             res.append(index);