aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2015-12-12 17:20:15 +0100
committerBen Gamari <ben@smart-cactus.org>2015-12-16 17:54:55 +0100
commit85be6fdc7832eae3afd141229c8ac3475da8f542 (patch)
treec7e6b3eac59397d4397d8748eec7e55ebea7b91e
parenta89c8083c2c08d9cd9607a91d6ea11420bd72a70 (diff)
Update for D1200
-rw-r--r--haddock-api/haddock-api.cabal1
-rw-r--r--haddock-api/src/Haddock/Interface/LexParseRn.hs5
-rw-r--r--haddock-api/src/Haddock/Types.hs5
-rw-r--r--haddock.cabal1
4 files changed, 8 insertions, 4 deletions
diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal
index 26bb1d94..7835ea50 100644
--- a/haddock-api/haddock-api.cabal
+++ b/haddock-api/haddock-api.cabal
@@ -48,6 +48,7 @@ library
, array
, xhtml >= 3000.2 && < 3000.3
, Cabal >= 1.10
+ , ghc-boot
, ghc >= 7.10 && < 7.12
, ghc-paths
diff --git a/haddock-api/src/Haddock/Interface/LexParseRn.hs b/haddock-api/src/Haddock/Interface/LexParseRn.hs
index 661bd6be..3c14498c 100644
--- a/haddock-api/src/Haddock/Interface/LexParseRn.hs
+++ b/haddock-api/src/Haddock/Interface/LexParseRn.hs
@@ -21,7 +21,8 @@ module Haddock.Interface.LexParseRn
import Data.IntSet (toList)
import Data.List
import Documentation.Haddock.Doc (metaDocConcat)
-import DynFlags (ExtensionFlag(..), languageExtensions)
+import DynFlags (languageExtensions)
+import qualified GHC.LanguageExtensions as LangExt
import FastString
import GHC
import Haddock.Interface.ParseModuleHeader
@@ -64,7 +65,7 @@ processModuleHeader dflags gre safety mayStr = do
doc' = overDoc (rename dflags gre) doc
return (hmi', Just doc')
- let flags :: [ExtensionFlag]
+ let flags :: [LangExt.Extension]
-- We remove the flags implied by the language setting and we display the language instead
flags = map toEnum (toList $ extensionFlags dflags) \\ languageExtensions (language dflags)
return (hmi { hmi_safety = Just $ showPpr dflags safety
diff --git a/haddock-api/src/Haddock/Types.hs b/haddock-api/src/Haddock/Types.hs
index 6bc00f63..914f00f2 100644
--- a/haddock-api/src/Haddock/Types.hs
+++ b/haddock-api/src/Haddock/Types.hs
@@ -33,7 +33,8 @@ import Documentation.Haddock.Types
import BasicTypes (Fixity(..))
import GHC hiding (NoLink)
-import DynFlags (ExtensionFlag, Language)
+import DynFlags (Language)
+import qualified GHC.LanguageExtensions as LangExt
import Coercion
import NameSet
import OccName
@@ -494,7 +495,7 @@ data HaddockModInfo name = HaddockModInfo
, hmi_portability :: Maybe String
, hmi_safety :: Maybe String
, hmi_language :: Maybe Language
- , hmi_extensions :: [ExtensionFlag]
+ , hmi_extensions :: [LangExt.Extension]
}
diff --git a/haddock.cabal b/haddock.cabal
index 55af3c05..ec2a43bc 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -59,6 +59,7 @@ executable haddock
array,
xhtml >= 3000.2 && < 3000.3,
Cabal >= 1.10,
+ ghc-boot,
ghc >= 7.11 && < 7.13,
bytestring,
transformers