[Git][ghc/ghc][wip/ghc-8.8-merges] 4 commits: Bump Haddock submodule to 2.23 release

[Ben Gamari]

Ben Gamari pushed to branch wip/ghc-8.8-merges at Glasgow Haskell Compiler / GHC


Commits:
4542f25d by Alec Theriault at 2019-06-04T03:42:39Z
Bump Haddock submodule to 2.23 release

This commit of Haddock is (hopefully) going to be the one corresponding
to a Hackage release of Haddock 2.23.

- - - - -
15752087 by Ben Gamari at 2019-06-04T22:54:55Z
Merge branch '8.8-haddock-release' of gitlab.haskell.org:harpocrates/ghc into wip/ghc-8.8-merges

- - - - -
686bd33a by Ben Gamari at 2019-06-04T22:59:24Z
Fix ghc-in-ghci

- - - - -
fe03067a by Ben Gamari at 2019-06-04T22:59:31Z
Haddock for hiefile-header

- - - - -


2 changed files:

- compiler/main/GhcMake.hs
- utils/haddock


Changes:

=====================================
compiler/main/GhcMake.hs
=====================================
@@ -2063,8 +2063,8 @@ downsweep hsc_env old_summaries excl_mods allow_dup_roots
 -- and .o file locations to be temporary files.
 -- See Note [-fno-code mode]
 enableCodeGenForTH :: HscTarget
-  -> NodeMap [Either ErrMsg ModSummary]
-  -> IO (NodeMap [Either ErrMsg ModSummary])
+  -> NodeMap [Either ErrorMessages ModSummary]
+  -> IO (NodeMap [Either ErrorMessages ModSummary])
 enableCodeGenForTH =
   enableCodeGenWhen condition should_modify TFL_CurrentModule TFL_GhcSession
   where
@@ -2083,8 +2083,8 @@ enableCodeGenForTH =
 -- This is used used in order to load code that uses unboxed tuples
 -- into GHCi while still allowing some code to be interpreted.
 enableCodeGenForUnboxedTuples :: HscTarget
-  -> NodeMap [Either ErrMsg ModSummary]
-  -> IO (NodeMap [Either ErrMsg ModSummary])
+  -> NodeMap [Either ErrorMessages ModSummary]
+  -> IO (NodeMap [Either ErrorMessages ModSummary])
 enableCodeGenForUnboxedTuples =
   enableCodeGenWhen condition should_modify TFL_GhcSession TFL_CurrentModule
   where
@@ -2106,8 +2106,8 @@ enableCodeGenWhen
   -> TempFileLifetime
   -> TempFileLifetime
   -> HscTarget
-  -> NodeMap [Either ErrMsg ModSummary]
-  -> IO (NodeMap [Either ErrMsg ModSummary])
+  -> NodeMap [Either ErrorMessages ModSummary]
+  -> IO (NodeMap [Either ErrorMessages ModSummary])
 enableCodeGenWhen condition should_modify staticLife dynLife target nodemap =
   traverse (traverse (traverse enable_code_gen)) nodemap
   where


=====================================
utils/haddock
=====================================
@@ -1 +1 @@
-Subproject commit 1126fe196fd0d5a2ad73e965982d6c75a2df0279
+Subproject commit 91c65619149f4866abcce33a56036e2e2454629f



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/a598e25b337f91a2bc1ce532ef406b275c3bd31e...fe03067a6201262c262617471e02394dc8b1d2d9

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/a598e25b337f91a2bc1ce532ef406b275c3bd31e...fe03067a6201262c262617471e02394dc8b1d2d9
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20190604/a0d1d74e/attachment-0001.html>