Moved "lux/time" to "lux/world/time".

21 files changed, 57 insertions, 49 deletions

diff --git a/stdlib/source/library/lux/control/concurrency/thread.lux b/stdlib/source/library/lux/control/concurrency/thread.lux
index 5fb0f883b..408b854f8 100644
--- a/stdlib/source/library/lux/control/concurrency/thread.lux
+++ b/stdlib/source/library/lux/control/concurrency/thread.lux
@@ -19,8 +19,9 @@
    [meta
     ["@" target]
     ["[0]" configuration]]
-   [time
-    ["[0]" instant]]]]
+   [world
+    [time
+     ["[0]" instant]]]]]
  [//
   ["[0]" atom (.only Atom)]])
 
diff --git a/stdlib/source/library/lux/control/remember.lux b/stdlib/source/library/lux/control/remember.lux
index 800dc3627..b7a91758f 100644
--- a/stdlib/source/library/lux/control/remember.lux
+++ b/stdlib/source/library/lux/control/remember.lux
@@ -17,9 +17,10 @@
     [macro
      [syntax (.only syntax)]
      ["[0]" template]]]
-   [time
-    ["[0]" instant]
-    ["[0]" date (.only Date) (.use "[1]#[0]" order)]]]])
+   [world
+    [time
+     ["[0]" instant]
+     ["[0]" date (.only Date) (.use "[1]#[0]" order)]]]]])
 
 (exception .public (must_remember [deadline Date
                                    today Date
diff --git a/stdlib/source/library/lux/data/format/tar.lux b/stdlib/source/library/lux/data/format/tar.lux
index 41a582b07..aad8579af 100644
--- a/stdlib/source/library/lux/data/format/tar.lux
+++ b/stdlib/source/library/lux/data/format/tar.lux
@@ -33,11 +33,11 @@
      ["^" pattern]]
     [type
      [primitive (.except)]]]
-   [time
-    ["[0]" instant (.only Instant)]
-    ["[0]" duration]]
    [world
-    ["[0]" file]]]])
+    ["[0]" file]
+    [time
+     ["[0]" instant (.only Instant)]
+     ["[0]" duration]]]]])
 
 (type Size
   Nat)
diff --git a/stdlib/source/library/lux/debug.lux b/stdlib/source/library/lux/debug.lux
index 5bf180093..47046fadc 100644
--- a/stdlib/source/library/lux/debug.lux
+++ b/stdlib/source/library/lux/debug.lux
@@ -35,12 +35,13 @@
      ["[0]" syntax (.only syntax)]]
     ["[0]" type (.only)
      ["<[1]>" \\parser (.only Parser)]]]
-   [time (.only Time)
-    [instant (.only Instant)]
-    [duration (.only Duration)]
-    [date (.only Date)]
-    [month (.only Month)]
-    [day (.only Day)]]]])
+   [world
+    [time (.only Time)
+     [instant (.only Instant)]
+     [duration (.only Duration)]
+     [date (.only Date)]
+     [month (.only Month)]
+     [day (.only Day)]]]]])
 
 (with_expansions [<jvm> (these (import java/lang/String
                                  "[1]::[0]")
diff --git a/stdlib/source/library/lux/math/random.lux b/stdlib/source/library/lux/math/random.lux
index ece9576f8..d482c72b3 100644
--- a/stdlib/source/library/lux/math/random.lux
+++ b/stdlib/source/library/lux/math/random.lux
@@ -31,12 +31,13 @@
    [meta
     [type
      [refinement (.only Refiner Refined)]]]
-   ["[0]" time (.only Time)
-    ["[0]" instant (.only Instant)]
-    ["[0]" date (.only Date)]
-    ["[0]" duration (.only Duration)]
-    ["[0]" month (.only Month)]
-    ["[0]" day (.only Day)]]]])
+   [world
+    ["[0]" time (.only Time)
+     ["[0]" instant (.only Instant)]
+     ["[0]" date (.only Date)]
+     ["[0]" duration (.only Duration)]
+     ["[0]" month (.only Month)]
+     ["[0]" day (.only Day)]]]]])
 
 (type .public PRNG
   (Rec PRNG
diff --git a/stdlib/source/library/lux/meta/compiler/meta/export.lux b/stdlib/source/library/lux/meta/compiler/meta/export.lux
index 20a0bd0cd..a32656ffa 100644
--- a/stdlib/source/library/lux/meta/compiler/meta/export.lux
+++ b/stdlib/source/library/lux/meta/compiler/meta/export.lux
@@ -23,10 +23,10 @@
       [cli (.only Source Export)]
       ["[0]" io
        ["[1]" context]]]]]
