From d0e4ba8124345ce990de7fdf7497dd903de6c342 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Tue, 30 Aug 2022 19:33:36 -0400
Subject: Got rid of the superfluous "lux macro" extension.

---
 .../source/program/aedifex/dependency/deployment.lux | 14 +++++++-------
 .../source/program/aedifex/dependency/resolution.lux | 20 ++++++++++----------
 stdlib/source/program/aedifex/dependency/status.lux  |  8 ++++----
 3 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'stdlib/source/program/aedifex/dependency')

diff --git a/stdlib/source/program/aedifex/dependency/deployment.lux b/stdlib/source/program/aedifex/dependency/deployment.lux
index c74eac1ee..998298ae3 100644
--- a/stdlib/source/program/aedifex/dependency/deployment.lux
+++ b/stdlib/source/program/aedifex/dependency/deployment.lux
@@ -59,20 +59,20 @@
         
         {///dependency/status.#Partial partial}
         (when partial
-          {.#Left sha-1}
-          (deploy_hash ///hash.sha-1_codec ///artifact/extension.sha-1 sha-1)
+          {.#Left sha1}
+          (deploy_hash ///hash.sha1_codec ///artifact/extension.sha1 sha1)
           
           {.#Right md5}
           (deploy_hash ///hash.md5_codec ///artifact/extension.md5 md5))
         
-        {///dependency/status.#Verified sha-1 md5}
+        {///dependency/status.#Verified sha1 md5}
         (do !
-          [_ (deploy_hash ///hash.sha-1_codec ///artifact/extension.sha-1 sha-1)]
+          [_ (deploy_hash ///hash.sha1_codec ///artifact/extension.sha1 sha1)]
           (deploy_hash ///hash.md5_codec ///artifact/extension.md5 md5))))))
 
 (def (artifacts type status)
   (-> ///artifact/type.Type Status (List ///artifact/type.Type))
-  (with_expansions [<sha-1> (format type ///artifact/extension.sha-1)
+  (with_expansions [<sha1> (format type ///artifact/extension.sha1)
                     <md5> (format type ///artifact/extension.md5)]
     (list.partial type
                   (when status
@@ -81,11 +81,11 @@
                     
                     {///dependency/status.#Partial partial}
                     (list (when partial
-                            {.#Left _} <sha-1>
+                            {.#Left _} <sha1>
                             {.#Right _} <md5>))
                     
                     {///dependency/status.#Verified _}
-                    (list <sha-1> <md5>)))))
+                    (list <sha1> <md5>)))))
 
 (def (update_snapshot [artifact type] now snapshot)
   (-> Dependency Instant Metadata (Try Metadata))
diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux
index 571d2d966..84879b93d 100644
--- a/stdlib/source/program/aedifex/dependency/resolution.lux
+++ b/stdlib/source/program/aedifex/dependency/resolution.lux
@@ -44,7 +44,7 @@
   ["[1][0]" status (.only Status)]
   ["/[1]" //
    ["/" profile]
-   ["[1][0]" hash (.only Hash SHA-1 MD5)]
+   ["[1][0]" hash (.only Hash SHA1 MD5)]
    ["[1][0]" pom]
    ["[1][0]" package (.only Package)]
    ["[1][0]" artifact (.only Version Artifact)
@@ -67,7 +67,7 @@
             ["Extension" (%.text extension)]
             ["Hash" (%.text hash)])))]
 
-  [sha-1_does_not_match]
+  [sha1_does_not_match]
   [md5_does_not_match]
   )
 
@@ -104,18 +104,18 @@
   (-> (Repository Async) Version Artifact Extension (Async (Try [Binary Status])))
   (do (try.with async.monad)
     [data (at repository download (///repository/remote.uri version_template artifact extension))
-     ?sha-1 (..verified_hash data
-                             repository version_template artifact (format extension ///artifact/extension.sha-1)
-                             ///hash.sha-1 ///hash.sha-1_codec ..sha-1_does_not_match)
+     ?sha1 (..verified_hash data
+                            repository version_template artifact (format extension ///artifact/extension.sha1)
+                            ///hash.sha1 ///hash.sha1_codec ..sha1_does_not_match)
      ?md5 (..verified_hash data
                            repository version_template artifact (format extension ///artifact/extension.md5)
                            ///hash.md5 ///hash.md5_codec ..md5_does_not_match)]
-    (in [data (when [?sha-1 ?md5]
-                [{.#Some sha-1} {.#Some md5}]
-                {//status.#Verified sha-1 md5}
+    (in [data (when [?sha1 ?md5]
+                [{.#Some sha1} {.#Some md5}]
+                {//status.#Verified sha1 md5}
 
-                [{.#Some sha-1} {.#None}]
-                {//status.#Partial {.#Left sha-1}}
+                [{.#Some sha1} {.#None}]
+                {//status.#Partial {.#Left sha1}}
 
                 [{.#None} {.#Some md5}]
                 {//status.#Partial {.#Right md5}}
diff --git a/stdlib/source/program/aedifex/dependency/status.lux b/stdlib/source/program/aedifex/dependency/status.lux
index 2ce288eec..19235595d 100644
--- a/stdlib/source/program/aedifex/dependency/status.lux
+++ b/stdlib/source/program/aedifex/dependency/status.lux
@@ -8,14 +8,14 @@
     ["[0]" sum]
     ["[0]" product]]]]
  ["[0]" ///
-  ["[1][0]" hash (.only Hash SHA-1 MD5)]])
+  ["[1][0]" hash (.only Hash SHA1 MD5)]])
 
 (type .public Status
   (Variant
    {#Unverified}
-   {#Partial (Either (Hash SHA-1)
+   {#Partial (Either (Hash SHA1)
                      (Hash MD5))}
-   {#Verified (Hash SHA-1) (Hash MD5)}))
+   {#Verified (Hash SHA1) (Hash MD5)}))
 
 (def any_equivalence
   (Equivalence Any)
@@ -38,5 +38,5 @@
 (def .public (verified payload)
   (-> Binary Status)
   {#Verified
-   (///hash.sha-1 payload)
+   (///hash.sha1 payload)
    (///hash.md5 payload)})
-- 
cgit v1.2.3