Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

More ghc 6.12 related cleanup.

  • Loading branch information...
commit 1860fff2c4d1ee0ffd49ea370d5f5e909749d35e 1 parent 2d14b1c
@jgm authored
View
1  Network/Gitit/Config.hs
@@ -46,7 +46,6 @@ import Prelude hiding (readFile)
import System.IO.UTF8
#endif
import System.FilePath ((</>))
-import Control.Monad (liftM)
import Text.Pandoc
forceEither :: Show e => Either e a -> a
View
2  Network/Gitit/ContentTransformer.hs
@@ -80,7 +80,7 @@ import Network.Gitit.Cache (lookupCache, cacheContents)
import qualified Data.FileStore as FS
import Data.Maybe (mapMaybe)
import Text.Pandoc
-import Text.Pandoc.Shared (HTMLMathMethod(..), ObfuscationMethod(..))
+import Text.Pandoc.Shared (ObfuscationMethod(..))
import Text.XHtml hiding ( (</>), dir, method, password, rev )
import Text.Highlighting.Kate
import Data.Maybe (isNothing)
View
1  Network/Gitit/Feed.hs
@@ -25,7 +25,6 @@ module Network.Gitit.Feed (FeedConfig(..), filestoreToXmlFeed) where
import Control.Monad
import Data.DateTime
import Data.List (intercalate, sortBy)
-import Data.Maybe
import Data.Ord (comparing)
import Network.URI (isAllowedInURI, escapeURIString)
import System.FilePath
View
6 Network/Gitit/Handlers.hs
@@ -54,12 +54,10 @@ module Network.Gitit.Handlers (
)
where
import Safe
-import Data.FileStore
import Data.FileStore.Utils (isInsideDir)
import Network.Gitit.Server
import Network.Gitit.Framework
import Network.Gitit.Layout
-import Network.Gitit.State
import Network.Gitit.Types
import Network.Gitit.Feed (filestoreToXmlFeed, FeedConfig(..))
import Network.Gitit.Util (orIfNull)
@@ -71,11 +69,11 @@ import Control.Exception (throwIO, catch, try)
import Data.ByteString.UTF8 (toString)
import System.Time
import System.FilePath
-import Prelude hiding (readFile, writeFile, catch)
+import Prelude hiding (readFile, catch)
-- Note: ghc >= 6.12 (base >=4.2) supports unicode through iconv
-- So we use System.IO.UTF8 only if we have an earlier version
#if MIN_VERSION_base(4,2,0)
-import Prelude (readFile, writeFile)
+import Prelude (readFile)
#else
import System.IO.UTF8
#endif
View
1  Network/Gitit/Initialize.hs
@@ -42,7 +42,6 @@ import Prelude hiding (readFile)
import System.IO.UTF8
#endif
import Text.Pandoc
-import Text.Pandoc.Shared (HTMLMathMethod(..))
import System.Log.Logger (logM, Priority(..))
import qualified Text.StringTemplate as T
View
1  Network/Gitit/Server.hs
@@ -38,7 +38,6 @@ import Happstack.Server
import Happstack.Server.Parts (compressedResponseFilter)
import Network.Socket (getAddrInfo, defaultHints, addrAddress)
import Control.Monad.Reader
-import Data.Maybe
import Data.ByteString.UTF8 as U
withExpiresHeaders :: ServerMonad m => m Response -> m Response
View
6 gitit.hs
@@ -21,10 +21,8 @@ module Main where
import Network.Gitit
import Network.Gitit.Server
-import Network.Gitit.Initialize (createStaticIfMissing, createRepoIfMissing)
-import Prelude hiding (writeFile, readFile, catch)
+import Prelude hiding (readFile, catch)
import System.Directory
-import Network.Gitit.Config (getConfigFromFile)
import Data.Maybe (isNothing)
import Control.Monad.Reader
import System.Log.Logger (Priority(..), setLevel, setHandlers,
@@ -38,7 +36,7 @@ import Data.Version (showVersion)
-- Note: ghc >= 6.12 (base >=4.2) supports unicode through iconv
-- So we use System.IO.UTF8 only if we have an earlier version
#if MIN_VERSION_base(4,2,0)
-import Prelude (writeFile, readFile)
+import Prelude (readFile)
import System.IO (hPutStrLn)
#else
import System.IO.UTF8
Please sign in to comment.
Something went wrong with that request. Please try again.