From 67e4fcf4db1dc692da12305b1e2764419b445301 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Mon, 12 Nov 2012 17:35:32 +0100
Subject: [PATCH] Fix two hlint warnings
Sorry, I broke lint again :), by introducing two sub-standard changes.
Additionally, this silences an older existing warning that only
triggers with some versions of hlint (e.g. 1.8.28 which is present in
Wheezy).
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
htest/Test/Ganeti/Luxi.hs | 2 ++
htools/Ganeti/HTools/CLI.hs | 2 +-
htools/Ganeti/Ssconf.hs | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/htest/Test/Ganeti/Luxi.hs b/htest/Test/Ganeti/Luxi.hs
index a788e59cf..8faf50ef3 100644
--- a/htest/Test/Ganeti/Luxi.hs
+++ b/htest/Test/Ganeti/Luxi.hs
@@ -48,6 +48,8 @@ import Test.Ganeti.OpCodes ()
import Ganeti.BasicTypes
import qualified Ganeti.Luxi as Luxi
+{-# ANN module "HLint: ignore Use camelCase" #-}
+
-- * Luxi tests
$(genArbitrary ''Luxi.LuxiReq)
diff --git a/htools/Ganeti/HTools/CLI.hs b/htools/Ganeti/HTools/CLI.hs
index e2483a6c2..982a53622 100644
--- a/htools/Ganeti/HTools/CLI.hs
+++ b/htools/Ganeti/HTools/CLI.hs
@@ -336,7 +336,7 @@ genOLuxiSocket defSocket =
OptComplFile)
oLuxiSocket :: IO OptType
-oLuxiSocket = Path.defaultLuxiSocket >>= (return . genOLuxiSocket)
+oLuxiSocket = liftM genOLuxiSocket Path.defaultLuxiSocket
oMachineReadable :: OptType
oMachineReadable =
diff --git a/htools/Ganeti/Ssconf.hs b/htools/Ganeti/Ssconf.hs
index 9d345e3ea..6853bb15a 100644
--- a/htools/Ganeti/Ssconf.hs
+++ b/htools/Ganeti/Ssconf.hs
@@ -86,7 +86,7 @@ $(declareSADT "SSKey"
keyToFilename :: FilePath -- ^ Config path root
-> SSKey -- ^ Ssconf key
-> FilePath -- ^ Full file name
-keyToFilename cfgpath key = do
+keyToFilename cfgpath key =
cfgpath </> sSFilePrefix ++ sSKeyToRaw key
-- | Runs an IO action while transforming any error into 'Bad'
--
GitLab