Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Qualify some uses of fail to avoid ambiguity.

Browse source
This commit is contained in:
John MacFarlane 2020-10-08 09:11:25 -07:00
parent d1e1898c52
commit 2566ff6624
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Text/Pandoc/Readers/Metadata.hs
View file

@ -42,13 +42,13 @@ yamlBsToMeta pMetaValue bstr = do
Right [] -> return . return $ mempty Right [] -> return . return $ mempty
Right [YAML.Doc (YAML.Scalar _ YAML.SNull)] Right [YAML.Doc (YAML.Scalar _ YAML.SNull)]
-> return . return $ mempty -> return . return $ mempty
Right _ -> fail "expected YAML object" Right _ -> Prelude.fail "expected YAML object"
Left (yamlpos, err') Left (yamlpos, err')
-> do pos <- getPosition -> do pos <- getPosition
setPosition $ incSourceLine setPosition $ incSourceLine
(setSourceColumn pos (YE.posColumn yamlpos)) (setSourceColumn pos (YE.posColumn yamlpos))
(YE.posLine yamlpos - 1) (YE.posLine yamlpos - 1)
fail err' Prelude.fail err'
fakePos :: YAML.Pos fakePos :: YAML.Pos
fakePos = YAML.Pos (-1) (-1) 1 0 fakePos = YAML.Pos (-1) (-1) 1 0
@ -87,16 +87,16 @@ yamlBsToRefs pMetaValue idpred bstr =
sequence <$> sequence <$>
mapM (yamlToMetaValue pMetaValue) (filter g ns) mapM (yamlToMetaValue pMetaValue) (filter g ns)
Just _ -> Just _ ->
fail "expecting sequence in 'references' field" Prelude.fail "expecting sequence in 'references' field"
Nothing -> Nothing ->
fail "expecting 'references' field" Prelude.fail "expecting 'references' field"
Right [] -> return . return $ mempty Right [] -> return . return $ mempty
Right [YAML.Doc (YAML.Scalar _ YAML.SNull)] Right [YAML.Doc (YAML.Scalar _ YAML.SNull)]
-> return . return $ mempty -> return . return $ mempty
Right _ -> fail "expecting YAML object" Right _ -> Prelude.fail "expecting YAML object"
Left (_pos, err') Left (_pos, err')
-> fail err' -> Prelude.fail err'
nodeToKey :: YAML.Node YE.Pos -> Maybe Text nodeToKey :: YAML.Node YE.Pos -> Maybe Text