src,test: use explicit import/export lists.

diff --git a/src/CommandLine.hs b/src/CommandLine.hs
index 6fb30fedc151d735346338be62551232ca3e8d42..1fddca04569e4835ca9a59fd615c33d6d9fbc8f5 100644 (file)
--- a/src/CommandLine.hs
+++ b/src/CommandLine.hs
@@ -16,7 +16,18 @@ import System.Console.CmdArgs (
 import Paths_mailbox_count ( version )
 import Data.Version ( showVersion )
 
-import OptionalConfiguration ( OptionalConfiguration(..) )
+import OptionalConfiguration (
+  OptionalConfiguration(
+    OptionalConfiguration,
+    database,
+    detail,
+    detail_query,
+    host,
+    password,
+    port,
+    summary_query,
+    username )
+  )
 
 
 description :: String

diff --git a/src/Configuration.hs b/src/Configuration.hs
index f07be7094ddaff39191e51e8bb9e949755bcd421..7e15a74a15926e745ab7da640d6a3745220fdb93 100644 (file)
--- a/src/Configuration.hs
+++ b/src/Configuration.hs
@@ -7,7 +7,7 @@ module Configuration (
   merge_optional )
 where
 
-import System.Console.CmdArgs.Default ( Default(..) )
+import System.Console.CmdArgs.Default ( Default( def ) )
 
 import qualified OptionalConfiguration as OC (
   OptionalConfiguration(..),

diff --git a/src/Main.hs b/src/Main.hs
index d1d1ea81fa43516bd44b01b294326451b9fbafaf..2c225aebfa1bd8b4e4af120ca235e7aa63dff4ce 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -1,19 +1,21 @@
 {-# LANGUAGE DoAndIfThenElse #-}
 {-# LANGUAGE NoMonomorphismRestriction #-}
-module Main
+module Main ( main )
 where
 
 import Data.Maybe ( fromMaybe )
 import Data.Monoid ( (<>) )
 import Data.String.Utils ( join )
-import Database.HDBC ( SqlError(..), handleSql )
+import Database.HDBC ( SqlError( seNativeError, seErrorMsg ), handleSql )
 import Database.HDBC.PostgreSQL ( connectPostgreSQL )
 import Database.HDBC.Sqlite3 ( connectSqlite3 )
 import System.Console.CmdArgs ( def )
 import System.Directory ( doesFileExist )
 import System.IO ( hPutStrLn, stderr )
 import CommandLine ( get_args )
-import Configuration ( Configuration(..), merge_optional )
+import Configuration (
+  Configuration( host, port, username, password, database ),
+  merge_optional )
 import qualified OptionalConfiguration as OC ( from_rc )
 import Report ( report )
 

diff --git a/src/OptionalConfiguration.hs b/src/OptionalConfiguration.hs
index 16a61bf802630250feb0dad9029d4e12cf1615e5..4faff205cfd416318a2bbc0fb03fa833fbd34100 100644 (file)
--- a/src/OptionalConfiguration.hs
+++ b/src/OptionalConfiguration.hs
@@ -20,8 +20,8 @@ import qualified Data.Configurator as DC (
   lookup )
 import Data.Data ( Data )
 import Data.Typeable ( Typeable )
-import Data.Monoid ( Monoid(..) )
-import Data.Semigroup ( Semigroup( (<>) ) )
+import Data.Monoid ( Monoid() )
+import Data.Semigroup ( Semigroup() )
 import Paths_mailbox_count ( getSysconfDir )
 import System.Directory ( getHomeDirectory )
 import System.FilePath ( (</>) )

diff --git a/src/Report.hs b/src/Report.hs
index f1ec9ddd3ae6426121ee685957ad7b5ca899b8e0..96c3150bcc10e0fe8060fbcf43c8a1d5c15fe739 100644 (file)
--- a/src/Report.hs
+++ b/src/Report.hs
@@ -15,11 +15,11 @@ import Database.HDBC (
   safeFromSql,
   quickQuery )
 import Database.HDBC.Sqlite3 ( connectSqlite3 )
-import System.Console.CmdArgs.Default ( Default(..) )
+import System.Console.CmdArgs.Default ( Default( def ) )
 import Test.Tasty ( TestTree, testGroup )
 import Test.Tasty.HUnit ( (@?=), testCase )
 
-import Configuration ( Configuration(..) )
+import Configuration ( Configuration( detail, detail_query, summary_query ) )
 
 -- Type synonyms to make the signatures below a little more clear.
 type Domain = String

diff --git a/test/Doctests.hs b/test/Doctests.hs
index d183b4b664d289ea123da751f562a937c34ff1ae..83bc6124ecf8fb44af7208740fa970ff1eeb0bd0 100644 (file)
--- a/test/Doctests.hs
+++ b/test/Doctests.hs
@@ -1,7 +1,7 @@
-module Main
+module Main ( main )
 where
 
-import Test.DocTest
+import Test.DocTest ( doctest )
 import System.FilePath.Find ((==?), always, extension, find)
 
 find_sources :: IO [FilePath]