- Re-organized dict modules.

7 files changed, 13 insertions, 13 deletions

diff --git a/stdlib/test/test/lux/data/coll/ordered/dict.lux b/stdlib/test/test/lux/data/coll/dict/ordered.lux
index 301e64927..73a1ebcad 100644
--- a/stdlib/test/test/lux/data/coll/ordered/dict.lux
+++ b/stdlib/test/test/lux/data/coll/dict/ordered.lux
@@ -5,9 +5,9 @@
                 [eq #+ Eq])
        (data [product]
              [number]
-             (coll (ordered ["&" dict])
-                   (set ["s" unordered])
-                   ["d" dict]
+             (coll (set ["s" unordered])
+                   (dict ["dict" unordered]
+                         ["&" ordered])
                    [list "L/" Functor<List>]))
        ["r" math/random])
   lux/test)
diff --git a/stdlib/test/test/lux/data/coll/dict.lux b/stdlib/test/test/lux/data/coll/dict/unordered.lux
index 01074b6fc..73b0df822 100644
--- a/stdlib/test/test/lux/data/coll/dict.lux
+++ b/stdlib/test/test/lux/data/coll/dict/unordered.lux
@@ -7,7 +7,7 @@
              text/format
              [number]
              [maybe]
-             (coll ["&" dict]
+             (coll (dict ["&" unordered])
                    [list "list/" Fold<List> Functor<List>]))
        ["r" math/random])
   lux/test)
diff --git a/stdlib/test/test/lux/data/format/json.lux b/stdlib/test/test/lux/data/format/json.lux
index eec53b9cc..d302c63b0 100644
--- a/stdlib/test/test/lux/data/format/json.lux
+++ b/stdlib/test/test/lux/data/format/json.lux
@@ -14,7 +14,7 @@
              [number]
              (format ["@" json])
              (coll [sequence #+ sequence]
-                   ["d" dict]
+                   (dict ["d" unordered])
                    [list]))
        [macro #+ with-gensyms]
        (macro [code]
diff --git a/stdlib/test/test/lux/data/format/xml.lux b/stdlib/test/test/lux/data/format/xml.lux
index ed337a0b7..80ac5bcb1 100644
--- a/stdlib/test/test/lux/data/format/xml.lux
+++ b/stdlib/test/test/lux/data/format/xml.lux
@@ -10,8 +10,8 @@
              ["E" error]
              [maybe]
              (format ["&" xml])
-             (coll [dict]
-                   [list "L/" Functor<List>]))
+             (coll (dict ["dict" unordered])
+                   [list "list/" Functor<List>]))
        ["r" math/random "r/" Monad<Random>]
        test)
   )
@@ -85,7 +85,7 @@
          value (xml-text^ +1 +10)
          #let [node (#&.Node tag
                              (dict.put attr value &.attrs)
-                             (L/map (|>> #&.Text) children))]]
+                             (list/map (|>> #&.Text) children))]]
         ($_ seq
             (test "Can parse text."
                   (E.default false
diff --git a/stdlib/test/test/lux/lang/syntax.lux b/stdlib/test/test/lux/lang/syntax.lux
index 2b4d6789f..49967e071 100644
--- a/stdlib/test/test/lux/lang/syntax.lux
+++ b/stdlib/test/test/lux/lang/syntax.lux
@@ -8,7 +8,7 @@
              (text format
                    ["l" lexer])
              (coll [list]
-                   [dict #+ Dict]))
+                   (dict ["dict" unordered #+ Dict])))
        ["r" math/random "r/" Monad<Random>]
        (macro [code])
        (lang ["&" syntax])
diff --git a/stdlib/test/test/lux/math/random.lux b/stdlib/test/test/lux/math/random.lux
index eed882ea7..45c83016c 100644
--- a/stdlib/test/test/lux/math/random.lux
+++ b/stdlib/test/test/lux/math/random.lux
@@ -10,7 +10,7 @@
                    [queue]
                    [stack]
                    (set ["set" unordered])
-                   [dict]))
+                   (dict ["dict" unordered])))
        (math ["r" random]))
   lux/test)
 
diff --git a/stdlib/test/tests.lux b/stdlib/test/tests.lux
index 9739c63e5..2c462e248 100644
--- a/stdlib/test/tests.lux
+++ b/stdlib/test/tests.lux
@@ -43,7 +43,8 @@
                            ["_." xml])
                    (coll ["_." array]
                          ["_." bits]
-                         ["_." dict]
+                         ["_." dict/unordered]
+                         ["_." dict/ordered]
                          ["_." list]
                          ["_." queue]
                          ["_." set/unordered]
@@ -53,8 +54,7 @@
                          ["_." priority-queue]
                          ["_." stream]
                          (tree ["tree_." rose]
-                               ["tree_." zipper])
-                         (ordered ["ordered_." dict]))
+                               ["tree_." zipper]))
                    (text ["_." format]
                          ["_." lexer]
                          ["_." regex]))