Removed several unnecessary imports.

9 files changed, 36 insertions, 40 deletions

diff --git a/stdlib/source/lux/target/jvm/attribute.lux b/stdlib/source/lux/target/jvm/attribute.lux
index cf00f2b33..68297f17b 100644
--- a/stdlib/source/lux/target/jvm/attribute.lux
+++ b/stdlib/source/lux/target/jvm/attribute.lux
@@ -7,6 +7,7 @@
     ["." try]
     ["." exception (#+ exception:)]]
    [data
+    ["." sum]
     ["." product]
     [number
      ["n" nat]]
@@ -31,7 +32,7 @@
   (All [about]
     (-> (Equivalence about)
         (Equivalence (Info about))))
-  ($_ equivalence.product
+  ($_ product.equivalence
       //index.equivalence
       //unsigned.equivalence
       Equivalence<about>))
@@ -60,7 +61,7 @@
   (Equivalence Attribute)
   (equivalence.rec
    (function (_ equivalence)
-     ($_ equivalence.sum
+     ($_ sum.equivalence
          (info-equivalence /constant.equivalence)
          (info-equivalence (/code.equivalence equivalence))))))
 
diff --git a/stdlib/source/lux/target/jvm/attribute/code.lux b/stdlib/source/lux/target/jvm/attribute/code.lux
index 251eca660..29d027b4d 100644
--- a/stdlib/source/lux/target/jvm/attribute/code.lux
+++ b/stdlib/source/lux/target/jvm/attribute/code.lux
@@ -2,8 +2,9 @@
   [lux (#- Code)
    [type (#+ :share)]
    [abstract
-    ["." equivalence (#+ Equivalence)]]
+    [equivalence (#+ Equivalence)]]
    [data
+    ["." product]
     ["." binary (#+ Binary)]
     [number
      ["n" nat]]
@@ -54,7 +55,7 @@
 (def: #export (equivalence attribute-equivalence)
   (All [attribute]
     (-> (Equivalence attribute) (Equivalence (Code attribute))))
-  ($_ equivalence.product
+  ($_ product.equivalence
       ///limit.equivalence
       binary.equivalence
       (row.equivalence /exception.equivalence)
diff --git a/stdlib/source/lux/target/jvm/attribute/code/exception.lux b/stdlib/source/lux/target/jvm/attribute/code/exception.lux
index 820e5c8a6..0e9082167 100644
--- a/stdlib/source/lux/target/jvm/attribute/code/exception.lux
+++ b/stdlib/source/lux/target/jvm/attribute/code/exception.lux
@@ -1,8 +1,9 @@
 (.module:
   [lux #*
    [abstract
-    ["." equivalence (#+ Equivalence)]]
+    [equivalence (#+ Equivalence)]]
    [data
+    ["." product]
     [number
      ["n" nat]]
     ["." format #_
@@ -24,7 +25,7 @@
 
 (def: #export equivalence
   (Equivalence Exception)
-  ($_ equivalence.product
+  ($_ product.equivalence
       ////address.equivalence
       ////address.equivalence
       ////address.equivalence
diff --git a/stdlib/source/lux/target/jvm/bytecode/environment/limit.lux b/stdlib/source/lux/target/jvm/bytecode/environment/limit.lux
index 7b75c3593..fc65ac6db 100644
--- a/stdlib/source/lux/target/jvm/bytecode/environment/limit.lux
+++ b/stdlib/source/lux/target/jvm/bytecode/environment/limit.lux
@@ -2,10 +2,11 @@
   [lux (#- Type static)
    [abstract
     [monad (#+ do)]
-    ["." equivalence (#+ Equivalence)]]
+    [equivalence (#+ Equivalence)]]
    [control
     ["." try (#+ Try)]]
    [data
+    ["." product]
     [number
      ["n" nat]]
     ["." format #_
@@ -42,7 +43,7 @@
 
 (def: #export equivalence
   (Equivalence Limit)
-  ($_ equivalence.product
+  ($_ product.equivalence
       /stack.equivalence
       /registry.equivalence
       ))
diff --git a/stdlib/source/lux/target/jvm/class.lux b/stdlib/source/lux/target/jvm/class.lux
index 9ed001534..27eded008 100644
--- a/stdlib/source/lux/target/jvm/class.lux
+++ b/stdlib/source/lux/target/jvm/class.lux
@@ -1,21 +1,17 @@
-(.module:
+ (.module:
   [lux #*
    [abstract
-    [monoid (#+)]
-    ["." equivalence (#+ Equivalence)]
+    [equivalence (#+ Equivalence)]
     ["." monad (#+ do)]]
    [control
     ["." state]
     ["." try (#+ Try)]]
    [data
-    [number (#+)
-     [i64 (#+)]]
+    ["." product]
     [format
      [".F" binary (#+ Writer) ("#\." monoid)]]
     [collection
-     ["." row (#+ Row)]]]
-   [type
-    [abstract (#+)]]]
+     ["." row (#+ Row)]]]]
   ["." // #_
    ["#." modifier (#+ Modifier modifiers:)]
    ["#." version (#+ Version Minor Major)]
@@ -25,7 +21,7 @@
    ["#." field (#+ Field)]
    ["#." method (#+ Method)]
    [encoding
-    ["#." unsigned (#+)]
+    ["#." unsigned]
     ["#." name (#+ Internal)]]
    ["#." constant (#+ Constant)
     ["#/." pool (#+ Pool Resource)]]])
@@ -56,7 +52,7 @@
 
 (def: #export equivalence
   (Equivalence Class)
-  ($_ equivalence.product
+  ($_ product.equivalence
       //unsigned.equivalence
       //unsigned.equivalence
       //unsigned.equivalence
diff --git a/stdlib/source/lux/target/jvm/constant.lux b/stdlib/source/lux/target/jvm/constant.lux
index 8cac4b1c6..e8f369492 100644
--- a/stdlib/source/lux/target/jvm/constant.lux
+++ b/stdlib/source/lux/target/jvm/constant.lux
@@ -6,6 +6,8 @@
     [monad (#+ do)]
     ["." equivalence (#+ Equivalence)]]
    [data
+    ["." sum]
+    ["." product]
     [number
      ["." i32 (#+ I32)]
      ["." i64]
@@ -133,7 +135,7 @@
 (template [<type> <equivalence> <writer>]
   [(def: #export <equivalence>
      (Equivalence (<type> Any))
-     ($_ equivalence.product
+     ($_ product.equivalence
          //index.equivalence
          //index.equivalence))
 
@@ -193,7 +195,7 @@
        
        _
        false)))
-  ## ($_ equivalence.sum
+  ## ($_ sum.equivalence
   ##     ## #UTF8
   ##     text.equivalence
   ##     ## #Long
diff --git a/stdlib/source/lux/target/jvm/constant/pool.lux b/stdlib/source/lux/target/jvm/constant/pool.lux
index 44de4ea29..2bc141e66 100644
--- a/stdlib/source/lux/target/jvm/constant/pool.lux
+++ b/stdlib/source/lux/target/jvm/constant/pool.lux
@@ -2,12 +2,13 @@
   [lux #*
    ["." host]
    [abstract
-    ["." equivalence (#+ Equivalence)]
+    [equivalence (#+ Equivalence)]
     [monad (#+ Monad do)]]
    [control
     ["." state (#+ State')]
     ["." try (#+ Try)]]
    [data
+    ["." product]
     [number
      ["." i32]
      ["n" nat]
@@ -36,8 +37,8 @@
 
 (def: #export equivalence
   (Equivalence Pool)
-  (equivalence.product //index.equivalence
-                       (row.equivalence (equivalence.product //index.equivalence
+  (product.equivalence //index.equivalence
+                       (row.equivalence (product.equivalence //index.equivalence
                                                              //.equivalence))))
 
 (type: #export (Resource a)
diff --git a/stdlib/source/lux/target/jvm/field.lux b/stdlib/source/lux/target/jvm/field.lux
index f77469e82..2e8863f57 100644
--- a/stdlib/source/lux/target/jvm/field.lux
+++ b/stdlib/source/lux/target/jvm/field.lux
@@ -1,18 +1,14 @@
 (.module:
   [lux (#- Type static)
    [abstract
-    [monoid (#+)]
-    ["." equivalence (#+ Equivalence)]
+    [equivalence (#+ Equivalence)]
     ["." monad (#+ do)]]
    [data
-    [number (#+)
-     [i64 (#+)]]
+    ["." product]
     [format
      [".F" binary (#+ Writer) ("#\." monoid)]]
     [collection
-     ["." row (#+ Row)]]]
-   [type
-    [abstract (#+)]]]
+     ["." row (#+ Row)]]]]
   ["." // #_
    ["." modifier (#+ Modifier modifiers:)]
    ["#." constant (#+ UTF8)
@@ -43,7 +39,7 @@
 
 (def: #export equivalence
   (Equivalence Field)
-  ($_ equivalence.product
+  ($_ product.equivalence
       modifier.equivalence
       //index.equivalence
       //index.equivalence
diff --git a/stdlib/source/lux/target/jvm/method.lux b/stdlib/source/lux/target/jvm/method.lux
index 3d0e9c907..d084d26ee 100644
--- a/stdlib/source/lux/target/jvm/method.lux
+++ b/stdlib/source/lux/target/jvm/method.lux
@@ -1,20 +1,16 @@
 (.module:
   [lux (#- Type static)
    [abstract
-    [monoid (#+)]
-    ["." equivalence (#+ Equivalence)]
+    [equivalence (#+ Equivalence)]
     ["." monad (#+ do)]]
    [control
     ["." try]]
    [data
-    [number (#+)
-     [i64 (#+)]]
+    ["." product]
     ["." format #_
      ["#" binary (#+ Writer) ("#\." monoid)]]
     [collection
-     ["." row (#+ Row)]]]
-   [type
-    [abstract (#+)]]]
+     ["." row (#+ Row)]]]]
   ["." // #_
    ["#." modifier (#+ Modifier modifiers:)]
    ["#." index (#+ Index)]
@@ -87,11 +83,12 @@
 
 (def: #export equivalence
   (Equivalence Method)
-  ($_ equivalence.product
+  ($_ product.equivalence
       //modifier.equivalence
       //index.equivalence
       //index.equivalence
-      (row.equivalence //attribute.equivalence)))
+      (row.equivalence //attribute.equivalence)
+      ))
 
 (def: #export (writer field)
   (Writer Method)