Merge branch 'ghc-8.6' into ghc-head

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.