Supplession of unneeded imports

darcs-hash:20070717081436-62b54-416b990cee25fb2b2046bc49bc8d0c50463ca796.gz

diff --git a/Lucu.cabal b/Lucu.cabal
index e7be5c757cc32b2b0ffff172094fbd5cb3e9a1c4..e7a0e76423b1f419a39f2f1fbae3de576efc5abb 100644 (file)
--- a/Lucu.cabal
+++ b/Lucu.cabal
@@ -51,9 +51,9 @@ Extra-Source-Files:
         data/mime.types
         examples/HelloWorld.hs
         examples/Makefile
-ghc-options: -fglasgow-exts -fwarn-missing-signatures -funbox-strict-fields -O3
+ghc-options: -fglasgow-exts -fwarn-missing-signatures -fwarn-unused-imports -funbox-strict-fields -O3
 
 --Executable: HelloWorld
 --Main-Is: HelloWorld.hs
 --Hs-Source-Dirs: ., examples
---ghc-options: -threaded -fglasgow-exts -O3
\ No newline at end of file
+--ghc-options: -threaded -fglasgow-exts -O3

diff --git a/Network/HTTP/Lucu.hs b/Network/HTTP/Lucu.hs
index 14d39543aca45b86f6796e940c1835f48652f65a..9859e538e8e5f15c514e3143e5c5f9b3f46cfe14 100644 (file)
--- a/Network/HTTP/Lucu.hs
+++ b/Network/HTTP/Lucu.hs
@@ -77,7 +77,6 @@ import Network.HTTP.Lucu.Config
 import Network.HTTP.Lucu.ETag
 import Network.HTTP.Lucu.Httpd
 import Network.HTTP.Lucu.MIMEType
-import Network.HTTP.Lucu.Request
 import Network.HTTP.Lucu.Resource hiding (driftTo)
 import Network.HTTP.Lucu.Resource.Tree
 import Network.HTTP.Lucu.Response

diff --git a/Network/HTTP/Lucu/Abortion.hs b/Network/HTTP/Lucu/Abortion.hs
index 4313df3ec42adee37f7df9689fb5ff0b8cba4219..fd4903dc8c0a78acfe7342cb7c63c42799092d88 100644 (file)
--- a/Network/HTTP/Lucu/Abortion.hs
+++ b/Network/HTTP/Lucu/Abortion.hs
@@ -21,7 +21,6 @@ import           Data.Dynamic
 import           Network.HTTP.Lucu.Config
 import           Network.HTTP.Lucu.DefaultPage
 import           Network.HTTP.Lucu.Headers
-import           Network.HTTP.Lucu.HttpVersion
 import           Network.HTTP.Lucu.Request
 import           Network.HTTP.Lucu.Response
 import {-# SOURCE #-} Network.HTTP.Lucu.Resource

diff --git a/Network/HTTP/Lucu/Config.hs b/Network/HTTP/Lucu/Config.hs
index 49622b2371ff1ff2319ba2c5c4efe32204a1b7b2..b605d81750c7dc74c93fe5a722e52547b35f0f81 100644 (file)
--- a/Network/HTTP/Lucu/Config.hs
+++ b/Network/HTTP/Lucu/Config.hs
@@ -5,11 +5,8 @@ module Network.HTTP.Lucu.Config
     )
     where
 
-import qualified Data.Map as M
-import           Data.Map (Map)
 import           Network
 import           Network.BSD
-import           Network.HTTP.Lucu.MIMEType
 import           Network.HTTP.Lucu.MIMEType.Guess
 import           Network.HTTP.Lucu.MIMEType.DefaultExtensionMap
 import           System.IO.Unsafe

diff --git a/Network/HTTP/Lucu/DefaultPage.hs b/Network/HTTP/Lucu/DefaultPage.hs
index a79e47b49c9f143d6d83638868d42be26cd0d901..c4e82d5dd7e6e93f278c33c4dd1d5d3fe5a523d7 100644 (file)
--- a/Network/HTTP/Lucu/DefaultPage.hs
+++ b/Network/HTTP/Lucu/DefaultPage.hs
@@ -11,7 +11,6 @@ import           Control.Arrow.ArrowList
 import           Control.Concurrent.STM
 import           Control.Monad
 import qualified Data.ByteString.Lazy.Char8 as B
-import           Data.ByteString.Lazy.Char8 (ByteString)
 import           Data.Maybe
 import           Network
 import           Network.HTTP.Lucu.Config

