diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-03-10 13:12:24 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-03-10 13:35:31 -0400 |
| commit | 8cb9381befed4174624edfc80e09185c9340b4f6 (patch) | |
| tree | e5d2041ff38502b1f8a5ef9caa6515cccfcea555 /Types/ActionItem.hs | |
| parent | e230fd58b5f5d5d16f87e1bd5c0f2e553f2ae5a2 (diff) | |
AssociatedFile newtype
To prevent any further mistakes like 1a497cefb47557f0b4788c606f9071be422b2511
This commit was sponsored by Francois Marier on Patreon.
Diffstat (limited to 'Types/ActionItem.hs')
| -rw-r--r-- | Types/ActionItem.hs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Types/ActionItem.hs b/Types/ActionItem.hs index d9beb049d..73d845101 100644 --- a/Types/ActionItem.hs +++ b/Types/ActionItem.hs @@ -13,8 +13,6 @@ import Key import Types.Transfer import Git.FilePath -import Data.Maybe - data ActionItem = ActionItemAssociatedFile AssociatedFile | ActionItemKey @@ -37,15 +35,15 @@ instance MkActionItem (Transfer, TransferInfo) where mkActionItem = uncurry ActionItemFailedTransfer actionItemDesc :: ActionItem -> Key -> String -actionItemDesc (ActionItemAssociatedFile (Just f)) _ = f -actionItemDesc (ActionItemAssociatedFile Nothing) k = key2file k +actionItemDesc (ActionItemAssociatedFile (AssociatedFile (Just f))) _ = f +actionItemDesc (ActionItemAssociatedFile (AssociatedFile Nothing)) k = key2file k actionItemDesc ActionItemKey k = key2file k actionItemDesc (ActionItemBranchFilePath bfp) _ = descBranchFilePath bfp -actionItemDesc (ActionItemFailedTransfer _ i) k = - fromMaybe (key2file k) (associatedFile i) +actionItemDesc (ActionItemFailedTransfer _ i) k = + actionItemDesc (ActionItemAssociatedFile (associatedFile i)) k actionItemWorkTreeFile :: ActionItem -> Maybe FilePath -actionItemWorkTreeFile (ActionItemAssociatedFile af) = af +actionItemWorkTreeFile (ActionItemAssociatedFile (AssociatedFile af)) = af actionItemWorkTreeFile _ = Nothing actionItemTransferDirection :: ActionItem -> Maybe Direction |