aboutsummaryrefslogtreecommitdiff
path: root/haddock-library/src
diff options
context:
space:
mode:
authorAlec Theriault <alec.theriault@gmail.com>2018-10-16 15:10:39 -0700
committerAlec Theriault <alec.theriault@gmail.com>2018-10-16 15:14:48 -0700
commit8d27cc1b185dc36424c4e6dfe5c55c6a25c05028 (patch)
tree9aab1f2c94d39867dd9a036adf808b3d2110aa0e /haddock-library/src
parentb5372b7d86e3058b419076641dd3048258c4ddf2 (diff)
parent41d9846754cdccb82e667ece2f44725ed9cab4e7 (diff)
Merge branch 'ghc-8.6' into ghc-head
Diffstat (limited to 'haddock-library/src')
-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.