diff --git a/Network/HTTP/Lucu/HttpVersion.hs b/Network/HTTP/Lucu/HttpVersion.hs
index 15ead365cdf6403a2e53eece4dbc117a1c8dcfef..e1ed0f38024fd9836629c84eee5d9bef20fd46cc 100644 (file)
--- a/Network/HTTP/Lucu/HttpVersion.hs
+++ b/Network/HTTP/Lucu/HttpVersion.hs
@@ -8,8 +8,6 @@ module Network.HTTP.Lucu.HttpVersion
     )
     where
 
-import qualified Data.ByteString.Lazy.Char8 as B
-import           Data.ByteString.Lazy.Char8 (ByteString)
 import           Network.HTTP.Lucu.Parser
 import           System.IO
 

diff --git a/Network/HTTP/Lucu/MIMEType/DefaultExtensionMap.hs b/Network/HTTP/Lucu/MIMEType/DefaultExtensionMap.hs
index 38c5589e60e5376fbfc3f2a45dbcb7d4be789980..6d33cd602f093f503eb6be4b98c2f6f78fbc9511 100644 (file)
--- a/Network/HTTP/Lucu/MIMEType/DefaultExtensionMap.hs
+++ b/Network/HTTP/Lucu/MIMEType/DefaultExtensionMap.hs
@@ -11,7 +11,6 @@ module Network.HTTP.Lucu.MIMEType.DefaultExtensionMap
 import Network.HTTP.Lucu.MIMEType
 import Network.HTTP.Lucu.MIMEType.Guess
 import qualified Data.Map as M
-import Data.Map (Map)
  
 defaultExtensionMap :: ExtMap
 defaultExtensionMap

diff --git a/Network/HTTP/Lucu/MIMEType/Guess.hs b/Network/HTTP/Lucu/MIMEType/Guess.hs
index 65bf3a607cc4b8306d5d7114485fb7452817ffe1..a0ea1646b4e8e3c29493e0e89743145db825b0c5 100644 (file)
--- a/Network/HTTP/Lucu/MIMEType/Guess.hs
+++ b/Network/HTTP/Lucu/MIMEType/Guess.hs
@@ -12,7 +12,6 @@ module Network.HTTP.Lucu.MIMEType.Guess
     where
 
 import qualified Data.ByteString.Lazy.Char8 as B
-import           Data.ByteString.Lazy.Char8 (ByteString)
 import qualified Data.Map as M
 import           Data.Map (Map)
 import           Data.Maybe
@@ -92,7 +91,6 @@ serializeExtMap extMap moduleName variableName
           imports  = [ HsImportDecl undefined (Module "Network.HTTP.Lucu.MIMEType") False Nothing Nothing
                      , HsImportDecl undefined (Module "Network.HTTP.Lucu.MIMEType.Guess") False Nothing Nothing
                      , HsImportDecl undefined (Module "Data.Map") True (Just (Module "M")) Nothing
-                     , HsImportDecl undefined (Module "Data.Map") False Nothing (Just (False, [HsIAbs (HsIdent "Map")]))
                      ]
           decls    = [ HsTypeSig undefined [HsIdent variableName]
                                      (HsQualType []

diff --git a/Network/HTTP/Lucu/Parser.hs b/Network/HTTP/Lucu/Parser.hs
index 0033eb482e88b80d111b2aededf9705c5cbb8ac5..174a28997e04b85641392ea6062662f3705ed67d 100644 (file)
--- a/Network/HTTP/Lucu/Parser.hs
+++ b/Network/HTTP/Lucu/Parser.hs
@@ -49,7 +49,6 @@ module Network.HTTP.Lucu.Parser
     )
     where
 
-import           Control.Monad
 import           Control.Monad.State
 import qualified Data.ByteString.Lazy.Char8 as B
 import           Data.ByteString.Lazy.Char8 (ByteString)

diff --git a/Network/HTTP/Lucu/Parser/Http.hs b/Network/HTTP/Lucu/Parser/Http.hs
index 015c189d1d26f789e87827a3bd4edfd0b31935c4..cb21d299418671fccfe308d13a6befe3f75ed9be 100644 (file)
--- a/Network/HTTP/Lucu/Parser/Http.hs
+++ b/Network/HTTP/Lucu/Parser/Http.hs
@@ -16,8 +16,6 @@ module Network.HTTP.Lucu.Parser.Http
     )
     where
 
-import qualified Data.ByteString.Lazy.Char8 as B
-import           Data.ByteString.Lazy.Char8 (ByteString)
 import           Data.List
 import           Network.HTTP.Lucu.Parser
 

diff --git a/Network/HTTP/Lucu/Postprocess.hs b/Network/HTTP/Lucu/Postprocess.hs
index cce46cdd89ddaadff56557c1b1bfd8d7c8b1d54f..5c4f5d01bb3bca73f92228e27833c4d489625017 100644 (file)
--- a/Network/HTTP/Lucu/Postprocess.hs
+++ b/Network/HTTP/Lucu/Postprocess.hs
@@ -18,7 +18,6 @@ import           Network.HTTP.Lucu.Interaction
 import           Network.HTTP.Lucu.RFC1123DateTime
 import           Network.HTTP.Lucu.Request
 import           Network.HTTP.Lucu.Response
