Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prefer ErrorCall to ErrorCallWithLocation (backport #10404) #10411

Merged
merged 1 commit into from
Oct 2, 2024
Merged

Prefer ErrorCall to ErrorCallWithLocation (backport #10404) #10411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cabal-syntax/src/Distribution/Compat/Binary.hs
View file
Open in desktop
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
View file
Open in desktop
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
Loading