From 22b42eab6ec6b3b321b6d54041b7b3a6e54af3c9 Mon Sep 17 00:00:00 2001 From: Krzysztof Gogolewski Date: Sun, 12 Jul 2020 18:16:57 +0200 Subject: Sync with GHC removing {-# CORE #-} pragma See ghc ticket #18048 --- haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs | 2 -- 1 file changed, 2 deletions(-) diff --git a/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs b/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs index fc277daf..5fd040a8 100644 --- a/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs +++ b/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs @@ -240,7 +240,6 @@ classify tok = ITcolumn_prag {} -> TkPragma ITscc_prag {} -> TkPragma ITgenerated_prag {} -> TkPragma - ITcore_prag {} -> TkPragma ITunpack_prag {} -> TkPragma ITnounpack_prag {} -> TkPragma ITann_prag {} -> TkPragma @@ -381,7 +380,6 @@ inPragma False tok = ITcolumn_prag {} -> True ITscc_prag {} -> True ITgenerated_prag {} -> True - ITcore_prag {} -> True ITunpack_prag {} -> True ITnounpack_prag {} -> True ITann_prag {} -> True -- cgit v1.2.3 From 904dce0cafe0a241dd3ef355775db47fc12f434d Mon Sep 17 00:00:00 2001 From: Sylvain Henry Date: Tue, 30 Jun 2020 11:49:52 +0200 Subject: Rename hscTarget into backend --- haddock-api/src/Haddock.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/haddock-api/src/Haddock.hs b/haddock-api/src/Haddock.hs index 63ceeb16..526e7d18 100644 --- a/haddock-api/src/Haddock.hs +++ b/haddock-api/src/Haddock.hs @@ -67,6 +67,7 @@ import Text.ParserCombinators.ReadP (readP_to_S) import GHC hiding (verbosity) import GHC.Settings.Config import GHC.Driver.Session hiding (projectVersion, verbosity) +import GHC.Driver.Backend import GHC.Utils.Error import GHC.Unit import GHC.Utils.Panic (handleGhcException) @@ -495,9 +496,9 @@ withGhc' libDir needHieFiles flags ghcActs = runGhc (Just libDir) $ do let extra_opts | needHieFiles = [Opt_WriteHie, Opt_Haddock] | otherwise = [Opt_Haddock] dynflags' = (foldl' gopt_set dynflags extra_opts) - { hscTarget = HscNothing - , ghcMode = CompManager - , ghcLink = NoLink + { backend = NoBackend + , ghcMode = CompManager + , ghcLink = NoLink } flags' = filterRtsFlags flags -- cgit v1.2.3