-   [time
-    ["[0]" instant]]
    [world
-    ["[0]" file]]]])
+    ["[0]" file]
+    [time
+     ["[0]" instant]]]]])
 
 (def .public file
   "library.tar")
diff --git a/stdlib/source/library/lux/meta/compiler/meta/packager/scheme.lux b/stdlib/source/library/lux/meta/compiler/meta/packager/scheme.lux
index b98361ff0..0b14e378f 100644
--- a/stdlib/source/library/lux/meta/compiler/meta/packager/scheme.lux
+++ b/stdlib/source/library/lux/meta/compiler/meta/packager/scheme.lux
@@ -23,10 +23,10 @@
    [meta
     [target
      ["_" scheme]]]
-   [time
-    ["[0]" instant (.only Instant)]]
    [world
-    ["[0]" file]]]]
+    ["[0]" file]
+    [time
+     ["[0]" instant (.only Instant)]]]]]
  [program
   [compositor
    ["[0]" static (.only Static)]]]
diff --git a/stdlib/source/library/lux/meta/compiler/phase.lux b/stdlib/source/library/lux/meta/compiler/phase.lux
index a0b4df481..2b67baec4 100644
--- a/stdlib/source/library/lux/meta/compiler/phase.lux
+++ b/stdlib/source/library/lux/meta/compiler/phase.lux
@@ -13,9 +13,10 @@
     ["[0]" product]
     [text
      ["%" \\format (.only format)]]]
-   [time
-    ["[0]" instant]
-    ["[0]" duration]]]]
+   [world
+    [time
+     ["[0]" instant]
+     ["[0]" duration]]]]]
  [//
   [meta
    [archive (.only Archive)]]])
diff --git a/stdlib/source/library/lux/test.lux b/stdlib/source/library/lux/test.lux
index b3de0884d..e6690c522 100644
--- a/stdlib/source/library/lux/test.lux
+++ b/stdlib/source/library/lux/test.lux
@@ -35,12 +35,12 @@
      ["<[1]>" \\parser]]
     [macro
      [syntax (.only syntax)]]]
-   [time
-    ["[0]" instant]
-    ["[0]" duration (.only Duration)]]
    [world
     ["[0]" environment]
-    ["[0]" console]]]])
+    ["[0]" console]
+    [time
+     ["[0]" instant]
+     ["[0]" duration (.only Duration)]]]]])
 
 (type .public Tally
   (Record
diff --git a/stdlib/source/library/lux/world/db/jdbc/input.lux b/stdlib/source/library/lux/world/db/jdbc/input.lux
index fb8f9b3e3..713a108de 100644
--- a/stdlib/source/library/lux/world/db/jdbc/input.lux
+++ b/stdlib/source/library/lux/world/db/jdbc/input.lux
@@ -7,10 +7,10 @@
     [monad (.only Monad do)]
     ["[0]" try (.only Try)]
     ["[0]" io (.only IO)]]
-   [time
-    ["[0]" instant (.only Instant)]]
    [world
-    [binary (.only Binary)]]]])
+    [binary (.only Binary)]
+    [time
+     ["[0]" instant (.only Instant)]]]]])
 
 (import java/lang/String)
 
diff --git a/stdlib/source/library/lux/world/db/jdbc/output.lux b/stdlib/source/library/lux/world/db/jdbc/output.lux
index 6a9181636..383f565dc 100644
--- a/stdlib/source/library/lux/world/db/jdbc/output.lux
+++ b/stdlib/source/library/lux/world/db/jdbc/output.lux
@@ -9,10 +9,10 @@
     ["ex" exception]
     ["[0]" try (.only Try)]
     ["[0]" io (.only IO)]]
-   [time
-    ["[0]" instant (.only Instant)]]
    [world
-    [binary (.only Binary)]]]])
+    [binary (.only Binary)]
+    [time
+     ["[0]" instant (.only Instant)]]]]])
 
 (import java/lang/String)
 
