on master help sign in
Instance docs: hide conflicting Err import
commit7733fba1b4ec87e94a0f800a7d6089e5fc9acf2a authorAdam Sandberg Eriksson <adam@sandbergericsson.se> dateSat 7 Mar 2015, 17:48 (12 years ago) parent9d45713
1 file changed+4−4
src/Idris/Parser.hs+4−4
src/Idris/Parser.hs+4−4
@@ -9,7 +9,7 @@ module Idris.Parser(module Idris.Parser,
99import Prelude hiding (pi)
1010
1111import Text.Trifecta.Delta
12−import Text.Trifecta hiding (span, stringLiteral, charLiteral, natural, symbol, char, string, whiteSpace)
12+import Text.Trifecta hiding (span, stringLiteral, charLiteral, natural, symbol, char, string, whiteSpace, Err)
1313import Text.Parser.LookAhead
1414import Text.Parser.Expression
1515import qualified Text.Parser.Token as Tok
@@ -45,7 +45,7 @@ import Paths_idris
4545import Util.DynamicLinker
4646import qualified Util.Pretty as P
4747
48−import Idris.Core.TT as TT
48+import Idris.Core.TT
4949import Idris.Core.Evaluate
5050
5151import Control.Applicative hiding (Const)
@@ -657,8 +657,8 @@ instance_ syn = do (doc, _)
657657
658658-- | Parse a docstring
659659docstring :: SyntaxInfo
660− -> IdrisParser (Docstring (Either TT.Err PTerm),
661− [(Name,Docstring (Either TT.Err PTerm))])
660+ -> IdrisParser (Docstring (Either Err PTerm),
661+ [(Name,Docstring (Either Err PTerm))])
662662docstring syn = do (doc, argDocs) <- option noDocs docComment
663663 ist <- get
664664 let doc' = annotCode (tryFullExpr syn ist) doc