Relocated maybe and lazy from data to control.

6 files changed, 11 insertions, 9 deletions

diff --git a/stdlib/source/test/lux/world/console.lux b/stdlib/source/test/lux/world/console.lux
index c358ca699..945dfc352 100644
--- a/stdlib/source/test/lux/world/console.lux
+++ b/stdlib/source/test/lux/world/console.lux
@@ -58,7 +58,7 @@
             [expected (random.ascii/alpha 10)
              .let [console (/.mock ..mock [false ""])]]
             (_.cover [/.write_line]
-                     (io.run
+                     (io.run!
                       (do io.monad
                         [?_ (/.write_line expected console)
                          ?actual (\ console read_line [])]
diff --git a/stdlib/source/test/lux/world/file/watch.lux b/stdlib/source/test/lux/world/file/watch.lux
index f3e0d7968..98f589439 100644
--- a/stdlib/source/test/lux/world/file/watch.lux
+++ b/stdlib/source/test/lux/world/file/watch.lux
@@ -101,7 +101,7 @@
   (-> (//.System Async) (/.Watcher Async) //.Path (Async (Try Bit)))
   (do (try.with async.monad)
     [_ (: (Async (Try Any))
-          (//.make_file async.monad fs (binary.create 0) expected_path))
+          (//.make_file async.monad fs (binary.empty 0) expected_path))
      poll/pre (\ watcher poll [])
      poll/post (\ watcher poll [])]
     (in (and (case poll/pre
diff --git a/stdlib/source/test/lux/world/input/keyboard.lux b/stdlib/source/test/lux/world/input/keyboard.lux
index c9c6cfee3..28c2849be 100644
--- a/stdlib/source/test/lux/world/input/keyboard.lux
+++ b/stdlib/source/test/lux/world/input/keyboard.lux
@@ -4,9 +4,10 @@
     ["_" test (#+ Test)]
     [abstract
      [monad (#+ do)]]
+    [control
+     ["." maybe]]
     [data
      ["." bit ("#\." equivalence)]
-     ["." maybe]
      [collection
       ["." list]
       ["." set (#+ Set)]]]
diff --git a/stdlib/source/test/lux/world/net/http/client.lux b/stdlib/source/test/lux/world/net/http/client.lux
index d1726c7e0..24ece9d1e 100644
--- a/stdlib/source/test/lux/world/net/http/client.lux
+++ b/stdlib/source/test/lux/world/net/http/client.lux
@@ -69,8 +69,8 @@
                       [(_.cover [<definition>]
                                 (|> (<definition> "" //.empty #.None mock)
                                     (do> try.monad
-                                         [io.run]
-                                         [product.right (get@ #//.body) (function.apply #.None) io.run]
+                                         [io.run!]
+                                         [product.right (get@ #//.body) (function.apply #.None) io.run!]
                                          [product.right (\ utf8.codec decode)]
                                          [(\ nat.decimal decode)]
                                          [(nat.= <expected>) in])
diff --git a/stdlib/source/test/lux/world/output/video/resolution.lux b/stdlib/source/test/lux/world/output/video/resolution.lux
index 0775b263e..543dcb3f7 100644
--- a/stdlib/source/test/lux/world/output/video/resolution.lux
+++ b/stdlib/source/test/lux/world/output/video/resolution.lux
@@ -7,8 +7,9 @@
      [\\specification
       ["$." equivalence]
       ["$." hash]]]
+    [control
+     ["." maybe]]
     [data
-     ["." maybe]
      [collection
       ["." list]
       ["." set (#+ Set)]]]
diff --git a/stdlib/source/test/lux/world/program.lux b/stdlib/source/test/lux/world/program.lux
index 50e1b4ffd..f2643a3b7 100644
--- a/stdlib/source/test/lux/world/program.lux
+++ b/stdlib/source/test/lux/world/program.lux
@@ -7,12 +7,12 @@
     [control
      [pipe (#+ case>)]
      ["." io]
+     ["." maybe ("#\." functor)]
      ["." try]
      ["." exception]
      [parser
       [environment (#+ Environment)]]]
     [data
-     ["." maybe ("#\." functor)]
      ["." text ("#\." equivalence)]
      [collection
       ["." dictionary]
@@ -53,7 +53,7 @@
                    ($/.spec (/.async (/.mock environment home directory))))
             (_.cover [/.environment]
                      (let [program (/.mock environment home directory)]
-                       (io.run
+                       (io.run!
                         (do io.monad
                           [actual (/.environment io.monad program)]
                           (in (and (n.= (dictionary.size environment)
@@ -69,7 +69,7 @@
                      (let [program (/.mock environment home directory)]
                        (|> unknown
                            (\ program variable)
-                           io.run
+                           io.run!
                            (case> (#try.Success _)
                                   false