diff --git a/stdlib/source/library/lux/world/file.lux b/stdlib/source/library/lux/world/file.lux
index 560ae9e4e..cb8c48307 100644
--- a/stdlib/source/library/lux/world/file.lux
+++ b/stdlib/source/library/lux/world/file.lux
@@ -34,10 +34,11 @@
              [meta
               ["@" target]
               [macro
-               ["[0]" template]]]
-             [time
-              ["[0]" instant (.only Instant)]
-              ["[0]" duration]]]])))
+               ["[0]" template]]]]]
+           [//
+            [time
+             ["[0]" instant (.only Instant)]
+             ["[0]" duration]]])))
 
 (type .public Path
   Text)
diff --git a/stdlib/source/library/lux/world/file/watch.lux b/stdlib/source/library/lux/world/file/watch.lux
index fac39061f..91cd25c53 100644
--- a/stdlib/source/library/lux/world/file/watch.lux
+++ b/stdlib/source/library/lux/world/file/watch.lux
@@ -26,12 +26,13 @@
    [math
     [number
      ["n" nat]]]
-   [time
-    ["[0]" instant (.only Instant) (.use "[1]#[0]" equivalence)]]
    [meta
     ["@" target]
     [type
-     [primitive (.only primitive representation abstraction)]]]]]
+     [primitive (.only primitive representation abstraction)]]]
+   [world
+    [time
+     ["[0]" instant (.only Instant) (.use "[1]#[0]" equivalence)]]]]]
  ["[0]" //])
 
 (primitive .public Concern
diff --git a/stdlib/source/library/lux/world/net/http/cookie.lux b/stdlib/source/library/lux/world/net/http/cookie.lux
index ffad57e2c..a87addd69 100644
--- a/stdlib/source/library/lux/world/net/http/cookie.lux
+++ b/stdlib/source/library/lux/world/net/http/cookie.lux
@@ -15,8 +15,9 @@
      ["[0]" context (.only Context)]]
     [collection
      ["[0]" dictionary]]]
-   [time
-    ["[0]" duration (.only Duration)]]]]
+   [world
+    [time
+     ["[0]" duration (.only Duration)]]]]]
  ["[0]" // (.only Header)
   ["[0]" header]])
 
diff --git a/stdlib/source/library/lux/time.lux b/stdlib/source/library/lux/world/time.lux
index d24e87497..d24e87497 100644
--- a/stdlib/source/library/lux/time.lux
+++ b/stdlib/source/library/lux/world/time.lux
diff --git a/stdlib/source/library/lux/time/date.lux b/stdlib/source/library/lux/world/time/date.lux
index 09fd828ae..09fd828ae 100644
--- a/stdlib/source/library/lux/time/date.lux
+++ b/stdlib/source/library/lux/world/time/date.lux
diff --git a/stdlib/source/library/lux/time/day.lux b/stdlib/source/library/lux/world/time/day.lux
index 4f1570d43..4f1570d43 100644
--- a/stdlib/source/library/lux/time/day.lux
+++ b/stdlib/source/library/lux/world/time/day.lux
diff --git a/stdlib/source/library/lux/time/duration.lux b/stdlib/source/library/lux/world/time/duration.lux
index 00a7c1d1e..00a7c1d1e 100644
--- a/stdlib/source/library/lux/time/duration.lux
+++ b/stdlib/source/library/lux/world/time/duration.lux
diff --git a/stdlib/source/library/lux/time/instant.lux b/stdlib/source/library/lux/world/time/instant.lux
index 2f08a6833..2f08a6833 100644
--- a/stdlib/source/library/lux/time/instant.lux
+++ b/stdlib/source/library/lux/world/time/instant.lux
diff --git a/stdlib/source/library/lux/time/month.lux b/stdlib/source/library/lux/world/time/month.lux
index c2e88c976..c2e88c976 100644
--- a/stdlib/source/library/lux/time/month.lux
+++ b/stdlib/source/library/lux/world/time/month.lux
diff --git a/stdlib/source/library/lux/time/year.lux b/stdlib/source/library/lux/world/time/year.lux
index a7bdb0dcf..a7bdb0dcf 100644
--- a/stdlib/source/library/lux/time/year.lux
+++ b/stdlib/source/library/lux/world/time/year.lux