From f7880ce83ba82ada2d04a0c587448446e677d458 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Wed, 6 Jul 2022 17:11:35 -0400
Subject: Moved "lux/time" to "lux/world/time".

---
 stdlib/source/program/aedifex/artifact/snapshot/time.lux |  5 +++--
 stdlib/source/program/aedifex/artifact/time.lux          |  5 +++--
 stdlib/source/program/aedifex/artifact/time/date.lux     | 14 ++++++++------
 stdlib/source/program/aedifex/artifact/versioning.lux    |  9 +++++----
 stdlib/source/program/aedifex/dependency/deployment.lux  |  5 +++--
 stdlib/source/program/aedifex/metadata/artifact.lux      | 12 ++++++------
 stdlib/source/program/aedifex/metadata/snapshot.lux      | 12 ++++++------
 stdlib/source/program/compositor.lux                     |  6 +++---
 8 files changed, 37 insertions(+), 31 deletions(-)

(limited to 'stdlib/source/program')

diff --git a/stdlib/source/program/aedifex/artifact/snapshot/time.lux b/stdlib/source/program/aedifex/artifact/snapshot/time.lux
index 9acb04c63..b4fb82186 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/time.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/time.lux
@@ -13,8 +13,9 @@
     [format
      ["[0]" xml (.only XML)
       ["<[1]>" \\parser (.only Parser)]]]]
-   [time
-    ["[0]" instant (.only Instant)]]]]
+   [world
+    [time
+     ["[0]" instant (.only Instant)]]]]]
  ["[0]" ///
   ["[1][0]" time
    ["[1]/[0]" date]
diff --git a/stdlib/source/program/aedifex/artifact/time.lux b/stdlib/source/program/aedifex/artifact/time.lux
index 59e0ee3d1..764ae9b86 100644
--- a/stdlib/source/program/aedifex/artifact/time.lux
+++ b/stdlib/source/program/aedifex/artifact/time.lux
@@ -12,8 +12,9 @@
     ["[0]" text
      ["%" \\format (.only Format)]
      ["<[1]>" \\parser (.only Parser)]]]
-   ["[0]" time (.only)
-    ["[0]" instant (.only Instant)]]]]
+   [world
+    ["[0]" time (.only)
+     ["[0]" instant (.only Instant)]]]]]
  ["[0]" /
   ["[1][0]" date]
   ["[1][0]" time]])
diff --git a/stdlib/source/program/aedifex/artifact/time/date.lux b/stdlib/source/program/aedifex/artifact/time/date.lux
index 5cdbd0d1d..84e33836a 100644
--- a/stdlib/source/program/aedifex/artifact/time/date.lux
+++ b/stdlib/source/program/aedifex/artifact/time/date.lux
@@ -16,12 +16,14 @@
     [number
      ["n" nat]
      ["i" int]]]
-   [time
-    ["[0]" date (.use "[1]#[0]" equivalence)]
-    ["[0]" year]
-    ["[0]" month]]
-   [type
-    [primitive (.except)]]]])
+   [meta
+    [type
+     [primitive (.except)]]]
+   [world
+    [time
+     ["[0]" date (.use "[1]#[0]" equivalence)]
+     ["[0]" year]
+     ["[0]" month]]]]])
 
 (def .public (pad value)
   (-> Nat Text)
diff --git a/stdlib/source/program/aedifex/artifact/versioning.lux b/stdlib/source/program/aedifex/artifact/versioning.lux
index 53e6824f0..9ccfd46ba 100644
--- a/stdlib/source/program/aedifex/artifact/versioning.lux
+++ b/stdlib/source/program/aedifex/artifact/versioning.lux
@@ -19,10 +19,11 @@
    [math
     [number
      ["n" nat]]]
-   ["[0]" time (.only Time)
-    ["[0]" date (.only Date)]
-    ["[0]" year]
-    ["[0]" month]]]]
+   [world
+    ["[0]" time (.only Time)
+     ["[0]" date (.only Date)]
+     ["[0]" year]
+     ["[0]" month]]]]]
  ["[0]" //
   ["[1][0]" time]
   ["[1][0]" snapshot (.only Snapshot)
diff --git a/stdlib/source/program/aedifex/dependency/deployment.lux b/stdlib/source/program/aedifex/dependency/deployment.lux
index 6a2c64817..40d7e2532 100644
--- a/stdlib/source/program/aedifex/dependency/deployment.lux
+++ b/stdlib/source/program/aedifex/dependency/deployment.lux
@@ -19,8 +19,9 @@
      ["[0]" dictionary]
      ["[0]" set (.only Set)]
      ["[0]" list (.use "[1]#[0]" monoid)]]]
-   [time
-    ["[0]" instant (.only Instant)]]]]
+   [world
+    [time
+     ["[0]" instant (.only Instant)]]]]]
  ["[0]" ///
   [repository (.only Repository)]
   ["[1][0]" hash (.only Hash)]
diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux
index 3ddc320b2..5df1ae3a7 100644
--- a/stdlib/source/program/aedifex/metadata/artifact.lux
+++ b/stdlib/source/program/aedifex/metadata/artifact.lux
@@ -25,14 +25,14 @@
    [math
     [number
      ["n" nat]]]
-   ["[0]" time (.only Time)
-    ["[0]" instant (.only Instant)]
-    ["[0]" date (.only Date)]
-    ["[0]" year]
-    ["[0]" month]]
    [world
     [net
-     ["[0]" uri (.only URI)]]]]]
+     ["[0]" uri (.only URI)]]
+    ["[0]" time (.only Time)
+     ["[0]" instant (.only Instant)]
+     ["[0]" date (.only Date)]
+     ["[0]" year]
+     ["[0]" month]]]]]
  ["[0]" // (.only)
   ["/[1]" //
    [repository (.only Repository)]
diff --git a/stdlib/source/program/aedifex/metadata/snapshot.lux b/stdlib/source/program/aedifex/metadata/snapshot.lux
index 78b0e8c55..7b3e4d5d0 100644
--- a/stdlib/source/program/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/program/aedifex/metadata/snapshot.lux
@@ -25,14 +25,14 @@
    [math
     [number
      ["n" nat]]]
-   ["[0]" time (.only Time)
-    ["[0]" instant (.only Instant)]
-    ["[0]" date (.only Date)]
-    ["[0]" year]
-    ["[0]" month]]
    [world
     [net
-     ["[0]" uri (.only URI)]]]]]
+     ["[0]" uri (.only URI)]]
+    ["[0]" time (.only Time)
+     ["[0]" instant (.only Instant)]
+     ["[0]" date (.only Date)]
+     ["[0]" year]
+     ["[0]" month]]]]]
  ["[0]" // (.only)
   ["/[1]" //
    [repository (.only Repository)]
diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux
index ac17513ed..3b5150c7e 100644
--- a/stdlib/source/program/compositor.lux
+++ b/stdlib/source/program/compositor.lux
@@ -50,12 +50,12 @@
        ["ioW" archive]]]]
     ... ["[0]" interpreter]
     ]
-   [time
-    ["[0]" instant]]
    ["[0]" world
     ["[0]" file]
     ["[0]" console]
-    ["[1]/[0]" environment]]]])
+    ["[1]/[0]" environment]
+    [time
+     ["[0]" instant]]]]])
 
 (def (or_crash! failure_description action)
   (All (_ a)
-- 
cgit v1.2.3