-import           Network.HTTP.Lucu.Utils
 import           System.Time
 
 {-

diff --git a/Network/HTTP/Lucu/Preprocess.hs b/Network/HTTP/Lucu/Preprocess.hs
index 5e1d095151fb16b9a59e86730af5946971317638..1397950212abd91ced41b1a7b4d9293f61146a2e 100644 (file)
--- a/Network/HTTP/Lucu/Preprocess.hs
+++ b/Network/HTTP/Lucu/Preprocess.hs
@@ -47,8 +47,6 @@ import           Network.URI
 
 -}
 
-import GHC.Conc (unsafeIOToSTM)
-
 preprocess :: Interaction -> STM ()
 preprocess itr
     = itr `seq`

diff --git a/Network/HTTP/Lucu/RFC1123DateTime.hs b/Network/HTTP/Lucu/RFC1123DateTime.hs
index 3be2dd414b0bd67ba39166a6d9d95c2395977c16..9962c16924a935aa1e28e57bc7d72dd8f310b880 100644 (file)
--- a/Network/HTTP/Lucu/RFC1123DateTime.hs
+++ b/Network/HTTP/Lucu/RFC1123DateTime.hs
@@ -9,12 +9,9 @@ module Network.HTTP.Lucu.RFC1123DateTime
     where
 
 import           Control.Monad
-import qualified Data.ByteString.Lazy.Char8 as B
-import           Data.ByteString.Lazy.Char8 (ByteString)
 import           Network.HTTP.Lucu.Format
 import           Network.HTTP.Lucu.Parser
 import           System.Time
-import           System.Locale
 
 month :: [String]
 month =  ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]

diff --git a/Network/HTTP/Lucu/Request.hs b/Network/HTTP/Lucu/Request.hs
index bc1c317ddeea266ff2fa87275c5370a6fc078c81..b316730d1112174b26e8aec564b20dd4c38c2ea0 100644 (file)
--- a/Network/HTTP/Lucu/Request.hs
+++ b/Network/HTTP/Lucu/Request.hs
@@ -10,8 +10,6 @@ module Network.HTTP.Lucu.Request
     )
     where
 
-import qualified Data.ByteString.Lazy.Char8 as B
-import           Data.ByteString.Lazy.Char8 (ByteString)
 import           Network.HTTP.Lucu.Headers
 import           Network.HTTP.Lucu.HttpVersion
 import           Network.HTTP.Lucu.Parser

diff --git a/Network/HTTP/Lucu/RequestReader.hs b/Network/HTTP/Lucu/RequestReader.hs
index 1cce2d659295a5386254bf42d9df1a96b77aa0df..639a37104262ad37a762c2881118977e002489b3 100644 (file)
--- a/Network/HTTP/Lucu/RequestReader.hs
+++ b/Network/HTTP/Lucu/RequestReader.hs
@@ -9,23 +9,19 @@ import           Control.Exception
 import           Control.Monad
 import qualified Data.ByteString.Lazy.Char8 as B
 import           Data.ByteString.Lazy.Char8 (ByteString)
-import           Data.Map as M
-import           Data.Map (Map)
 import           Data.Maybe
 import qualified Data.Sequence as S
-import           Data.Sequence (Seq, (<|), ViewR(..))
+import           Data.Sequence ((<|))
 import           Network.Socket
 import           Network.HTTP.Lucu.Config
 import           Network.HTTP.Lucu.Chunk
 import           Network.HTTP.Lucu.DefaultPage
-import           Network.HTTP.Lucu.HttpVersion
 import           Network.HTTP.Lucu.Interaction
 import           Network.HTTP.Lucu.Parser
 import           Network.HTTP.Lucu.Postprocess
 import           Network.HTTP.Lucu.Preprocess
 import           Network.HTTP.Lucu.Request
 import           Network.HTTP.Lucu.Response
-import           Network.HTTP.Lucu.Resource
 import           Network.HTTP.Lucu.Resource.Tree
 import           Prelude hiding (catch)
 import           System.IO

diff --git a/Network/HTTP/Lucu/Resource.hs b/Network/HTTP/Lucu/Resource.hs
index 96863f044dad4c803bdd42360e27d67cac5b8105..bacb00f2c6f7c1a1101c4069b5d860899791ddd4 100644 (file)
--- a/Network/HTTP/Lucu/Resource.hs
+++ b/Network/HTTP/Lucu/Resource.hs
@@ -132,13 +132,11 @@ import qualified Data.ByteString.Lazy.Char8 as B
 import           Data.ByteString.Lazy.Char8 (ByteString)
 import           Data.List
 import           Data.Maybe
