[commit: haddock] ghc-head, wip/T14529, wip/revert-ttg-2017-11-20, wip/ttg-2017-11-06, wip/ttg2-2017-11-10, wip/ttg3-2017-11-12, wip/ttg4-constraints-2017-11-13, wip/ttg6-unrevert-2017-11-22: Merge remote-tracking branch 'origin/master' into ghc-head (08c9e19)
git at git.haskell.org
git at git.haskell.org
Tue Nov 28 11:56:01 UTC 2017
- Previous message: [commit: haddock] ghc-head, master, wip/T14529, wip/revert-ttg-2017-11-20, wip/ttg-2017-11-06, wip/ttg2-2017-11-10, wip/ttg3-2017-11-12, wip/ttg4-constraints-2017-11-13, wip/ttg6-unrevert-2017-11-22: Remote tab (e5fe985)
- Next message: [commit: haddock] ghc-head, wip/T14529, wip/revert-ttg-2017-11-20, wip/ttg-2017-11-06, wip/ttg2-2017-11-10, wip/ttg3-2017-11-12, wip/ttg4-constraints-2017-11-13, wip/ttg6-unrevert-2017-11-22: fullModuleContents traverses exports in declaration order (2be7dcf)
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Repository : ssh://git@git.haskell.org/haddock
On branches: ghc-head,wip/T14529,wip/revert-ttg-2017-11-20,wip/ttg-2017-11-06,wip/ttg2-2017-11-10,wip/ttg3-2017-11-12,wip/ttg4-constraints-2017-11-13,wip/ttg6-unrevert-2017-11-22
Link : http://git.haskell.org/haddock.git/commitdiff/08c9e19236770811caf571321f5ece271d1fccff
>---------------------------------------------------------------
commit 08c9e19236770811caf571321f5ece271d1fccff
Merge: 3896bff e5fe985
Author: alexbiehl <alex.biehl at gmail.com>
Date: Tue Oct 31 21:48:55 2017 +0100
Merge remote-tracking branch 'origin/master' into ghc-head
>---------------------------------------------------------------
08c9e19236770811caf571321f5ece271d1fccff
CHANGES.md | 3 +
doc/invoking.rst | 2 +-
haddock-api/haddock-api.cabal | 2 +-
.../resources/html/Ocean.std-theme/ocean.css | 30 +-
haddock-api/resources/html/haddock-bundle.min.js | 2 +-
haddock-api/resources/html/js-src/cookies.ts | 20 +
.../resources/html/js-src/details-helper.ts | 106 +++
haddock-api/resources/html/js-src/init.ts | 9 +-
haddock-api/resources/html/js-src/quick-jump.tsx | 29 +-
.../html/js-src/{haddock-util.ts => style-menu.ts} | 75 +-
haddock-api/resources/html/package.json | 3 +-
haddock-api/resources/html/quick-jump.css | 17 +-
haddock-api/resources/html/quick-jump.min.js | 2 +-
haddock-api/src/Haddock.hs | 37 +-
haddock-api/src/Haddock/Backends/Meta.hs | 22 -
haddock-api/src/Haddock/Backends/Xhtml.hs | 60 +-
.../src/Haddock/Backends/Xhtml/DocMarkup.hs | 6 +-
haddock-api/src/Haddock/Backends/Xhtml/Layout.hs | 14 +-
haddock-api/src/Haddock/Backends/Xhtml/Meta.hs | 28 +
haddock-api/src/Haddock/Backends/Xhtml/Utils.hs | 35 +-
haddock-api/src/Haddock/InterfaceFile.hs | 2 +-
haddock-api/src/Haddock/ModuleTree.hs | 30 +-
haddock-api/src/Haddock/Options.hs | 10 +
haddock.cabal | 2 +-
html-test/ref/A.html | 76 +-
html-test/ref/B.html | 56 +-
html-test/ref/Bold.html | 18 +-
html-test/ref/Bug1.html | 26 +-
html-test/ref/Bug201.html | 24 +-
html-test/ref/Bug253.html | 18 +-
html-test/ref/Bug26.html | 62 +-
html-test/ref/Bug294.html | 50 +-
html-test/ref/Bug298.html | 48 +-
html-test/ref/Bug3.html | 22 +-
html-test/ref/Bug308.html | 24 +-
html-test/ref/Bug308CrossModule.html | 18 +-
html-test/ref/Bug310.html | 38 +-
html-test/ref/Bug313.html | 24 +-
html-test/ref/Bug335.html | 44 +-
html-test/ref/Bug387.html | 32 +-
html-test/ref/Bug4.html | 22 +-
html-test/ref/Bug6.html | 146 ++--
html-test/ref/Bug613.html | 94 +-
html-test/ref/Bug7.html | 72 +-
html-test/ref/BugDeprecated.html | 80 +-
html-test/ref/BugExportHeadings.html | 80 +-
html-test/ref/BundledPatterns.html | 150 ++--
html-test/ref/BundledPatterns2.html | 154 ++--
html-test/ref/DeprecatedClass.html | 46 +-
html-test/ref/DeprecatedData.html | 70 +-
html-test/ref/DeprecatedFunction.html | 32 +-
html-test/ref/DeprecatedFunction2.html | 22 +-
html-test/ref/DeprecatedFunction3.html | 22 +-
html-test/ref/DeprecatedNewtype.html | 48 +-
html-test/ref/DeprecatedReExport.html | 22 +-
html-test/ref/DeprecatedRecord.html | 52 +-
html-test/ref/DeprecatedTypeFamily.html | 48 +-
html-test/ref/DeprecatedTypeSynonym.html | 40 +-
html-test/ref/Examples.html | 26 +-
html-test/ref/Extensions.html | 18 +-
html-test/ref/GADTRecords.html | 92 +-
html-test/ref/Hash.html | 146 ++--
html-test/ref/HiddenInstances.html | 86 +-
html-test/ref/HiddenInstancesB.html | 68 +-
html-test/ref/Hyperlinks.html | 22 +-
html-test/ref/IgnoreExports.html | 32 +-
html-test/ref/Instances.html | 320 ++++---
html-test/ref/Math.html | 22 +-
html-test/ref/NamedDoc.html | 10 +-
html-test/ref/Nesting.html | 72 +-
html-test/ref/NoLayout.html | 22 +-
html-test/ref/NonGreedy.html | 18 +-
html-test/ref/Operators.html | 212 ++---
html-test/ref/OrphanInstances.html | 22 +-
html-test/ref/PR643.html | 18 +-
html-test/ref/PR643_1.html | 18 +-
html-test/ref/PatternSyns.html | 200 ++---
html-test/ref/Properties.html | 26 +-
html-test/ref/QuasiExpr.html | 40 +-
html-test/ref/SpuriousSuperclassConstraints.html | 30 +-
html-test/ref/Test.html | 952 +++++++++++----------
html-test/ref/Threaded.html | 22 +-
html-test/ref/Threaded_TH.html | 18 +-
html-test/ref/Ticket112.html | 18 +-
html-test/ref/Ticket75.html | 36 +-
html-test/ref/TitledPicture.html | 32 +-
html-test/ref/TypeFamilies.html | 618 +++++++------
html-test/ref/TypeFamilies2.html | 134 +--
html-test/ref/Unicode.html | 22 +-
89 files changed, 3079 insertions(+), 2619 deletions(-)
diff --cc haddock-api/src/Haddock.hs
index de40d06,4b4bad4..f7fa52b
--- a/haddock-api/src/Haddock.hs
+++ b/haddock-api/src/Haddock.hs
@@@ -43,7 -43,8 +43,8 @@@ import Haddock.Util
import Control.Monad hiding (forM_)
import Control.Applicative
-import Data.Foldable (forM_)
+import Data.Foldable (forM_, foldl')
+ import Data.Traversable (for)
import Data.List (isPrefixOf)
import Control.Exception
import Data.Maybe
- Previous message: [commit: haddock] ghc-head, master, wip/T14529, wip/revert-ttg-2017-11-20, wip/ttg-2017-11-06, wip/ttg2-2017-11-10, wip/ttg3-2017-11-12, wip/ttg4-constraints-2017-11-13, wip/ttg6-unrevert-2017-11-22: Remote tab (e5fe985)
- Next message: [commit: haddock] ghc-head, wip/T14529, wip/revert-ttg-2017-11-20, wip/ttg-2017-11-06, wip/ttg2-2017-11-10, wip/ttg3-2017-11-12, wip/ttg4-constraints-2017-11-13, wip/ttg6-unrevert-2017-11-22: fullModuleContents traverses exports in declaration order (2be7dcf)
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the ghc-commits
mailing list