feat(corelib): Rewrite get_or_insert_with code

starkware-libs · Jan 15, 2025 · 9a8c410 · 9a8c410
1 parent 5218066
commit 9a8c410
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/corelib/src/option.cairo b/corelib/src/option.cairo
@@ -805,11 +805,14 @@ pub impl OptionTraitImpl<T> of OptionTrait<T> {
     fn get_or_insert_with<F, +core::ops::FnOnce<F, ()>[Output: T], +Drop<F>, +Copy<T>, +Drop<T>>(
         ref self: Option<T>, f: F,
     ) -> T {
-        if self.is_none() {
-            self = Option::Some(f());
-        };
-
-        self.unwrap()
+        match self {
+            Option::Some(value) => value,
+            Option::None => {
+                let value = f();
+                self = Option::Some(value);
+                value
+            }
+        }
     }
 }