Merge branch 'master' into encryption

This commit is contained in:
Joey Hess 2013-09-04 18:08:47 -04:00
commit 2fcae0348f
81 changed files with 1671 additions and 221 deletions

View file

@ -91,6 +91,12 @@ massReplace vs = go [] vs
go (replacement:acc) vs (drop (length val) s)
| otherwise = go acc rest s
{- First item in the list that is not Nothing. -}
firstJust :: Eq a => [Maybe a] -> Maybe a
firstJust ms = case dropWhile (== Nothing) ms of
[] -> Nothing
(md:_) -> md
{- Given two orderings, returns the second if the first is EQ and returns
- the first otherwise.
-