Listing reorg Chapter 1 to 7 (cairo-book#685)

.tool-versions

@@ -1 +1 @@
-scarb 2.5.3
+scarb 2.6.3

listings/ch03-common-collections/no_listing_11_dict_of_complex/src/lib.cairo → listings/ch03-common-collections/no_listing_13_dict_of_complex/src/lib.cairo

@@ -1,5 +1,4 @@
 // ANCHOR: all
-
 // ANCHOR: imports
 use core::nullable::{NullableTrait, match_nullable, FromNullableResult};
 // ANCHOR_END: imports

listings/ch05-using-structs-to-structure-related-data/listing_05_06_no_struct/src/lib.cairo → listings/ch05-using-structs-to-structure-related-data/listing_03_no_struct/src/lib.cairo

@@ -1,5 +1,4 @@
 //ANCHOR:all
-
 fn main() {
     let width1 = 30;
     let height1 = 10;

listings/ch06-enums-and-pattern-matching/no_listing_03_enum_option/src/lib.cairo → listings/ch06-enums-and-pattern-matching/no_listing_04_enum_option/src/lib.cairo

@@ -6,19 +6,21 @@ fn find_value_recursive(mut arr: Span<felt252>, value: felt252, index: usize) ->
         Option::None => { return Option::None; },
     };
 
-    return find_value_recursive(arr, value, index + 1);
+    find_value_recursive(arr, value, index + 1)
 }
 
 fn find_value_iterative(mut arr: Span<felt252>, value: felt252) -> Option<usize> {
+    let mut result = Option::None;
     let mut index = 0;
 
-    loop {
-        match arr.pop_front() {
-            Option::Some(array_value) => if (*array_value == value) {
-                break Option::Some(index);
-            },
-            Option::None => { break Option::None; },
-        }
-        index += 1;
-    }
+    while let Option::Some(array_value) = arr
+        .pop_front() {
+            if (*array_value == value) {
+                result = Option::Some(index);
+            };
+
+            index += 1;
+        };
+
+    result
 }