move Option::unwrap to builtin (#594)

moonbitlang · Jun 24, 2024 · 1e4fda1 · 1e4fda1
1 parent 5a3b305
commit 1e4fda1
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 17 deletions.
diff --git a/builtin/builtin.mbti b/builtin/builtin.mbti
@@ -316,6 +316,7 @@ impl Option {
   debug_write[X : Debug](X?, Buffer) -> Unit
   op_equal[X : Eq](X?, X?) -> Bool
   to_string[X : Show](X?) -> String
+  unwrap[X](X?) -> X
 }
 impl Result {
   debug_write[T : Debug, E : Debug](Self[T, E], Buffer) -> Unit

diff --git a/builtin/linked_hash_map.mbt b/builtin/linked_hash_map.mbt
@@ -59,13 +59,6 @@ struct Map[K, V] {
 
 // Implementations
 
-fn unwrap[X](self : X?) -> X {
-  match self {
-    None => panic()
-    Some(x) => x
-  }
-}
-
 fn power_2_above(x : Int, n : Int) -> Int {
   for i = x {
     if i >= n {

diff --git a/builtin/option.mbt b/builtin/option.mbt
@@ -26,3 +26,17 @@ pub fn to_string[X : Show](self : X?) -> String {
     Some(x) => "Some(" + x.to_string() + ")"
   }
 }
+
+/// Extract the value in `Some`.
+/// Panic if input is `None`.
+pub fn unwrap[X](self : X?) -> X {
+  match self {
+    None => panic()
+    Some(x) => x
+  }
+}
+
+test "panic" {
+  let _ : Int = Option::None.unwrap()
+
+}
diff --git a/option/option.mbt b/option/option.mbt
@@ -322,15 +322,6 @@ test "compare" {
   @assertion.assert_eq(1, some2.compare(none))?
 }
 
-/// Extract the value in `Some`.
-/// Panic if input is `None`.
-pub fn unwrap[X](self : X?) -> X {
-  match self {
-    None => abort("called `Option::unwrap()` on a `None` value")
-    Some(x) => x
-  }
-}
-
 /// `None`
 pub fn Option::default[X]() -> X? {
   None

diff --git a/option/option.mbti b/option/option.mbti
@@ -24,7 +24,6 @@ impl Option {
   or[T](T?, T) -> T
   or_default[T : Default](T?) -> T
   or_else[T](T?, () -> T) -> T
-  unwrap[X](X?) -> X
 }
 
 // Traits