Relocated maybe and lazy from data to control.

7 files changed, 10 insertions, 10 deletions

diff --git a/stdlib/source/specification/compositor.lux b/stdlib/source/specification/compositor.lux
index 7c7d620f1..cf7008b76 100644
--- a/stdlib/source/specification/compositor.lux
+++ b/stdlib/source/specification/compositor.lux
@@ -50,7 +50,7 @@
         Test))
   (do r.monad
     [_ (in [])
-     .let [?state,runner,definer (<| io.run
+     .let [?state,runner,definer (<| io.run!
                                      (do io.monad
                                        [platform platform])
                                      (/common.executors platform
diff --git a/stdlib/source/specification/compositor/analysis/type.lux b/stdlib/source/specification/compositor/analysis/type.lux
index 6e3c4dba7..662748677 100644
--- a/stdlib/source/specification/compositor/analysis/type.lux
+++ b/stdlib/source/specification/compositor/analysis/type.lux
@@ -25,7 +25,7 @@
   (|> (analysis/scope.with_scope ""
                                  (analysis/type.with_type output_type
                                                           (analysis.phase expander (` ((~ (code.text extension)) (~+ params))))))
-      (phase.run state)
+      (phase.result state)
       (case> (#try.Success _)
              true
 
diff --git a/stdlib/source/specification/compositor/common.lux b/stdlib/source/specification/compositor/common.lux
index 2c83cbd9e..3a7f70731 100644
--- a/stdlib/source/specification/compositor/common.lux
+++ b/stdlib/source/specification/compositor/common.lux
@@ -35,7 +35,7 @@
   (Instancer Runner)
   (function (_ evaluation_name expressionS)
     (do try.monad
-      [expressionG (<| (phase.run state)
+      [expressionG (<| (phase.result state)
                        generation.with_buffer
                        (do phase.monad
                          [_ runtime]
@@ -47,7 +47,7 @@
   (Instancer Definer)
   (function (_ lux_name expressionS)
     (do try.monad
-      [definitionG (<| (phase.run state)
+      [definitionG (<| (phase.result state)
                        generation.with_buffer
                        (do phase.monad
                          [_ runtime
diff --git a/stdlib/source/specification/compositor/generation/case.lux b/stdlib/source/specification/compositor/generation/case.lux
index 81042846f..bca682a9e 100644
--- a/stdlib/source/specification/compositor/generation/case.lux
+++ b/stdlib/source/specification/compositor/generation/case.lux
@@ -232,8 +232,8 @@
   Path
   ($_ synthesis.path/alt
       (<| try.assumed
-          (phase.run [extension/synthesis.bundle
-                      synthesis.init])
+          (phase.result [extension/synthesis.bundle
+                         synthesis.init])
           (case.path phase/synthesis.phase
                      special_pattern)
           (analysis.bit #1))
diff --git a/stdlib/source/specification/compositor/generation/function.lux b/stdlib/source/specification/compositor/generation/function.lux
index a9845081b..ad90dbfa0 100644
--- a/stdlib/source/specification/compositor/generation/function.lux
+++ b/stdlib/source/specification/compositor/generation/function.lux
@@ -5,9 +5,9 @@
     [monad (#+ do)]
     ["." enum]]
    [control
-    [pipe (#+ case>)]]
+    [pipe (#+ case>)]
+    ["." maybe]]
    [data
-    ["." maybe]
     [number
      ["n" nat]]
     [collection
diff --git a/stdlib/source/specification/compositor/generation/structure.lux b/stdlib/source/specification/compositor/generation/structure.lux
index 4feea793f..0b4bfe4fe 100644
--- a/stdlib/source/specification/compositor/generation/structure.lux
+++ b/stdlib/source/specification/compositor/generation/structure.lux
@@ -5,9 +5,9 @@
     [monad (#+ do)]]
    [control
     [pipe (#+ case>)]
+    ["." maybe]
     ["." try]]
    [data
-    ["." maybe]
     [number
      ["n" nat]
      ["i" int]]
diff --git a/stdlib/source/specification/lux/world/file.lux b/stdlib/source/specification/lux/world/file.lux
index b74a83fd6..971e312de 100644
--- a/stdlib/source/specification/lux/world/file.lux
+++ b/stdlib/source/specification/lux/world/file.lux
@@ -8,12 +8,12 @@
     [control
      [pipe (#+ case>)]
      [io (#+ IO)]
+     ["." maybe ("#\." functor)]
      ["." try ("#\." functor)]
      ["." exception]
      [concurrency
       ["." async (#+ Async)]]]
     [data
-     ["." maybe ("#\." functor)]
      ["." text ("#\." equivalence)
       ["%" format (#+ format)]
       [encoding