Add full lists for every existing import.

diff --git a/src/Cidr.hs b/src/Cidr.hs
index 5c05ed15fb5aacffccd2a1c8c433e9a85ed22495..5a5ba3f2f332cdb6548aa23621859a9bc6bca6f3 100644 (file)
--- a/src/Cidr.hs
+++ b/src/Cidr.hs
@@ -25,7 +25,7 @@ import Data.Maybe (catMaybes, mapMaybe)
 import Test.Tasty ( TestTree, testGroup )
 import Test.Tasty.HUnit ( (@?=), testCase )
 import Test.Tasty.QuickCheck (
-  Arbitrary(..),
+  Arbitrary( arbitrary ),
   Gen,
   Property,
   (==>),
@@ -33,10 +33,12 @@ import Test.Tasty.QuickCheck (
 import Text.Read (readMaybe)
 
 import qualified Bit as B (Bit(..))
-import IPv4Address (IPv4Address(..), most_sig_bit_different)
-import Maskable (Maskable(..))
-import Maskbits (Maskbits(..))
-import Octet (Octet(..))
+import IPv4Address (
+  IPv4Address( IPv4Address, octet1, octet2, octet3, octet4 ),
+  most_sig_bit_different )
+import Maskable (Maskable(apply_mask))
+import Maskbits ( Maskbits(Zero) )
+import Octet (Octet())
 
 
 data Cidr = Cidr { ipv4address :: IPv4Address,

diff --git a/src/IPv4Address.hs b/src/IPv4Address.hs
index fca1d0fe006cc33c659f4e883bfda3897f83f4d2..698594437d7f4a4b0470e96fc67d743221b2a5aa 100644 (file)
--- a/src/IPv4Address.hs
+++ b/src/IPv4Address.hs
@@ -9,15 +9,21 @@ where
 import Test.Tasty ( TestTree, testGroup )
 import Test.Tasty.HUnit ( (@?=), testCase )
 import Test.Tasty.QuickCheck (
-  Arbitrary(..),
+  Arbitrary( arbitrary ),
   Gen,
   Property,
   (==>),
   testProperty )
 
-import Maskable (Maskable(..))
-import Maskbits (Maskbits(..))
-import Octet (Octet(..))
+import Maskable ( Maskable( apply_mask) )
+import Maskbits (
+  Maskbits(
+    Zero, One, Two, Three, Four, Five, Six, Seven, Eight,
+    Nine, Ten, Eleven, Twelve, Thirteen, Fourteen, Fifteen, Sixteen,
+    Seventeen, Eighteen, Nineteen, Twenty, TwentyOne, TwentyTwo, TwentyThree,
+    TwentyFour, TwentyFive, TwentySix, TwentySeven, TwentyEight, TwentyNine,
+    Thirty, ThirtyOne, ThirtyTwo ) )
+import Octet ( Octet( b1, b2, b3, b4, b5, b6, b7, b8) )
 
 data IPv4Address =
   IPv4Address { octet1 :: Octet,

diff --git a/src/Main.hs b/src/Main.hs
index 26d54d143ab9cd82672198e358b2ec4501860fb5..8fce2f51aeac6021820774a58462e7a51b4df87a 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -21,7 +21,9 @@ import Cidr (
   min_octet2,
   min_octet3,
   min_octet4 )
-import CommandLine (Args(..), get_args)
+import CommandLine(
+  Args( Regexed, Reduced, Duped, Diffed, Listed, barriers ),
+  get_args )
 import ExitCodes ( exit_invalid_cidr )
 import Octet ()
 

diff --git a/src/Maskbits.hs b/src/Maskbits.hs
index 27fa29fa2934e146f1d6ba848453bfacd0c7bfc7..39a15b33908842a50aa85fe63e7fad0427175731 100644 (file)
--- a/src/Maskbits.hs
+++ b/src/Maskbits.hs
@@ -2,7 +2,7 @@ module Maskbits(
   Maskbits(..) )
 where
 
-import Test.Tasty.QuickCheck ( Arbitrary(..), elements )
+import Test.Tasty.QuickCheck ( Arbitrary(arbitrary), elements )
 
 
 -- | A type representing the number of bits in a CIDR netmask.

diff --git a/src/Octet.hs b/src/Octet.hs
index fa004c5085df4849a4b2ff44033106d10fd90193..248b3396c40f46ebac61dda9008dc8bb4e9b1ba0 100644 (file)
--- a/src/Octet.hs
+++ b/src/Octet.hs
@@ -7,15 +7,16 @@ where
 import Test.Tasty ( TestTree, testGroup )
 import Test.Tasty.HUnit ( (@?=), testCase )
 import Test.Tasty.QuickCheck (
-  Arbitrary(..),
+  Arbitrary( arbitrary ),
   Gen,
   Property,
   (==>),
   testProperty )
 
-import Bit as B (Bit(..))
-import Maskable (Maskable(..))
-import Maskbits (Maskbits(..))
+import Bit as B( Bit( Zero, One) )
+import Maskable( Maskable( apply_mask) )
+import Maskbits(
+  Maskbits( Zero, One, Two, Three, Four, Five, Six, Seven, Eight ) )
 
 -- | An Octet consists of eight bits. For our purposes, the most
 --   significant bit will come "first." That is, b1 is in the 2^7

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 468afeb84c60491081274b5e3c3dcdbc7d4e0910..32b81e220f67616cd14760e2db3eafceffd190b6 100644 (file)
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -1,8 +1,10 @@
-import Test.Tasty ( TestTree, defaultMain, localOption, testGroup )
-import Test.Tasty.QuickCheck ( QuickCheckTests(..), QuickCheckMaxRatio(..) )
-import Cidr ( cidr_properties, cidr_tests )
-import IPv4Address ( ipv4address_properties, ipv4address_tests )
-import Octet ( octet_properties, octet_tests )
+import Test.Tasty( TestTree, defaultMain, localOption, testGroup )
+import Test.Tasty.QuickCheck(
+  QuickCheckTests( QuickCheckTests),
+  QuickCheckMaxRatio( QuickCheckMaxRatio ))
+import Cidr( cidr_properties, cidr_tests )
+import IPv4Address( ipv4address_properties, ipv4address_tests )
+import Octet( octet_properties, octet_tests )
 
 tests :: TestTree
 tests = testGroup "All Tests" [