diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-04-22 20:24:53 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-04-22 20:24:53 -0400 |
| commit | 4d376b47b7aa506c4f4a4c5ccc83ca2ef1aeacc2 (patch) | |
| tree | 33ab2e7c4b72d8a7fce40a0e93f63f3d50a6c3ab /Upgrade | |
| parent | f672c39279366a8927abfcde3050952365f5e0ee (diff) | |
expose Control.Monad.join
I think I've been looking for that function for some time.
Ie, I remember wanting to collapse Just Nothing to Nothing.
Diffstat (limited to 'Upgrade')
| -rw-r--r-- | Upgrade/V1.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs index f356e2cc0..e048b3db8 100644 --- a/Upgrade/V1.hs +++ b/Upgrade/V1.hs @@ -143,7 +143,7 @@ oldlog2key l -- as the v2 key that it is. readKey1 :: String -> Key readKey1 v - | mixup = fromJust $ file2key $ join ":" $ Prelude.tail bits + | mixup = fromJust $ file2key $ intercalate ":" $ Prelude.tail bits | otherwise = Key { keyName = n , keyBackendName = b @@ -153,7 +153,7 @@ readKey1 v where bits = split ":" v b = Prelude.head bits - n = join ":" $ drop (if wormy then 3 else 1) bits + n = intercalate ":" $ drop (if wormy then 3 else 1) bits t = if wormy then Just (Prelude.read (bits !! 1) :: EpochTime) else Nothing @@ -165,7 +165,7 @@ readKey1 v showKey1 :: Key -> String showKey1 Key { keyName = n , keyBackendName = b, keySize = s, keyMtime = t } = - join ":" $ filter (not . null) [b, showifhere t, showifhere s, n] + intercalate ":" $ filter (not . null) [b, showifhere t, showifhere s, n] where showifhere Nothing = "" showifhere (Just v) = show v |