Slightly cleaner application of variance for FRP channels.

4 files changed, 27 insertions, 30 deletions

diff --git a/stdlib/source/test/lux/control/concurrency/frp.lux b/stdlib/source/test/lux/control/concurrency/frp.lux
index 8a279bac2..05fd6360c 100644
--- a/stdlib/source/test/lux/control/concurrency/frp.lux
+++ b/stdlib/source/test/lux/control/concurrency/frp.lux
@@ -19,10 +19,7 @@
    [math
     ["[0]" random]
     [number
-     ["n" nat]]]
-   [meta
-    [type
-     ["[0]" variance]]]]]
+     ["n" nat]]]]]
  [\\library
   ["[0]" / (.only)
    [//
@@ -44,7 +41,7 @@
        (in (case [?left ?right]
              [{.#Some {.#Some [left _]}}
               {.#Some {.#Some [right _]}}]
-             (== (variance.read left) (variance.read right))
+             (== left right)
              
              _
              false))))))
@@ -62,7 +59,7 @@
           (in {.#End})
 
           {.#Some [head tail]}
-          (at ! each (|>> {.#Item (variance.read head)})
+          (at ! each (|>> {.#Item head})
               (take_amount (-- amount_of_polls) [channel sink]))))))
 
 (def .public test
@@ -100,14 +97,14 @@
                       [?actual (async.value channel)]
                       (in (case ?actual
                             {.#Some {.#Some [actual _]}}
-                            (n.= sample (variance.read actual))
+                            (n.= sample actual)
                             
                             _
                             false))))
                    
                    {try.#Failure error}
                    false))
-               (_.coverage [/.channel_is_already_closed]
+               (_.coverage [/.already_closed]
                  (case (io.run!
                         (do (try.with io.monad)
                           [.let [[channel sink] (is [(/.Channel Nat) (/.Sink Nat)]
@@ -118,7 +115,7 @@
                    false
                    
                    {try.#Failure error}
-                   (exception.match? /.channel_is_already_closed error)))
+                   (exception.match? /.already_closed error)))
                (in (do async.monad
                      [output (|> sample
                                  async.resolved
diff --git a/stdlib/source/test/lux/data/collection/array.lux b/stdlib/source/test/lux/data/collection/array.lux
index ebe7676a0..32b189124 100644
--- a/stdlib/source/test/lux/data/collection/array.lux
+++ b/stdlib/source/test/lux/data/collection/array.lux
@@ -154,12 +154,12 @@
                  (_.coverage [!.empty !.size]
                    (n.= size (!.size (is (Array Nat)
                                          (!.empty size)))))
-                 (_.coverage [!.type]
+                 (_.coverage [!.primitive]
                    (case !.Array
                      (<| {.#Named (symbol !.Array)}
                          {.#UnivQ (list)}
                          {.#Primitive nominal_type (list {.#Parameter 1})})
-                     (same? !.type nominal_type)
+                     (same? !.primitive nominal_type)
 
                      _
                      false))
@@ -322,13 +322,13 @@
              (_.coverage [/.empty /.size]
                (n.= size (/.size (is (Array Nat)
                                      (/.empty size)))))
-             (_.coverage [/.type_name]
+             (_.coverage [/.primitive]
                (case /.Array
                  (<| {.#Named (symbol /.Array)}
                      {.#Named (symbol !.Array)}
                      {.#UnivQ (list)}
                      {.#Primitive nominal_type (list {.#Parameter 1})})
-                 (same? /.type_name nominal_type)
+                 (same? /.primitive nominal_type)
 
                  _
                  false))
diff --git a/stdlib/source/test/lux/meta/type.lux b/stdlib/source/test/lux/meta/type.lux
index 9a78cd392..f7e11f9f2 100644
--- a/stdlib/source/test/lux/meta/type.lux
+++ b/stdlib/source/test/lux/meta/type.lux
@@ -484,7 +484,7 @@
                                (random.only (function (_ type)
                                               (case type
                                                 {.#Primitive name (list element_type)}
-                                                (not (text#= array.type_name name))
+                                                (not (text#= array.primitive name))
 
                                                 _
                                                 #1))))
diff --git a/stdlib/source/test/lux/test.lux b/stdlib/source/test/lux/test.lux
index 215c9fab8..3e47848dc 100644
--- a/stdlib/source/test/lux/test.lux
+++ b/stdlib/source/test/lux/test.lux
@@ -177,10 +177,10 @@
                [[not_covering _] not_covering
                 [covering _] covering]
                (/.coverage' [/.covering]
-                 (and (and (set.empty? (the /.#expected_coverage not_covering))
-                           (set.empty? (the /.#actual_coverage not_covering)))
-                      (and (not (set.empty? (the /.#expected_coverage covering)))
-                           (set.empty? (the /.#actual_coverage covering))))))))
+                 (and (and (set.empty? (the /.#expected not_covering))
+                           (set.empty? (the /.#actual not_covering)))
+                      (and (not (set.empty? (the /.#expected covering)))
+                           (set.empty? (the /.#actual covering))))))))
        (do random.monad
          [not_covering (/.covering .._ (/.property "" true))
           covering (/.covering .._ (/.coverage [..dummy_target] true))]
@@ -188,10 +188,10 @@
                [[not_covering _] not_covering
                 [covering _] covering]
                (/.coverage' [/.coverage]
-                 (and (and (not (set.empty? (the /.#expected_coverage not_covering)))
-                           (not (set.member? (the /.#actual_coverage not_covering) (symbol ..dummy_target))))
-                      (and (not (set.empty? (the /.#expected_coverage covering)))
-                           (set.member? (the /.#actual_coverage covering) (symbol ..dummy_target))))))))
+                 (and (and (not (set.empty? (the /.#expected not_covering)))
+                           (not (set.member? (the /.#actual not_covering) (symbol ..dummy_target))))
+                      (and (not (set.empty? (the /.#expected covering)))
+                           (set.member? (the /.#actual covering) (symbol ..dummy_target))))))))
        (do random.monad
          [not_covering (/.covering .._ (/.property "" true))
           covering (/.covering .._ (in (/.coverage' [..dummy_target] true)))]
@@ -199,10 +199,10 @@
                [[not_covering _] not_covering
                 [covering _] covering]
                (/.coverage' [/.coverage']
-                 (and (and (not (set.empty? (the /.#expected_coverage not_covering)))
-                           (not (set.member? (the /.#actual_coverage not_covering) (symbol ..dummy_target))))
-                      (and (not (set.empty? (the /.#expected_coverage covering)))
-                           (set.member? (the /.#actual_coverage covering) (symbol ..dummy_target))))))))
+                 (and (and (not (set.empty? (the /.#expected not_covering)))
+                           (not (set.member? (the /.#actual not_covering) (symbol ..dummy_target))))
+                      (and (not (set.empty? (the /.#expected covering)))
+                           (set.member? (the /.#actual covering) (symbol ..dummy_target))))))))
        (do random.monad
          [not_covering (/.covering .._ (/.property "" true))
           covering (/.covering .._ (/.for [..dummy_target] (/.property "" true)))]
@@ -210,10 +210,10 @@
                [[not_covering _] not_covering
                 [covering _] covering]
                (/.coverage' [/.for]
-                 (and (and (not (set.empty? (the /.#expected_coverage not_covering)))
-                           (not (set.member? (the /.#actual_coverage not_covering) (symbol ..dummy_target))))
-                      (and (not (set.empty? (the /.#expected_coverage covering)))
-                           (set.member? (the /.#actual_coverage covering) (symbol ..dummy_target))))))))
+                 (and (and (not (set.empty? (the /.#expected not_covering)))
+                           (not (set.member? (the /.#actual not_covering) (symbol ..dummy_target))))
+                      (and (not (set.empty? (the /.#expected covering)))
+                           (set.member? (the /.#actual covering) (symbol ..dummy_target))))))))
        ))
 
 (def .public test