Skip to content

Commit

Permalink
Merge pull request haskell#10404 from alt-romes/wip/romes/cabal-clc285
Browse files Browse the repository at this point in the history
Prefer ErrorCall to ErrorCallWithLocation
  • Loading branch information
mergify[bot] authored Oct 1, 2024
2 parents d215dc3 + db683f2 commit 97ebb32
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Cabal-syntax/src/Distribution/Compat/Binary.hs
Original file line number Diff line number Diff line change
@@ -20,4 +20,4 @@ decodeOrFailIO :: Binary a => ByteString -> IO (Either String a)
decodeOrFailIO bs =
catch (evaluate (decode bs) >>= return . Right) handler
where
handler (ErrorCallWithLocation str _) = return $ Left str
handler (ErrorCall str) = return $ Left str
2 changes: 1 addition & 1 deletion Cabal-syntax/src/Distribution/Utils/Structured.hs
Original file line number Diff line number Diff line change
@@ -277,7 +277,7 @@ structuredDecodeOrFailIO :: (Binary.Binary a, Structured a) => LBS.ByteString ->
structuredDecodeOrFailIO bs =
catch (evaluate (structuredDecode bs) >>= return . Right) handler
where
handler (ErrorCallWithLocation str _) = return $ Left str
handler (ErrorCall str) = return $ Left str

-- | Lazily reconstruct a value previously written to a file.
structuredDecodeFileOrFail :: (Binary.Binary a, Structured a) => FilePath -> IO (Either String a)

0 comments on commit 97ebb32

Please # to comment.