Skip to content

Commit

Permalink
Prefer ErrorCall to ErrorCallWithLocation
Browse files Browse the repository at this point in the history
This future proofs the code for CLC#285, which will remove
`ErrorCallWithLocation` to de-duplicate duplicate CallStacks.

ErrorCall is already a pattern synonym with the same meaning as it will
have in the future, so this change is backwards compatible too.

(cherry picked from commit db683f2)
  • Loading branch information
alt-romes authored and mergify[bot] committed Oct 2, 2024
1 parent 1eaa6af commit f5799ed
Show file tree
Hide file tree
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
Expand Up @@ -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
Expand Up @@ -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)
Expand Down

0 comments on commit f5799ed

Please sign in to comment.