[commit: ghc] master: Bump haddock submodule (eb37132)

git at git.haskell.org git at git.haskell.org
Fri Nov 3 00:16:13 UTC 2017


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/eb3713225fd3199a81357b5853194e56f732e308/ghc

>---------------------------------------------------------------

commit eb3713225fd3199a81357b5853194e56f732e308
Author: alexbiehl <alex.biehl at gmail.com>
Date:   Thu Nov 2 17:29:08 2017 -0400

    Bump haddock submodule
    
    Reviewers: austin, bgamari
    
    Subscribers: rwbarton, thomie
    
    Differential Revision: https://phabricator.haskell.org/D4144


>---------------------------------------------------------------

eb3713225fd3199a81357b5853194e56f732e308
 mk/build.mk.sample                 | 2 +-
 testsuite/tests/perf/haddock/all.T | 3 ++-
 utils/haddock                      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mk/build.mk.sample b/mk/build.mk.sample
index 6bceca3..958cea7 100644
--- a/mk/build.mk.sample
+++ b/mk/build.mk.sample
@@ -99,7 +99,7 @@ endif
 
 # Enable pretty hyperlinked sources
 #HADDOCK_DOCS = YES
-#EXTRA_HADDOCK_OPTS += --hyperlinked-source
+#EXTRA_HADDOCK_OPTS += --quickjump --hyperlinked-source
 
 # Don't strip debug and other unneeded symbols from libraries and executables.
 STRIP_CMD = :
diff --git a/testsuite/tests/perf/haddock/all.T b/testsuite/tests/perf/haddock/all.T
index e329d86..04281d6 100644
--- a/testsuite/tests/perf/haddock/all.T
+++ b/testsuite/tests/perf/haddock/all.T
@@ -69,7 +69,7 @@ test('haddock.Cabal',
      [extra_files(['../../../../libraries/Cabal/Cabal/dist-install/haddock.t']),
       unless(in_tree_compiler(), skip), req_haddock
      ,stats_num_field('bytes allocated',
-          [(wordsize(64), 15857428040, 5)
+          [(wordsize(64), 17133915848, 5)
             # 2012-08-14:  3255435248 (amd64/Linux)
             # 2012-08-29:  3324606664 (amd64/Linux, new codegen)
             # 2012-10-08:  3373401360 (amd64/Linux)
@@ -118,6 +118,7 @@ test('haddock.Cabal',
             # 2017-06-05: 22294859000 (amd64/Linux) - Desugar modules compiled with -fno-code
             # 2017-06-05: 18753963960 (amd64/Linux) - Don't pass on -dcore-lint in Haddock.mk
             # 2017-08-22: 15857428040 (amd64/Linux) - Various Haddock optimizations
+            # 2017-11-02: 17133915848 (amd64/Linux) - Phabricator D4144
 
           ,(platform('i386-unknown-mingw32'), 3293415576, 5)
             # 2012-10-30:                     1733638168 (x86/Windows)
diff --git a/utils/haddock b/utils/haddock
index 0a64b5c..1789c77 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 0a64b5cdc051c47b24151b8839ae9067f06d8d0d
+Subproject commit 1789c77a6ed1580dc10a4391dc8c398e902f03b1



More information about the ghc-commits mailing list