aboutsummaryrefslogtreecommitdiff
path: root/haddock-library/src/Documentation
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2018-10-16 18:47:24 +0200
committerGitHub <noreply@github.com>2018-10-16 18:47:24 +0200
commit37745e73927a6b15b5d1231cf6a7d720f1d92efa (patch)
treedbfefd2a79043d26eb8d7260a480c5d206195ba4 /haddock-library/src/Documentation
parent39f591b945bc3e507c3c54ba762b26cb0fb9ded7 (diff)
parentb90465ac987600d09d0f9b9b5afee077925bda06 (diff)
Merge pull request #945
haddock-api 2.21.0 and haddock-library 1.6.1 release
Diffstat (limited to 'haddock-library/src/Documentation')
-rw-r--r--haddock-library/src/Documentation/Haddock/Parser/Monad.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/haddock-library/src/Documentation/Haddock/Parser/Monad.hs b/haddock-library/src/Documentation/Haddock/Parser/Monad.hs
index 585c76bb..a5664aa8 100644
--- a/haddock-library/src/Documentation/Haddock/Parser/Monad.hs
+++ b/haddock-library/src/Documentation/Haddock/Parser/Monad.hs
@@ -17,6 +17,7 @@ import Data.String ( IsString(..) )
import Data.Bits ( Bits(..) )
import Data.Char ( ord )
import Data.List ( foldl' )
+import Control.Applicative as App
import Documentation.Haddock.Types ( Version )
@@ -52,7 +53,7 @@ peekChar' = Parsec.lookAhead Parsec.anyChar
-- | Parses the given string. Returns the parsed string.
string :: Text -> Parser Text
-string t = Parsec.string (T.unpack t) *> pure t
+string t = Parsec.string (T.unpack t) *> App.pure t
-- | Scan the input text, accumulating characters as long as the scanning
-- function returns true.