Upgrade to Cairo 2.5.3 and other refactors

.tool-versions

@@ -1 +1 @@
-scarb 2.4.0
+scarb 2.5.3

Scarb.toml

@@ -19,7 +19,7 @@ description = "Community maintained Cairo and Starknet libraries"
 homepage = "https://github.com/keep-starknet-strange/alexandria/"
 
 [workspace.dependencies]
-starknet = ">=2.4.0"
+starknet = ">=2.5.0"
 
 [workspace.tool.fmt]
 sort-module-level-items = true

src/ascii/src/integer.cairo

@@ -36,10 +36,7 @@ impl ToAsciiArrayTraitImpl<
         }
 
         let mut num = self;
-        loop {
-            if num.is_zero() {
-                break;
-            }
+        while num.is_non_zero() {
             let (quotient, remainder) = DivRem::div_rem(
                 num, TryInto::<felt252, T>::try_into(10).unwrap().try_into().expect('Division by 0')
             );
@@ -71,11 +68,9 @@ impl SmallIntegerToAsciiTraitImpl<
 
         let mut inverse_ascii_arr = self.to_inverse_ascii_array().span();
         let mut ascii: felt252 = 0;
-        loop {
-            match inverse_ascii_arr.pop_back() {
-                Option::Some(val) => { ascii = ascii * 256 + *val; },
-                Option::None(_) => { break; },
-            };
+        while !inverse_ascii_arr.is_empty() {
+            let val = *inverse_ascii_arr.pop_back().unwrap();
+            ascii = ascii * 256 + val;
         };
 
         ascii
@@ -153,10 +148,7 @@ impl U256ToAsciiArrayTraitImpl of ToAsciiArrayTrait<u256> {
             return new_arr;
         }
         let mut num = self;
-        loop {
-            if num.is_zero() {
-                break;
-            }
+        while num != 0 {
             let (quotient, remainder) = DivRem::div_rem(
                 num, 10_u256.try_into().expect('Division by 0')
             );