Use new convention for result

2 files changed, 10 insertions, 55 deletions

diff --git a/src/gleam/dynamic.gleam b/src/gleam/dynamic.gleam
index c500640..1d8e9ff 100644
--- a/src/gleam/dynamic.gleam
+++ b/src/gleam/dynamic.gleam
@@ -240,26 +240,6 @@ if javascript {
     "../gleam_stdlib.mjs" "decode_list"
 }
 
-/// Checks to see whether a `Dynamic` value is a result, and returns that result if
-/// it is.
-///
-/// ## Examples
-///
-///    > result(from(Ok(1)))
-///    Ok(Ok(from(1)))
-///
-///    > result(from(Error("boom")))
-///    Ok(Error(from("boom")))
-///
-///    > result(from(123))
-///    Error(DecodeError(expected: "2 element tuple", found: "Int"))
-///
-pub fn result(
-  from value: Dynamic,
-) -> Result(Result(Dynamic, Dynamic), DecodeError) {
-  decode_result(value)
-}
-
 if erlang {
   external fn decode_result(Dynamic) -> Result(Result(a, e), DecodeError) =
     "gleam_stdlib" "decode_result"
@@ -278,21 +258,21 @@ if javascript {
 ///
 /// ## Examples
 ///
-///    > typed_result(of: from(Ok(1)), ok: int, error: string)
+///    > result(of: from(Ok(1)), ok: int, error: string)
 ///    Ok(Ok(1))
 ///
-///    > typed_result(of: from(Error("boom")), ok: int, error: string)
+///    > result(of: from(Error("boom")), ok: int, error: string)
 ///    Ok(Error("boom"))
 ///
-///    > typed_result(of: from(123), ok: int, error: string)
+///    > result(of: from(123), ok: int, error: string)
 ///    Error(DecodeError(expected: "2 element tuple", found: "Int"))
 ///
-pub fn typed_result(
+pub fn result(
   of dynamic: Dynamic,
   ok decode_ok: Decoder(a),
   error decode_error: Decoder(e),
 ) -> Result(Result(a, e), DecodeError) {
-  try inner_result = result(dynamic)
+  try inner_result = decode_result(dynamic)
 
   case inner_result {
     Ok(raw) ->
diff --git a/test/gleam/dynamic_test.gleam b/test/gleam/dynamic_test.gleam
index 8b34820..57dfdae 100644
--- a/test/gleam/dynamic_test.gleam
+++ b/test/gleam/dynamic_test.gleam
@@ -770,51 +770,26 @@ pub fn shallow_list_test() {
 pub fn result_test() {
   Ok(1)
   |> dynamic.from
-  |> dynamic.result
-  |> should.equal(Ok(Ok(dynamic.from(1))))
-
-  Error("error")
-  |> dynamic.from
-  |> dynamic.result
-  |> should.equal(Ok(Error(dynamic.from("error"))))
-
-  1
-  |> dynamic.from
-  |> dynamic.result
-  |> should.equal(Error(DecodeError(expected: "Result", found: "Int")))
-
-  #("bad", "value")
-  |> dynamic.from
-  |> dynamic.result
-  |> should.equal(Error(DecodeError(
-    expected: "Result",
-    found: "Tuple of 2 elements",
-  )))
-}
-
-pub fn typed_result_test() {
-  Ok(1)
-  |> dynamic.from
-  |> dynamic.typed_result(ok: dynamic.int, error: dynamic.string)
+  |> dynamic.result(ok: dynamic.int, error: dynamic.string)
   |> should.equal(Ok(Ok(1)))
 
   Error("error")
   |> dynamic.from
-  |> dynamic.typed_result(ok: dynamic.int, error: dynamic.string)
+  |> dynamic.result(ok: dynamic.int, error: dynamic.string)
   |> should.equal(Ok(Error("error")))
 
   Ok("1")
   |> dynamic.from
-  |> dynamic.typed_result(ok: dynamic.int, error: dynamic.string)
+  |> dynamic.result(ok: dynamic.int, error: dynamic.string)
   |> should.equal(Error(DecodeError(expected: "Int", found: "String")))
 
   Error(1)
   |> dynamic.from
-  |> dynamic.typed_result(ok: dynamic.int, error: dynamic.string)
+  |> dynamic.result(ok: dynamic.int, error: dynamic.string)
   |> should.equal(Error(DecodeError(expected: "String", found: "Int")))
 
   1
   |> dynamic.from
-  |> dynamic.typed_result(ok: dynamic.int, error: dynamic.string)
+  |> dynamic.result(ok: dynamic.int, error: dynamic.string)
   |> should.equal(Error(DecodeError(expected: "Result", found: "Int")))
 }