[commit: haddock] T6018-injective-type-families, adamse-D1033, ghc-head, wip/10268, wip/10313, wip/D548-master, wip/D548-master-2, wip/T10483, wip/T8584, wip/T9840, wip/api-ann-hstylit, wip/api-ann-hstylit-1, wip/api-ann-hstylit-2, wip/api-ann-hstylit-3, wip/api-ann-hstylit-4, wip/api-ann-hstylit-5, wip/ast-annotations-separate, wip/ast-prepare-annotations, wip/ast-prepare-annotations-final, wip/ast-prepare-annotations-final2, wip/ast-prepare-annotations-final3, wip/ast-prepare-annotations-final4, wip/ast-prepare-annotations-final5, wip/ast-prepare-annotations-final6, wip/orf-new, wip/orf-reboot, wip/pattern-synonyms, wip/rae, wip/trac-9744: Fix import of 'empty' due to AMP. (0cc5bc8)

git at git.haskell.org git at git.haskell.org
Wed Jul 8 08:31:14 UTC 2015


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

On branches: T6018-injective-type-families,adamse-D1033,ghc-head,wip/10268,wip/10313,wip/D548-master,wip/D548-master-2,wip/T10483,wip/T8584,wip/T9840,wip/api-ann-hstylit,wip/api-ann-hstylit-1,wip/api-ann-hstylit-2,wip/api-ann-hstylit-3,wip/api-ann-hstylit-4,wip/api-ann-hstylit-5,wip/ast-annotations-separate,wip/ast-prepare-annotations,wip/ast-prepare-annotations-final,wip/ast-prepare-annotations-final2,wip/ast-prepare-annotations-final3,wip/ast-prepare-annotations-final4,wip/ast-prepare-annotations-final5,wip/ast-prepare-annotations-final6,wip/orf-new,wip/orf-reboot,wip/pattern-synonyms,wip/rae,wip/trac-9744
Link       : http://git.haskell.org/haddock.git/commitdiff/0cc5bc85e9fca92ab712b68a2ba2c0dd9d3d79f4

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

commit 0cc5bc85e9fca92ab712b68a2ba2c0dd9d3d79f4
Author: Austin Seipp <aseipp at pobox.com>
Date:   Tue Sep 9 01:03:27 2014 -0500

    Fix import of 'empty' due to AMP.
    
    Signed-off-by: Austin Seipp <aseipp at pobox.com>


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

0cc5bc85e9fca92ab712b68a2ba2c0dd9d3d79f4
 src/Haddock/Backends/LaTeX.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Haddock/Backends/LaTeX.hs b/src/Haddock/Backends/LaTeX.hs
index 7b72c03..eca2207 100644
--- a/src/Haddock/Backends/LaTeX.hs
+++ b/src/Haddock/Backends/LaTeX.hs
@@ -31,7 +31,7 @@ import qualified Data.Map as Map
 import System.Directory
 import System.FilePath
 import Data.Char
-import Control.Monad
+import Control.Monad hiding (empty)
 import Data.Maybe
 import Data.List
 



More information about the ghc-commits mailing list