From: Michael Orlitzky <michael@orlitzky.com>
Date: Sat, 27 Jul 2013 00:51:28 +0000 (-0400)
Subject: Fix hlint warnings.
X-Git-Tag: 0.2.0~23
X-Git-Url: http://gitweb.michael.orlitzky.com/?p=haeredes.git;a=commitdiff_plain;h=7d54d3e3e239342eae8b7fda5f5e4fb43adbbde8

Fix hlint warnings.
---

diff --git a/src/DNS.hs b/src/DNS.hs
index 5222cbe..f649e0a 100644
--- a/src/DNS.hs
+++ b/src/DNS.hs
@@ -6,6 +6,7 @@ module DNS (
   )
 where
 
+import Control.Monad (liftM)
 import qualified Data.ByteString.Char8 as BS (
   append,
   last,
@@ -22,7 +23,7 @@ type LookupResult = (Domain, Maybe [Domain])
 
 lookupMX' :: Resolver -> Domain -> IO LookupResult
 lookupMX' resolver domain =
-  lookupMX resolver domain >>= return . pair_em . drop_priority
+  liftM (pair_em . drop_priority) $ lookupMX resolver domain
   where
     drop_priority :: Maybe [(Domain, Int)] -> Maybe [Domain]
     drop_priority = fmap (map fst)
@@ -33,7 +34,7 @@ lookupMX' resolver domain =
 -- This function keeps the domain matches with its NS records.
 lookupNS' :: Resolver -> Domain -> IO LookupResult
 lookupNS' resolver domain =
-  lookupNS resolver domain >>= return . pair_em
+  liftM pair_em $ lookupNS resolver domain
   where
     pair_em :: a -> (Domain, a)
     pair_em = (,) domain
diff --git a/src/Main.hs b/src/Main.hs
index 0c215b7..4da3833 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -4,6 +4,7 @@ where
 import Control.Concurrent.ParallelIO.Global (
   parallel,
   stopGlobalPool )
+import Control.Monad (unless)
 import qualified Data.ByteString.Char8 as BS (
   getContents,
   pack,
@@ -30,12 +31,11 @@ report :: (Domain, Maybe [Domain]) -> IO ()
 report (d, Nothing) =
   putStrLn $ "Domain " ++ (show d) ++ " not delegated."
 report (d, Just leftovers) =
-  if null leftovers
-  then return ()
-  else putStrLn $ "Domain " ++
-                  (show d) ++
-                  " delegates somewhere else: " ++
-                  (join " " (map show leftovers))
+  unless (null leftovers) $
+    putStrLn $ "Domain " ++
+               (show d) ++
+               " delegates somewhere else: " ++
+               (join " " (map show leftovers))
 
 clean :: [Domain] -- ^ List of delegates, @ds@
       -> LookupResult