From 2b3919681b49d6f31311bfaf4bc3a958a076618d Mon Sep 17 00:00:00 2001 From: Kazu Yamamoto Date: Mon, 24 Oct 2011 13:45:52 +0900 Subject: hlint. --- Network/DNS/Lookup.hs | 12 ++++++------ Network/DNS/Query.hs | 4 ++-- Network/DNS/Response.hs | 2 +- TestProtocol.hs | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Network/DNS/Lookup.hs b/Network/DNS/Lookup.hs index b47c0d5..051b78f 100644 --- a/Network/DNS/Lookup.hs +++ b/Network/DNS/Lookup.hs @@ -25,7 +25,7 @@ import Network.DNS.Types lookupA :: Resolver -> Domain -> IO (Maybe [IPv4]) lookupA rlv dom = toV4 <$> DNS.lookup rlv dom A where - toV4 = maybe Nothing (Just . map unTag) + toV4 = fmap (map unTag) unTag (RD_A x) = x unTag _ = error "lookupA" @@ -35,7 +35,7 @@ lookupA rlv dom = toV4 <$> DNS.lookup rlv dom A lookupAAAA :: Resolver -> Domain -> IO (Maybe [IPv6]) lookupAAAA rlv dom = toV6 <$> DNS.lookup rlv dom AAAA where - toV6 = maybe Nothing (Just . map unTag) + toV6 = fmap (map unTag) unTag (RD_AAAA x) = x unTag _ = error "lookupAAAA" @@ -47,7 +47,7 @@ lookupAAAA rlv dom = toV6 <$> DNS.lookup rlv dom AAAA lookupMX :: Resolver -> Domain -> IO (Maybe [(Domain,Int)]) lookupMX rlv dom = toMX <$> DNS.lookup rlv dom MX where - toMX = maybe Nothing (Just . map unTag) + toMX = fmap (map unTag) unTag (RD_MX pr dm) = (dm,pr) unTag _ = error "lookupMX" @@ -81,7 +81,7 @@ lookupXviaMX rlv dom func = do lookupTXT :: Resolver -> Domain -> IO (Maybe [ByteString]) lookupTXT rlv dom = toTXT <$> DNS.lookup rlv dom TXT where - toTXT = maybe Nothing (Just . map unTag) + toTXT = fmap (map unTag) unTag (RD_TXT x) = x unTag _ = error "lookupTXT" @@ -93,7 +93,7 @@ lookupTXT rlv dom = toTXT <$> DNS.lookup rlv dom TXT lookupPTR :: Resolver -> Domain -> IO (Maybe [Domain]) lookupPTR rlv dom = toPTR <$> DNS.lookup rlv dom PTR where - toPTR = maybe Nothing (Just . map unTag) + toPTR = fmap (map unTag) unTag (RD_PTR dm) = dm unTag _ = error "lookupPTR" @@ -105,6 +105,6 @@ lookupPTR rlv dom = toPTR <$> DNS.lookup rlv dom PTR lookupSRV :: Resolver -> Domain -> IO (Maybe [(Int,Int,Int,Domain)]) lookupSRV rlv dom = toSRV <$> DNS.lookup rlv dom SRV where - toSRV = maybe Nothing (Just . map unTag) + toSRV = fmap (map unTag) unTag (RD_SRV pri wei prt dm) = (pri,wei,prt,dm) unTag _ = error "lookupSRV" diff --git a/Network/DNS/Query.hs b/Network/DNS/Query.hs index 3ebd5e0..bdf86bc 100644 --- a/Network/DNS/Query.hs +++ b/Network/DNS/Query.hs @@ -109,7 +109,7 @@ encodeRDATA rd = case rd of (RD_MX prf dom) -> mconcat [putInt16 prf, encodeDomain dom] (RD_TXT txt) -> putByteString txt (RD_OTH bytes) -> mconcat $ map putInt8 bytes - (RD_SOA d1 d2 serial refresh retry expire min') -> mconcat $ + (RD_SOA d1 d2 serial refresh retry expire min') -> mconcat [ encodeDomain d1 , encodeDomain d2 , putInt32 serial @@ -118,7 +118,7 @@ encodeRDATA rd = case rd of , putInt32 expire , putInt32 min' ] - (RD_SRV prio weight port dom) -> mconcat $ + (RD_SRV prio weight port dom) -> mconcat [ putInt16 prio , putInt16 weight , putInt16 port diff --git a/Network/DNS/Response.hs b/Network/DNS/Response.hs index abcb8ba..523335b 100644 --- a/Network/DNS/Response.hs +++ b/Network/DNS/Response.hs @@ -15,7 +15,7 @@ import Data.ByteString (ByteString) import qualified Data.ByteString.Lazy as BL runDNSFormat :: BL.ByteString -> Either String (DNSFormat, PState) -runDNSFormat bs = runSGet decodeResponse bs +runDNSFormat = runSGet decodeResponse runDNSFormat_ :: BL.ByteString -> Either String DNSFormat runDNSFormat_ bs = fst <$> runDNSFormat bs diff --git a/TestProtocol.hs b/TestProtocol.hs index ee839d9..3c78cb6 100644 --- a/TestProtocol.hs +++ b/TestProtocol.hs @@ -147,7 +147,7 @@ testResponseA = DNSFormat { header = DNSHeader { identifier = 61046 } assertEither :: (a -> String) -> Either a b -> IO () -assertEither f e = either (assertFailure . f) (const $ return ()) e +assertEither f = either (assertFailure . f) (const $ return ()) test_Format :: DNSFormat -> IO () test_Format fmt = do -- cgit v1.2.3