-import           GHC.Conc (unsafeIOToSTM)
 import           Network.HTTP.Lucu.Abortion
 import           Network.HTTP.Lucu.Config
 import           Network.HTTP.Lucu.DefaultPage
 import           Network.HTTP.Lucu.ETag
 import qualified Network.HTTP.Lucu.Headers as H
-import           Network.HTTP.Lucu.HttpVersion
 import           Network.HTTP.Lucu.Interaction
 import           Network.HTTP.Lucu.Parser
 import           Network.HTTP.Lucu.Postprocess

diff --git a/Network/HTTP/Lucu/Resource/Tree.hs b/Network/HTTP/Lucu/Resource/Tree.hs
index 9af5fd54ed809d19b1f65c168748a02b7878a641..c2f6add5483b2e19a653ce1d25f51510407a65ad 100644 (file)
--- a/Network/HTTP/Lucu/Resource/Tree.hs
+++ b/Network/HTTP/Lucu/Resource/Tree.hs
@@ -22,7 +22,6 @@ import           Data.Map (Map)
 import           Data.Maybe
 import           Network.HTTP.Lucu.Abortion
 import           Network.HTTP.Lucu.Config
-import           Network.HTTP.Lucu.MIMEType
 import           Network.HTTP.Lucu.Request
 import           Network.HTTP.Lucu.Resource
 import           Network.HTTP.Lucu.Response

diff --git a/Network/HTTP/Lucu/ResponseWriter.hs b/Network/HTTP/Lucu/ResponseWriter.hs
index 00e6f46b523849315c9ac833d44fe947ab5239f5..7891db1d4216230374dd767c3adde35155f28f35 100644 (file)
--- a/Network/HTTP/Lucu/ResponseWriter.hs
+++ b/Network/HTTP/Lucu/ResponseWriter.hs
@@ -5,13 +5,12 @@ module Network.HTTP.Lucu.ResponseWriter
     where
 
 import qualified Data.ByteString.Lazy.Char8 as B
-import           Data.ByteString.Lazy.Char8 (ByteString)
+import           Control.Concurrent
 import           Control.Concurrent.STM
 import           Control.Exception
 import           Control.Monad
-import           Data.Maybe
 import qualified Data.Sequence as S
-import           Data.Sequence (Seq, ViewR(..))
+import           Data.Sequence (ViewR(..))
 import           Network.HTTP.Lucu.Config
 import           Network.HTTP.Lucu.Format
 import           Network.HTTP.Lucu.HttpVersion
@@ -21,10 +20,6 @@ import           Network.HTTP.Lucu.Response
 import           Prelude hiding (catch)
 import           System.IO
 
-import Control.Concurrent
-import Debug.Trace
-import GHC.Conc (unsafeIOToSTM)
-
 
 responseWriter :: Config -> Handle -> InteractionQueue -> ThreadId -> IO ()
 responseWriter cnf h tQueue readerTID

diff --git a/Network/HTTP/Lucu/StaticFile.hs b/Network/HTTP/Lucu/StaticFile.hs
index a83f285858411d50ff37d00137c8731651914643..3b8222f15f0d07f06cf4aaaf884cf5e754515d5f 100644 (file)
--- a/Network/HTTP/Lucu/StaticFile.hs
+++ b/Network/HTTP/Lucu/StaticFile.hs
@@ -13,7 +13,6 @@ module Network.HTTP.Lucu.StaticFile
 import           Control.Monad
 import           Control.Monad.Trans
 import qualified Data.ByteString.Lazy.Char8 as B
-import           Data.ByteString.Lazy.Char8 (ByteString)
 import           Network.HTTP.Lucu.Abortion
 import           Network.HTTP.Lucu.Config
 import           Network.HTTP.Lucu.ETag

diff --git a/Network/HTTP/Lucu/Utils.hs b/Network/HTTP/Lucu/Utils.hs
index b22780b5f121aab681722b8ac17333f41ba3a66e..d6e46f180e1d2c61990979cd96506b48dcacb6c5 100644 (file)
--- a/Network/HTTP/Lucu/Utils.hs
+++ b/Network/HTTP/Lucu/Utils.hs
@@ -12,11 +12,8 @@ module Network.HTTP.Lucu.Utils
     )
     where
 
-import Control.Monad.Trans
 import Data.Char
 import Data.List
-import Foreign
-import Foreign.C
 import Network.URI
 
 -- |> splitBy (== ':') "ab:c:def"