src: apply all hlint suggestions.

diff --git a/src/DNS.hs b/src/DNS.hs
index b8e9cd0521e6baec631c56da2d4753e531e2ffc1..2ebde3c2d537f2a2a2808ca0fb22232800b19b9c 100644 (file)
--- a/src/DNS.hs
+++ b/src/DNS.hs
@@ -5,7 +5,6 @@ module DNS (
   resolve_address )
 where
 
-import Control.Monad ( liftM )
 import qualified Data.ByteString.Char8 as BS ( pack )
 import Data.IP (IPv4)
 import Network.DNS (
@@ -63,7 +62,7 @@ resolve_address s =
 --
 lookupMX' :: Resolver -> Domain -> IO LookupResult
 lookupMX' resolver domain =
-  liftM (pair_em . drop_priority) $ lookupMX resolver domain
+  fmap (pair_em . drop_priority) $ lookupMX resolver domain
   where
     drop_priority :: Either DNSError [(Domain, Int)]
                   -> Either DNSError [Domain]
@@ -96,7 +95,7 @@ lookupNS' :: Resolver -> Domain -> IO LookupResult
 lookupNS' resolver domain = do
   answer_result <- lookupNS resolver domain
   auth_result <- lookupNSAuth resolver domain
-  liftM pair_em $ return $ combine answer_result auth_result
+  fmap pair_em $ return $ combine answer_result auth_result
   where
     pair_em :: a -> (Domain, a)
     pair_em = (,) domain

diff --git a/src/Main.hs b/src/Main.hs
index c9356bfd9318de6d96c279d0bd9dd0608fe9b332..f5aef9aa92e433ee1bfb2351a360491c104e457d 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -9,7 +9,7 @@ import qualified Data.ByteString.Char8 as BS (
   getContents,
   pack,
   words )
-import Data.List ( (\\), intersperse, sort )
+import Data.List ( (\\), intercalate, sort )
 import Network.DNS (
   DNSError(NameError),
   Domain,
@@ -80,7 +80,7 @@ report delgts normalize_function (d, Right raw_hosts) = do
     -- Create one big string by joining together a list of smaller
     -- strings and placing a delimiter between them.
     join :: String -> [String] -> String
-    join delimiter strings = concat (intersperse delimiter strings)
+    join delimiter strings = intercalate delimiter strings
 
 
 main :: IO ()
@@ -142,6 +142,6 @@ main = do
   results <- parallelInterleaved actions
 
   -- Output the results.
-  _ <- mapM (report nrml_delegates normalize_function) results
+  mapM_ (report nrml_delegates normalize_function) results
 
   stopGlobalPool