aboutsummaryrefslogtreecommitdiff
path: root/stdlib/test
diff options
context:
space:
mode:
authorEduardo Julian2017-11-15 22:30:57 -0400
committerEduardo Julian2017-11-15 22:30:57 -0400
commitf11c10f72d003555d76c9803954e2bd8b347362d (patch)
treef484e9876e6a4d5bba9098315155d7d898766bc9 /stdlib/test
parent53ccae1625d46cf57247b9fb1cb9f4c28b0a0ad4 (diff)
- Moved "/type/*" to from "lux/meta/" to "lux/".
Diffstat (limited to 'stdlib/test')
-rw-r--r--stdlib/test/test/lux/data/format/json.lux12
-rw-r--r--stdlib/test/test/lux/type/implicit.lux (renamed from stdlib/test/test/lux/meta/type/implicit.lux)2
-rw-r--r--stdlib/test/test/lux/type/object.lux (renamed from stdlib/test/test/lux/meta/type/object.lux)2
-rw-r--r--stdlib/test/tests.lux8
4 files changed, 12 insertions, 12 deletions
diff --git a/stdlib/test/test/lux/data/format/json.lux b/stdlib/test/test/lux/data/format/json.lux
index 91e6bede3..ab18e047f 100644
--- a/stdlib/test/test/lux/data/format/json.lux
+++ b/stdlib/test/test/lux/data/format/json.lux
@@ -6,9 +6,9 @@
[eq #+ Eq]
pipe
["p" parser])
- (data [text "Text/" Monoid<Text>]
+ (data [text]
text/format
- ["E" error]
+ ["e" error]
[bool]
[maybe]
[number "i/" Number<Int>]
@@ -21,8 +21,8 @@
[syntax #+ syntax:]
[poly #+ derived:]
[poly/eq]
- [poly/json]
- (type [unit]))
+ [poly/json])
+ (type [unit])
["r" math/random]
(time ["ti" instant]
["tda" date]
@@ -170,8 +170,8 @@
(^open "@/") Codec<JSON,Record>]]
(test "Can encode/decode arbitrary types."
(|> sample @/encode @/decode
- (case> (#E;Success result)
+ (case> (#e;Success result)
(@/= sample result)
- (#E;Error error)
+ (#e;Error error)
false))))))
diff --git a/stdlib/test/test/lux/meta/type/implicit.lux b/stdlib/test/test/lux/type/implicit.lux
index 6d2344120..138a16b2e 100644
--- a/stdlib/test/test/lux/meta/type/implicit.lux
+++ b/stdlib/test/test/lux/type/implicit.lux
@@ -9,7 +9,7 @@
maybe
(coll [list]))
["r" math/random]
- (meta type/implicit))
+ (type implicit))
lux/test)
(context: "Automatic structure selection"
diff --git a/stdlib/test/test/lux/meta/type/object.lux b/stdlib/test/test/lux/type/object.lux
index c6b7d0f80..c85ff5770 100644
--- a/stdlib/test/test/lux/meta/type/object.lux
+++ b/stdlib/test/test/lux/type/object.lux
@@ -1,7 +1,7 @@
(;module:
lux
(lux (data (coll [list]))
- (meta (type object))))
+ (type object)))
## No parameters
(interface: Counter
diff --git a/stdlib/test/tests.lux b/stdlib/test/tests.lux
index 3e1d6b5f3..34f6ef8b0 100644
--- a/stdlib/test/tests.lux
+++ b/stdlib/test/tests.lux
@@ -65,9 +65,9 @@
(meta ["_;" code]
["_;" syntax]
(poly ["poly_;" eq]
- ["poly_;" functor])
- (type ["_;" implicit]
- ["_;" object]))
+ ["poly_;" functor]))
+ (type ["_;" implicit]
+ ["_;" object])
(lang ["lang_;" syntax]
["_;" type]
(type ["_;" check]))
@@ -89,7 +89,7 @@
(coll (tree ["tree_;" parser])))
(math [random])
[meta]
- (meta (type [unit]))
+ (type [unit])
[world/env])
)