- Adjusted new-luxc to latest changes.

3 files changed, 7 insertions, 9 deletions

diff --git a/new-luxc/source/luxc/cache/description.lux b/new-luxc/source/luxc/cache/description.lux
index 467fed765..9ee07c7ad 100644
--- a/new-luxc/source/luxc/cache/description.lux
+++ b/new-luxc/source/luxc/cache/description.lux
@@ -12,8 +12,9 @@
               ["s" syntax #+ Syntax]))
   [///lang])
 
-(exception: #export (Invalid-Lux-Version {message Text})
-  message)
+(exception: #export (invalid-lux-version {version Text})
+  (format "Expected: " ///lang.version "\n"
+          "  Actual: " version "\n"))
 
 (def: (write-type type)
   (-> Type Code)
@@ -121,9 +122,7 @@
   (<| (s.run (list description))
       (s.record (do p.Monad<Parser>
                   [lux-version (p.after (s.this (` "lux version")) s.text)
-                   _ (p.assert (Invalid-Lux-Version
-                                (format "Expected: " ///lang.version "\n"
-                                        "  Actual: " lux-version "\n"))
+                   _ (p.assert (ex.construct invalid-lux-version lux-version)
                                (text/= ///lang.version lux-version))]
                   ($_ p.seq
                       (p.after (s.this (` "lux file")) s.text)
diff --git a/new-luxc/source/luxc/cache/influences.lux b/new-luxc/source/luxc/cache/influences.lux
index a75e1a7a1..bbddd79aa 100644
--- a/new-luxc/source/luxc/cache/influences.lux
+++ b/new-luxc/source/luxc/cache/influences.lux
@@ -2,7 +2,7 @@
   lux
   (lux (data [text]
              (coll [list "list/" Fold<List>]
-                   [dict #+ Dict]))))
+                   (dictionary ["dict" unordered #+ Dict])))))
 
 (type: #export Influences (Dict Text (List Text)))
 
diff --git a/new-luxc/source/luxc/cache/io.lux b/new-luxc/source/luxc/cache/io.lux
index 62585c0bc..998c658ac 100644
--- a/new-luxc/source/luxc/cache/io.lux
+++ b/new-luxc/source/luxc/cache/io.lux
@@ -9,8 +9,8 @@
              [text "text/" Hash<Text>]
              text/format
              (coll [list "list/" Fold<List>]
-                   [dict #+ Dict]
-                   [set #+ Set]))
+                   (dictionary ["dict" unordered #+ Dict])
+                   (set ["set" unordered #+ Set])))
        (lang [syntax #+ Aliases])
        [io #+ Process "process/" Monad<Process>]
        (concurrency [atom #+ Atom atom])
@@ -25,7 +25,6 @@
   [(exception: #export (<name> {message Text})
      message)]
 
-  [Invalid-Lux-Version]
   [Module-Is-Not-Cached]
   [Cannot-Pre-Load-Cache-More-Than-Once]
   [Cannot-Delete-Cached-File]