Re-named wrap => in && unwrap => out.

2 files changed, 28 insertions, 28 deletions

diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux
index 55659f391..777c7df1b 100644
--- a/stdlib/source/program/aedifex/metadata/artifact.lux
+++ b/stdlib/source/program/aedifex/metadata/artifact.lux
@@ -135,11 +135,11 @@
 
 (def: last_updated_parser
   (Parser Instant)
-  (<text>.embed (do <>.monad
-                  [date ..date_parser
-                   time ..time_parser]
-                  (wrap (instant.of_date_time date time)))
-                (..text ..<last_updated>)))
+  (<text>.then (do <>.monad
+                 [date ..date_parser
+                  time ..time_parser]
+                 (in (instant.of_date_time date time)))
+               (..text ..<last_updated>)))
 
 (def: #export parser
   (Parser Metadata)
@@ -178,19 +178,19 @@
     [project (\ repository download (..uri artifact))]
     (case project
       (#try.Success project)
-      (wrap (|> project
-                (do> try.monad
-                     [(\ utf8.codec decode)]
-                     [(\ xml.codec decode)]
-                     [list (<xml>.run ..parser)])))
+      (in (|> project
+              (do> try.monad
+                   [(\ utf8.codec decode)]
+                   [(\ xml.codec decode)]
+                   [list (<xml>.run ..parser)])))
       
       (#try.Failure error)
-      (wrap (#try.Success
-             (let [(^slots [#///artifact.group #///artifact.name]) artifact]
-               {#group group
-                #name name
-                #versions (list)
-                #last_updated ..epoch}))))))
+      (in (#try.Success
+           (let [(^slots [#///artifact.group #///artifact.name]) artifact]
+             {#group group
+              #name name
+              #versions (list)
+              #last_updated ..epoch}))))))
 
 (def: #export (write repository artifact metadata)
   (-> (Repository Async) Artifact Metadata (Async (Try Any)))
diff --git a/stdlib/source/program/aedifex/metadata/snapshot.lux b/stdlib/source/program/aedifex/metadata/snapshot.lux
index 6faab7b3b..c96957740 100644
--- a/stdlib/source/program/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/program/aedifex/metadata/snapshot.lux
@@ -106,10 +106,10 @@
                           (<>.default {#///artifact/versioning.snapshot #///artifact/snapshot.Local
                                        #///artifact/versioning.last_updated ///artifact/time.epoch
                                        #///artifact/versioning.versions (list <default_version>)})))]
-        (wrap {#artifact {#///artifact.group group
-                          #///artifact.name name
-                          #///artifact.version version}
-               #versioning versioning}))))
+        (in {#artifact {#///artifact.group group
+                        #///artifact.name name
+                        #///artifact.version version}
+             #versioning versioning}))))
 
 (def: #export equivalence
   (Equivalence Metadata)
@@ -128,16 +128,16 @@
     [project (\ repository download (..uri artifact))]
     (case project
       (#try.Success project)
-      (wrap (|> project
-                (do> try.monad
-                     [(\ utf8.codec decode)]
-                     [(\ xml.codec decode)]
-                     [list (<xml>.run ..parser)])))
+      (in (|> project
+              (do> try.monad
+                   [(\ utf8.codec decode)]
+                   [(\ xml.codec decode)]
+                   [list (<xml>.run ..parser)])))
       
       (#try.Failure error)
-      (wrap (#try.Success
-             {#artifact artifact
-              #versioning ///artifact/versioning.init})))))
+      (in (#try.Success
+           {#artifact artifact
+            #versioning ///artifact/versioning.init})))))
 
 (def: #export (write repository artifact metadata)
   (-> (Repository Async) Artifact Metadata (Async (Try Any)))