diff options
| author | Hécate Moonlight <Kleidukos@users.noreply.github.com> | 2021-02-07 17:52:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-07 17:52:05 +0100 |
| commit | 39fea0fedb79b2cd893861e31fe6f1c051d4833f (patch) | |
| tree | cf1aa4083e73df02b0bdc95e0ae3ed370e46349a | |
| parent | 9dab3bdc9f31c0389e69f21c2199f874d151ccb7 (diff) | |
| parent | 2f34d120c6da996d23518c3fa9065ccf0e05a551 (diff) | |
Merge pull request #1320 from haskell/alex/fix
Remove dubious parseModLink
| -rw-r--r-- | haddock-api/src/Haddock/InterfaceFile.hs | 8 | ||||
| -rw-r--r-- | 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 966901df..69201eb0 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 bb8745a5..de336d45 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 |