From 78aed23927af1734e0adf03095a617ba5ddbea01 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sun, 3 Mar 2019 22:15:43 -0500 Subject: [PATCH] src: apply all hlint suggestions. --- src/DNS.hs | 5 ++--- src/Main.hs | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/DNS.hs b/src/DNS.hs index b8e9cd0..2ebde3c 100644 --- 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 c9356bf..f5aef9a 100644 --- 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 -- 2.43.2