diff options
| author | Alec Theriault <alec.theriault@gmail.com> | 2018-10-16 14:59:13 -0700 |
|---|---|---|
| committer | Alec Theriault <alec.theriault@gmail.com> | 2018-10-16 14:59:13 -0700 |
| commit | 41d9846754cdccb82e667ece2f44725ed9cab4e7 (patch) | |
| tree | 10228f82c23f1e25dcf7b6c097f76d673e0ea18e /haddock-api/src | |
| parent | 44169f4b1907e34fdf8ff84cf8b7509b1dfcaf55 (diff) | |
| parent | 9712d8899d452292913a260058a6dd3346e8d39b (diff) | |
Merge branch 'ghc-8.4' into ghc-8.6
Diffstat (limited to 'haddock-api/src')
| -rw-r--r-- | haddock-api/src/Haddock.hs | 11 | ||||
| -rw-r--r-- | haddock-api/src/Haddock/Interface.hs | 1 |
2 files changed, 9 insertions, 3 deletions
diff --git a/haddock-api/src/Haddock.hs b/haddock-api/src/Haddock.hs index 86a65901..dbfba0f4 100644 --- a/haddock-api/src/Haddock.hs +++ b/haddock-api/src/Haddock.hs @@ -48,6 +48,7 @@ import Control.Exception import Data.Maybe import Data.IORef import Data.Map (Map) +import Data.Version (makeVersion) import qualified Data.Map as Map import System.IO import System.Exit @@ -363,9 +364,13 @@ render dflags flags sinceQual qual ifaces installedIfaces extSrcMap = do -- might want to fix that if/when these two get some work on them when (Flag_Hoogle `elem` flags) $ do case pkgNameVer of - (Just (PackageName pkgNameFS), Just pkgVer) -> - let pkgNameStr | unpackFS pkgNameFS == "main" && title /= [] = title - | otherwise = unpackFS pkgNameFS + (Just (PackageName pkgNameFS), mpkgVer) -> + let + pkgNameStr | unpackFS pkgNameFS == "main" && title /= [] = title + | otherwise = unpackFS pkgNameFS + + pkgVer = + fromMaybe (makeVersion []) mpkgVer in ppHoogle dflags' pkgNameStr pkgVer title (fmap _doc prologue) visibleIfaces odir _ -> putStrLn . unlines $ diff --git a/haddock-api/src/Haddock/Interface.hs b/haddock-api/src/Haddock/Interface.hs index c330c5fe..759d5d03 100644 --- a/haddock-api/src/Haddock/Interface.hs +++ b/haddock-api/src/Haddock/Interface.hs @@ -84,6 +84,7 @@ processModules processModules verbosity modules flags extIfaces = do #if defined(mingw32_HOST_OS) -- Avoid internal error: <stderr>: hPutChar: invalid argument (invalid character)' non UTF-8 Windows + liftIO $ hSetEncoding stdout $ mkLocaleEncoding TransliterateCodingFailure liftIO $ hSetEncoding stderr $ mkLocaleEncoding TransliterateCodingFailure #endif |