On 12/01/2014 10:00 PM, 'Klaus Aehlig' via ganeti-devel wrote:
commit 14aa1f395564121317f4b2dea881ef4a5b69dc25
Merge: c4b5c16 8458682
Author: Klaus Aehlig <aeh...@google.com>
Date: Mon Dec 1 21:58:36 2014 +0100
Merge branch 'stable-2.10' into stable-2.11
* stable-2.10
Fix hlint warnings found by hlint 1.9.11
Only check header for non-generated files
Conflicts:
src/Ganeti/Utils.hs (trivial)
Signed-off-by: Klaus Aehlig <aeh...@google.com>
diff --cc src/Ganeti/Utils.hs
index f13880e,bf0708e..aa050ae
--- a/src/Ganeti/Utils.hs
+++ b/src/Ganeti/Utils.hs
@@@ -246,9 -220,9 +246,9 @@@ if' _ _ y =
-- * Parsing utility functions
-- | Parse results from readsPrec.
-parseChoices :: (Monad m, Read a) => String -> String -> [(a, String)] -> m a
+parseChoices :: Monad m => String -> String -> [(a, String)] -> m a
- parseChoices _ _ ((v, ""):[]) = return v
- parseChoices name s ((_, e):[]) =
+ parseChoices _ _ [(v, "")] = return v
+ parseChoices name s [(_, e)] =
fail $ name ++ ": leftover characters when parsing '"
++ s ++ "': '" ++ e ++ "'"
parseChoices name s _ = fail $ name ++ ": cannot parse string '" ++ s ++ "'"
LGTM
--
Niklas Hambüchen
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
