Workaround for exception-throwing canonicalizePath in old directory #104
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sol
reviewed
Jan 25, 2017
| @@ -37,6 +44,14 @@ eventsFromFile = go [] | |||
|
|
|||
| irrelevantEvents = [EventStreamStart, EventDocumentStart, EventDocumentEnd, EventStreamEnd] | |||
|
|
|||
| #if !MIN_VERSION_directory(1, 2, 3) | |||
| catchNotFound = handleJust | |||
There was a problem hiding this comment.
Bikeshedding: I would call this handleNotFound
There was a problem hiding this comment.
👍 that would be slightly nicer.
|
LGTM |
snoyberg
requested changes
Jan 25, 2017
| @@ -37,6 +44,14 @@ eventsFromFile = go [] | |||
|
|
|||
| irrelevantEvents = [EventStreamStart, EventDocumentStart, EventDocumentEnd, EventStreamEnd] | |||
|
|
|||
| #if !MIN_VERSION_directory(1, 2, 3) | |||
| catchNotFound = handleJust | |||
There was a problem hiding this comment.
👍 that would be slightly nicer.
| @@ -1,6 +1,13 @@ | |||
| {-# LANGUAGE CPP #-} | |||
There was a problem hiding this comment.
Can you give this a patch version bump and include a note in the ChangeLog?
There was a problem hiding this comment.
Sure, I think I addressed everything.
| @@ -37,6 +44,14 @@ eventsFromFile = go [] | |||
|
|
|||
| irrelevantEvents = [EventStreamStart, EventDocumentStart, EventDocumentEnd, EventStreamEnd] | |||
|
|
|||
| #if !MIN_VERSION_directory(1, 2, 3) | |||
| catchNotFound = handleJust | |||
| (\e -> guard (isDoesNotExistError e) >> guard (ioeGetLocation e == "canonicalizePath") >> ioeGetFileName e) | |||
There was a problem hiding this comment.
Not at all important, but IMO do notation would be slightly more legible here.
See: haskell/directory#44 (comment) This makes the exception for nonexistent yaml files the same regardless of which version of the directory package is used.
snoyberg
approved these changes
Jan 25, 2017
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See: haskell/directory#44 (comment)
This makes the exception for nonexistent yaml files the same regardless of
which version of the directory package is used.