cleaning up imports.

2024-10-06 10:40:07 +03:00 · 2017-11-22 13:42:32 +09:00 · 2017-11-22 13:42:32 +09:00 · 269ae5a986
commit 269ae5a986
parent ac96a48477
15 changed files with 64 additions and 83 deletions
--- a/Network/DNS/Decode.hs
+++ b/Network/DNS/Decode.hs
@ -1,5 +1,3 @@
-{-# LANGUAGE CPP #-}
-
 -- | Decoders for DNS.
 module Network.DNS.Decode (
    -- * Decoder
@ -13,15 +11,10 @@ module Network.DNS.Decode (
  , decodeMailbox
  ) where

-import Control.Applicative (many)
-import Data.ByteString (ByteString)
+import Network.DNS.Decode.Internal
+import Network.DNS.Imports
 import Network.DNS.StateBinary
 import Network.DNS.Types
-import Network.DNS.Decode.Internal
-
-#if __GLASGOW_HASKELL__ < 709
-import Control.Applicative
-#endif

 ----------------------------------------------------------------

--- a/Network/DNS/Decode/Internal.hs
+++ b/Network/DNS/Decode/Internal.hs
@ -1,4 +1,4 @@
-{-# LANGUAGE OverloadedStrings, CPP #-}
+{-# LANGUAGE OverloadedStrings #-}

 module Network.DNS.Decode.Internal (
    getResponse
@ -10,21 +10,14 @@ module Network.DNS.Decode.Internal (
  , getMailbox
  ) where

-import Control.Monad (replicateM)
-import Data.Bits ((.&.), shiftR, testBit)
-import Data.ByteString (ByteString)
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Char8 as BS
 import Data.IP (IP(..), toIPv4, toIPv6b)
-import Data.Word (Word16)
-import Network.DNS.StateBinary
-import Network.DNS.Types
-import Numeric (showHex)
 import qualified Safe

-#if __GLASGOW_HASKELL__ < 709
-import Control.Applicative
-#endif
+import Network.DNS.Imports
+import Network.DNS.StateBinary
+import Network.DNS.Types

 ----------------------------------------------------------------

--- a/Network/DNS/Encode.hs
+++ b/Network/DNS/Encode.hs
@ -1,4 +1,4 @@
-{-# LANGUAGE RecordWildCards, CPP #-}
+{-# LANGUAGE RecordWildCards #-}

 -- | Encoders for DNS.
 module Network.DNS.Encode (
@ -12,24 +12,16 @@ module Network.DNS.Encode (
  , encodeMailbox
  ) where

-import Control.Monad (when)
 import Control.Monad.State (State, modify, execState, gets)
-import Data.Binary (Word16)
-import Data.Bits ((.|.), bit, shiftL)
 import qualified Data.ByteString.Builder as BB
-import Data.ByteString.Char8 (ByteString)
 import qualified Data.ByteString.Char8 as BS
 import qualified Data.ByteString.Lazy.Char8 as LBS
 import Data.IP (IP(..), fromIPv4, fromIPv6b)
-import Data.List (dropWhileEnd)
-import Data.Monoid ((<>))
+
+import Network.DNS.Imports
 import Network.DNS.StateBinary
 import Network.DNS.Types

-#if __GLASGOW_HASKELL__ < 709
-import Data.Monoid (mconcat)
-#endif
-
 ----------------------------------------------------------------

 -- | Encoding DNS query or response.
--- a/Network/DNS/IO.hs
+++ b/Network/DNS/IO.hs
@ -27,7 +27,6 @@ module Network.DNS.IO (
 #endif

 import qualified Control.Monad.State as ST
-import Data.ByteString (ByteString)
 import qualified Data.ByteString.Builder as BB
 import qualified Data.ByteString.Char8 as BS
 import qualified Data.ByteString.Lazy.Char8 as LBS
@ -37,25 +36,20 @@ import Data.Conduit.Attoparsec (sinkParser)
 import qualified Data.Conduit.Binary as CB
 import Data.Conduit.Network (sourceSocket)
 import Data.IP (IPv4, IPv6)
-import Data.Monoid ((<>))
 import Network (Socket)

-#ifdef GHC708
-import Control.Applicative ((<$>))
-#endif
-
 #if defined(WIN) && defined(GHC708)
 import Network.Socket (send)
 import qualified Data.ByteString.Char8 as BS
-import Control.Monad (when)
 #else
 import Network.Socket.ByteString (sendAll)
 #endif

-import Network.DNS.Types
-import Network.DNS.Encode (encode)
 import Network.DNS.Decode.Internal (getResponse)
+import Network.DNS.Encode (encode)
+import Network.DNS.Imports
 import Network.DNS.StateBinary (PState, initialState)
+import Network.DNS.Types

 ----------------------------------------------------------------

--- a/Network/DNS/Imports.hs
+++ b/Network/DNS/Imports.hs
@ -0,0 +1,25 @@
+module Network.DNS.Imports (
+    ByteString
+  , NonEmpty(..)
+  , module Control.Applicative
+  , module Control.Monad
+  , module Data.Bits
+  , module Data.List
+  , module Data.Monoid
+  , module Data.Ord
+  , module Data.Word
+  , module Data.Maybe
+  , module Numeric
+  ) where
+
+import Control.Applicative
+import Control.Monad
+import Data.Bits
+import Data.ByteString (ByteString)
+import Data.List
+import Data.List.NonEmpty (NonEmpty(..))
+import Data.Maybe
+import Data.Monoid
+import Data.Ord
+import Data.Word
+import Numeric
--- a/Network/DNS/Lookup.hs
+++ b/Network/DNS/Lookup.hs
@ -72,13 +72,14 @@ module Network.DNS.Lookup (
  , lookupSRV
  ) where

-import Data.ByteString (ByteString)
 import qualified Data.ByteString.Char8 as BS
 import Data.IP (IPv4, IPv6)
-import Network.DNS.Resolver as DNS
+
+import Network.DNS.Imports
 import Network.DNS.LookupRaw as DNS
+import Network.DNS.Resolver as DNS
 import Network.DNS.Types
-import Data.Word (Word16, Word32)
+

 ----------------------------------------------------------------

--- a/Network/DNS/LookupRaw.hs
+++ b/Network/DNS/LookupRaw.hs
@ -11,17 +11,16 @@ module Network.DNS.LookupRaw (
  , fromDNSFormat
  ) where

-import Control.Monad (when)
 import Data.Time (getCurrentTime, addUTCTime)
+import Prelude hiding (lookup)

 import Network.DNS.IO
+import Network.DNS.Imports hiding (lookup)
 import Network.DNS.Memo
 import Network.DNS.Transport
 import Network.DNS.Types
 import Network.DNS.Types.Internal

-import Prelude hiding (lookup)
-
 -- $setup
 -- >>> import Network.DNS.Resolver

--- a/Network/DNS/Memo.hs
+++ b/Network/DNS/Memo.hs
@ -1,14 +1,12 @@
 module Network.DNS.Memo where

-import Control.Applicative ((<$>))
 import qualified Control.Reaper as R
-import Data.ByteString (ByteString)
 import qualified Data.ByteString as B
-import Data.List (foldl')
 import Data.OrdPSQ (OrdPSQ)
 import qualified Data.OrdPSQ as PSQ
 import Data.Time (UTCTime, getCurrentTime)

+import Network.DNS.Imports
 import Network.DNS.Types

 data Section = Answer | Authority deriving (Eq, Ord, Show)
--- a/Network/DNS/Resolver.hs
+++ b/Network/DNS/Resolver.hs
@ -41,38 +41,30 @@ module Network.DNS.Resolver (
 #define GHC708
 #endif

-import qualified Data.ByteString as BS
 import Control.Exception as E
-import Control.Monad (forM, replicateM)
-import Data.Maybe (isJust, maybe)
 import qualified Crypto.Random as C
+import qualified Data.ByteString as BS
 import Data.IORef (IORef)
 import qualified Data.IORef as I
-import Data.List.NonEmpty (NonEmpty(..))
 import qualified Data.List.NonEmpty as NE
-import Data.Word (Word16)
 import Network.BSD (getProtocolNumber)
-import Network.DNS.Transport
-import Network.DNS.Types
-import Network.DNS.Types.Internal
-import Network.DNS.Memo
 import Network.Socket (AddrInfoFlag(..), AddrInfo(..), PortNumber(..), HostName, SocketType(Datagram), getAddrInfo, defaultHints)
 import Prelude hiding (lookup)

-#ifdef GHC708
-import Control.Applicative ((<$>), (<*>), pure)
-#endif
-
 #if defined(WIN)
 import qualified Data.List.Split as Split
 import Foreign.C.String
 import Foreign.Marshal.Alloc (allocaBytes)
-import Data.Word
 #else
 import Data.Char (isSpace)
-import Data.List (isPrefixOf)
 #endif

+import Network.DNS.Imports
+import Network.DNS.Memo
+import Network.DNS.Transport
+import Network.DNS.Types
+import Network.DNS.Types.Internal
+
 ----------------------------------------------------------------

 -- |  Make a 'ResolvSeed' from a 'ResolvConf'.
--- a/Network/DNS/StateBinary.hs
+++ b/Network/DNS/StateBinary.hs
@ -1,4 +1,4 @@
-{-# LANGUAGE TypeSynonymInstances, FlexibleInstances, CPP #-}
+{-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-}
 module Network.DNS.StateBinary (
    PState(..)
  , initialState
@ -34,9 +34,7 @@ module Network.DNS.StateBinary (
 import Control.Monad.State (State, StateT)
 import qualified Control.Monad.State as ST
 import qualified Data.Attoparsec.ByteString as A
-
 import qualified Data.Attoparsec.Types as T
-import Data.ByteString (ByteString)
 import qualified Data.ByteString as BS
 import Data.ByteString.Builder (Builder)
 import qualified Data.ByteString.Builder as BB
@ -45,13 +43,9 @@ import Data.IntMap (IntMap)
 import qualified Data.IntMap as IM
 import Data.Map (Map)
 import qualified Data.Map as M
-import Data.Word (Word8, Word16, Word32)
-import Network.DNS.Types

-#if __GLASGOW_HASKELL__ < 709
-import Control.Applicative ((<$>), (<*))
-import Data.Monoid (Monoid, mconcat, mappend, mempty)
-#endif
+import Network.DNS.Imports
+import Network.DNS.Types

 ----------------------------------------------------------------

--- a/Network/DNS/Transport.hs
+++ b/Network/DNS/Transport.hs
@ -11,13 +11,14 @@ import Control.Exception as E
 import qualified Data.ByteString.Char8 as BS
 import qualified Data.List.NonEmpty as NE
 import Data.Typeable
-import Network.DNS.IO
-import Network.DNS.Types
-import Network.DNS.Types.Internal
 import Network.Socket (AddrInfo(..), SockAddr(..), Family(AF_INET, AF_INET6), Socket, SocketType(Stream), close, socket, connect, defaultProtocol)
 import System.IO.Error (annotateIOError)
 import System.Timeout (timeout)

+import Network.DNS.IO
+import Network.DNS.Types
+import Network.DNS.Types.Internal
+
 -- | Check response for a matching identifier.  If we ever do pipelined TCP,
 -- we'll also need to match the QNAME, CLASS and QTYPE.  See:
 -- https://tools.ietf.org/html/rfc7766#section-7
--- a/Network/DNS/Types.hs
+++ b/Network/DNS/Types.hs
@ -100,15 +100,14 @@ module Network.DNS.Types (
  ) where

 import Control.Exception (Exception, IOException)
-import Data.Bits ((.&.), (.|.), shiftR, shiftL, testBit, setBit)
-import Data.ByteString (ByteString)
 import qualified Data.ByteString.Base64 as B64 (encode)
 import qualified Data.ByteString.Char8 as BS
 import qualified Data.ByteString.Builder as L
 import qualified Data.ByteString.Lazy as L
 import Data.IP (IP, IPv4, IPv6)
 import Data.Typeable (Typeable)
-import Data.Word (Word8, Word16, Word32)
+
+import Network.DNS.Imports

 ----------------------------------------------------------------

--- a/Network/DNS/Types/Internal.hs
+++ b/Network/DNS/Types/Internal.hs
@ -1,9 +1,8 @@
 module Network.DNS.Types.Internal where

-import Data.List.NonEmpty (NonEmpty(..))
 import Network.Socket (AddrInfo(..), PortNumber(..), HostName)
-import Data.Word (Word16)

+import Network.DNS.Imports
 import Network.DNS.Memo
 import Network.DNS.Types

--- a/Network/DNS/Utils.hs
+++ b/Network/DNS/Utils.hs
@ -12,9 +12,9 @@ import qualified Data.ByteString.Char8 as BS (
  , map
  , null
  , pack )
-import Data.Char ( toLower )
+import Data.Char (toLower)

-import Network.DNS.Types ( Domain )
+import Network.DNS.Types (Domain)


 -- | Perform both 'normalizeCase' and 'normalizeRoot' on the given
--- a/dns.cabal
+++ b/dns.cabal
@ -27,6 +27,7 @@ Library
                        Network.DNS.Decode
                        Network.DNS.IO
  Other-Modules:        Network.DNS.Decode.Internal
+                        Network.DNS.Imports
                        Network.DNS.Memo
                        Network.DNS.StateBinary
                        Network.DNS.Transport