From 061fd8a209bbcaffc2bfb850ac6046752a567d50 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Tue, 27 Jul 2021 03:51:10 -0400
Subject: Re-named wrap => in && unwrap => out.

---
 stdlib/source/program/compositor/export.lux | 18 +++++++++---------
 stdlib/source/program/compositor/import.lux |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'stdlib/source/program/compositor')

diff --git a/stdlib/source/program/compositor/export.lux b/stdlib/source/program/compositor/export.lux
index f17feaf22..46cf9c8ec 100644
--- a/stdlib/source/program/compositor/export.lux
+++ b/stdlib/source/program/compositor/export.lux
@@ -51,16 +51,16 @@
                                  (text.replace_all (\ fs separator) .module_separator)
                                  tar.path)
                         source_code (tar.content source_code)]
-                       (wrap (#tar.Normal [path
-                                           (instant.of_millis +0)
-                                           ($_ tar.and
-                                               tar.read_by_owner tar.write_by_owner
-                                               tar.read_by_group tar.write_by_group
-                                               tar.read_by_other)
-                                           ..no_ownership
-                                           source_code])))))
+                       (in (#tar.Normal [path
+                                         (instant.of_millis +0)
+                                         ($_ tar.and
+                                             tar.read_by_owner tar.write_by_owner
+                                             tar.read_by_group tar.write_by_group
+                                             tar.read_by_other)
+                                         ..no_ownership
+                                         source_code])))))
         (\ try.monad map row.of_list)
-        (\ async.monad wrap))))
+        (\ async.monad in))))
 
 (def: #export (export fs [sources target])
   (-> (file.System Async) Export (Async (Try Any)))
diff --git a/stdlib/source/program/compositor/import.lux b/stdlib/source/program/compositor/import.lux
index db46d6c13..1e9145bdb 100644
--- a/stdlib/source/program/compositor/import.lux
+++ b/stdlib/source/program/compositor/import.lux
@@ -57,13 +57,13 @@
                                                         (let [path (tar.from_path path)]
                                                           (case (dictionary.try_put path (tar.data content) import)
                                                             (#try.Failure error)
-                                                            (exception.throw ..duplicate [library path])
+                                                            (exception.except ..duplicate [library path])
 
                                                             import'
                                                             import'))
                                                         
                                                         _
-                                                        (exception.throw ..useless_tar_entry [])))
+                                                        (exception.except ..useless_tar_entry [])))
                                                   import)))
                         (\ ! join)))))))
 
-- 
cgit v1.2.3