From 2f34d120c6da996d23518c3fa9065ccf0e05a551 Mon Sep 17 00:00:00 2001
From: alexbiehl <alexbiehl@gmail.com>
Date: Sun, 7 Feb 2021 17:46:25 +0100
Subject: [PATCH] Remove dubious parseModLink
Instead construct the ModLink value directly when parsing.
---
haddock-api/src/Haddock/InterfaceFile.hs | 8 ++++----
haddock-library/src/Documentation/Haddock/Parser.hs | 4 ----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/haddock-api/src/Haddock/InterfaceFile.hs b/haddock-api/src/Haddock/InterfaceFile.hs
index 966901dfad..69201eb0b9 100644
--- a/haddock-api/src/Haddock/InterfaceFile.hs
+++ b/haddock-api/src/Haddock/InterfaceFile.hs
@@ -46,9 +46,6 @@ import GHC.Types.Unique.FM
import GHC.Types.Unique.Supply
import GHC.Types.Unique
-import Documentation.Haddock.Parser (parseModLink)
-
-
data InterfaceFile = InterfaceFile {
ifLinkEnv :: LinkEnv,
ifInstalledIfaces :: [InstalledInterface]
@@ -625,7 +622,10 @@ instance (Binary mod, Binary id) => Binary (DocH mod id) where
-- See note [The DocModule story]
5 -> do
af <- get bh
- return (parseModLink af)
+ return $ DocModule ModLink
+ { modLinkName = af
+ , modLinkLabel = Nothing
+ }
6 -> do
ag <- get bh
return (DocEmphasis ag)
diff --git a/haddock-library/src/Documentation/Haddock/Parser.hs b/haddock-library/src/Documentation/Haddock/Parser.hs
index bb8745a50c..de336d45ed 100644
--- a/haddock-library/src/Documentation/Haddock/Parser.hs
+++ b/haddock-library/src/Documentation/Haddock/Parser.hs
@@ -18,7 +18,6 @@
module Documentation.Haddock.Parser (
parseString,
parseParas,
- parseModLink,
overIdentifier,
toRegular,
Identifier
@@ -137,9 +136,6 @@ parseString = parseText . T.pack
parseText :: Text -> DocH mod Identifier
parseText = parseParagraph . T.dropWhile isSpace . T.filter (/= '\r')
-parseModLink :: String -> DocH mod id
-parseModLink s = snd $ parse moduleName (T.pack s)
-
parseParagraph :: Text -> DocH mod Identifier
parseParagraph = snd . parse p
where
--
GitLab