Update for Gleam v0.6.0

Author: lpil

gen/test/gleam@dynamic_test.erl

@@ -1,6 +1,8 @@
 pub external type Atom;
 
-pub struct AtomNotLoaded {}
+pub type AtomNotLoaded {
+  AtomNotLoaded
+}
 
 pub external fn from_string(String) -> Result(Atom, AtomNotLoaded) =
   "gleam_stdlib" "atom_from_string";

src/gleam/atom.gleam

@@ -36,7 +36,7 @@ pub external fn uppercase(Iodata) -> Iodata = "string" "uppercase"
 
 pub external fn reverse(Iodata) -> Iodata = "string" "reverse"
 
-enum Direction {
+type Direction {
   All
 }
 

src/gleam/iodata.gleam

@@ -2,7 +2,9 @@ import gleam/int
 import gleam/order
 import gleam/pair
 
-pub struct LengthMismatch {}
+pub type LengthMismatch {
+  LengthMismatch
+}
 
 // Using the Erlang C BIF implementation.
 //
@@ -196,7 +198,7 @@ pub fn zip(xs, ys) {
   case xs, ys {
     [], _ -> []
     _, [] -> []
-    [x | xs], [y | ys] -> [ struct(x, y) | zip(xs, ys) ]
+    [x | xs], [y | ys] -> [ tuple(x, y) | zip(xs, ys) ]
   }
 }
 
@@ -290,10 +292,10 @@ pub fn repeat(item a, times times) {
 
 fn do_split(list, n, taken) {
   case n <= 0 {
-    True -> struct(reverse(taken), list)
+    True -> tuple(reverse(taken), list)
     False ->
       case list {
-        [] -> struct(reverse(taken), [])
+        [] -> tuple(reverse(taken), [])
         [x | xs] -> do_split(xs, n - 1, [x | taken])
       }
   }
@@ -305,10 +307,10 @@ pub fn split(list list, on target) {
 
 fn do_split_while(list, f, acc) {
   case list {
-    [] -> struct(reverse(acc), [])
+    [] -> tuple(reverse(acc), [])
     [x | xs] ->
       case f(x) {
-        False -> struct(reverse(acc), list)
+        False -> tuple(reverse(acc), list)
         _ -> do_split_while(xs, f, [x | acc])
       }
   }

src/gleam/list.gleam

@@ -6,10 +6,10 @@ pub external type Map(key, value);
 pub external fn size(Map(k, v)) -> Int
   = "maps" "size"
 
-pub external fn to_list(Map(key, value)) -> List(struct(key, value))
+pub external fn to_list(Map(key, value)) -> List(tuple(key, value))
   = "maps" "to_list"
 
-pub external fn from_list(List(struct(key, value))) -> Map(key, value)
+pub external fn from_list(List(tuple(key, value))) -> Map(key, value)
   = "maps" "from_list"
 
 external fn is_key(key, Map(key, v)) -> Bool
@@ -84,7 +84,7 @@ pub fn update(in map, update key, with fun) {
 fn do_fold(list, initial, fun) {
   case list {
     [] -> initial
-    [struct(k, v) | tail] -> do_fold(tail, fun(k, v, initial), fun)
+    [tuple(k, v) | tail] -> do_fold(tail, fun(k, v, initial), fun)
   }
 }
 

src/gleam/map.gleam

@@ -1,4 +1,4 @@
-pub enum Order {
+pub type Order {
   Lt
   Eq
   Gt

src/gleam/order.gleam

@@ -1,24 +1,24 @@
 pub fn first(pair) {
-  let struct(a, _) = pair
+  let tuple(a, _) = pair
   a
 }
 
 pub fn second(pair) {
-  let struct(_, a) = pair
+  let tuple(_, a) = pair
   a
 }
 
 pub fn swap(pair) {
-  let struct(a, b) = pair
-  struct(b, a)
+  let tuple(a, b) = pair
+  tuple(b, a)
 }
 
 pub fn map_first(of pair, with fun) {
-    let struct(a, b) = pair
-    struct(fun(a), b)
+  let tuple(a, b) = pair
+  tuple(fun(a), b)
 }
 
 pub fn map_second(of pair, with fun) {
-    let struct(a, b) = pair
-    struct(a, fun(b))
+  let tuple(a, b) = pair
+  tuple(a, fun(b))
 }

src/gleam/pair.gleam

@@ -187,8 +187,6 @@ pub fn list_test() {
   |> expect.is_error
 }
 
-// TODO: struct2
-
 pub fn field_test() {
   let Ok(ok_atom) = atom.from_string("ok")
   let Ok(error_atom) = atom.from_string("error")
@@ -224,24 +222,24 @@ pub fn field_test() {
 
 pub fn element_test() {
   let Ok(ok_atom) = atom.from_string("ok")
-  let ok_one_struct = struct(ok_atom, 1)
+  let ok_one_tuple = tuple(ok_atom, 1)
 
-  ok_one_struct
+  ok_one_tuple
   |> dynamic.from
   |> dynamic.element(_, 0)
   |> expect.equal(_, Ok(dynamic.from(ok_atom)))
 
-  ok_one_struct
+  ok_one_tuple
   |> dynamic.from
   |> dynamic.element(_, 1)
   |> expect.equal(_, Ok(dynamic.from(1)))
 
-  ok_one_struct
+  ok_one_tuple
   |> dynamic.from
   |> dynamic.element(_, 2)
   |> expect.is_error
 
-  ok_one_struct
+  ok_one_tuple
   |> dynamic.from
   |> dynamic.element(_, -1)
   |> expect.is_error

test/gleam/dynamic_test.gleam

@@ -222,13 +222,13 @@ pub fn zip_test() {
   |> expect.equal(_, [])
 
   list.zip([1, 2, 3], [4, 5, 6])
-  |> expect.equal(_, [struct(1, 4), struct(2, 5), struct(3, 6)])
+  |> expect.equal(_, [tuple(1, 4), tuple(2, 5), tuple(3, 6)])
 
   list.zip([5, 6], [1, 2, 3])
-  |> expect.equal(_, [struct(5, 1), struct(6, 2)])
+  |> expect.equal(_, [tuple(5, 1), tuple(6, 2)])
 
   list.zip([5, 6, 7], [1, 2])
-  |> expect.equal(_, [struct(5, 1), struct(6, 2)])
+  |> expect.equal(_, [tuple(5, 1), tuple(6, 2)])
 }
 
 pub fn strict_zip_test() {
@@ -240,9 +240,9 @@ pub fn strict_zip_test() {
 
   list.strict_zip([1, 2, 3], [4, 5, 6])
   |> expect.equal(_, Ok([
-    struct(1, 4),
-    struct(2, 5),
-    struct(3, 6),
+    tuple(1, 4),
+    tuple(2, 5),
+    tuple(3, 6),
   ]))
 
   list.strict_zip([5, 6], [1, 2, 3])
@@ -307,8 +307,8 @@ pub fn sort_test() {
 }
 
 pub fn index_map_test() {
-  list.index_map([3, 4, 5], fn(i, x) { struct(i, x) })
-  |> expect.equal(_, [struct(0, 3), struct(1, 4), struct(2, 5)])
+  list.index_map([3, 4, 5], fn(i, x) { tuple(i, x) })
+  |> expect.equal(_, [tuple(0, 3), tuple(1, 4), tuple(2, 5)])
 
   let f = fn(i, x) {
     string.append(x, int.to_string(i))
@@ -354,54 +354,54 @@ pub fn repeat_test() {
 pub fn split_test() {
   []
   |> list.split(_, 0)
-  |> expect.equal(_, struct([], []))
+  |> expect.equal(_, tuple([], []))
 
   [0, 1, 2, 3, 4]
   |> list.split(_, 0)
-  |> expect.equal(_, struct([], [0, 1, 2, 3, 4]))
+  |> expect.equal(_, tuple([], [0, 1, 2, 3, 4]))
 
   [0, 1, 2, 3, 4]
   |> list.split(_, -2)
-  |> expect.equal(_, struct([], [0, 1, 2, 3, 4]))
+  |> expect.equal(_, tuple([], [0, 1, 2, 3, 4]))
 
   [0, 1, 2, 3, 4]
   |> list.split(_, 1)
-  |> expect.equal(_, struct([0], [1, 2, 3, 4]))
+  |> expect.equal(_, tuple([0], [1, 2, 3, 4]))
 
   [0, 1, 2, 3, 4]
   |> list.split(_, 3)
-  |> expect.equal(_, struct([0, 1, 2], [3, 4]))
+  |> expect.equal(_, tuple([0, 1, 2], [3, 4]))
 
   [0, 1, 2, 3, 4]
   |> list.split(_, 9)
-  |> expect.equal(_, struct([0, 1, 2, 3, 4], []))
+  |> expect.equal(_, tuple([0, 1, 2, 3, 4], []))
 }
 
 pub fn split_while_test() {
   []
   |> list.split_while(_, fn(x) { x <= 5 })
-  |> expect.equal(_, struct([], []))
+  |> expect.equal(_, tuple([], []))
 
   [1, 2, 3, 4, 5]
   |> list.split_while(_, fn(x) { x <= 5 })
-  |> expect.equal(_, struct([1, 2, 3, 4, 5], []))
+  |> expect.equal(_, tuple([1, 2, 3, 4, 5], []))
 
   [1, 2, 3, 4, 5]
   |> list.split_while(_, fn(x) { x == 2 })
-  |> expect.equal(_, struct([], [1, 2, 3, 4, 5]))
+  |> expect.equal(_, tuple([], [1, 2, 3, 4, 5]))
 
   [1, 2, 3, 4, 5]
   |> list.split_while(_, fn(x) { x <= 3 })
-  |> expect.equal(_, struct([1, 2, 3], [4, 5]))
+  |> expect.equal(_, tuple([1, 2, 3], [4, 5]))
 
   [1, 2, 3, 4, 5]
   |> list.split_while(_, fn(x) { x <= -3 })
-  |> expect.equal(_, struct([], [1, 2, 3, 4, 5]))
+  |> expect.equal(_, tuple([], [1, 2, 3, 4, 5]))
 }
 
 
 pub fn key_find_test() {
-  let proplist = [struct(0, "1"), struct(1, "2")]
+  let proplist = [tuple(0, "1"), tuple(1, "2")]
 
   proplist
   |> list.key_find(_, 0)