Fix a few hlint suggestions.

[dead/halcyon.git] / src / CommandLine.hs

diff --git a/src/CommandLine.hs b/src/CommandLine.hs
index f215ab84cb7ef4f338756793c910548866e312e4..db3b12da2039c6de2d046bf04e22782849b32649 100644 (file)
--- a/src/CommandLine.hs
+++ b/src/CommandLine.hs
@@ -59,62 +59,62 @@ default_options = Options { opt_access_token = Nothing,
 options :: [OptDescr (Options -> IO Options)]
 options =
   [ Option
-      [] ["consumer-key"]
+      "" ["consumer-key"]
       (ReqArg set_consumer_key "consumer-key")
       "Your Twitter API consumer key.",
 
     Option
-      [] ["consumer-secret"]
+      "" ["consumer-secret"]
       (ReqArg set_consumer_secret "consumer-secret")
       "Your Twitter API consumer secret.",
 
     Option
-      [] ["access-token"]
+      "" ["access-token"]
       (ReqArg set_access_token "access-token")
       "Your Twitter API access token.",
 
     Option
-      [] ["access-secret"]
+      "" ["access-secret"]
       (ReqArg set_access_secret "access-secret")
       "Your Twitter API access secret.",
 
     Option
-      ['h'] ["help"]
+      "h" ["help"]
       (NoArg set_help)
       "Prints this help message.",
 
     Option
-      ['n'] ["heartbeat"]
+      "n" ["heartbeat"]
       (ReqArg set_heartbeat "heartbeat")
       "How many seconds to wait between polling.",
 
     Option
-      ['t'] ["to"]
+      "t" ["to"]
       (ReqArg set_to "email_address")
       "Send tweets TO email_address.",
 
     Option
-      ['f'] ["from"]
+      "f" ["from"]
       (ReqArg set_from "email_address")
       "Send tweets FROM email_address.",
 
     Option
-      ['s'] ["sendmail_path"]
+      "s" ["sendmail_path"]
       (ReqArg set_sendmail_path "sendmail_path")
       "Use sendmail_path to send mail",
 
     Option
-      ['i'] ["ignore-replies"]
+      "i" ["ignore-replies"]
       (NoArg set_ignore_replies)
       "Ignore replies.",
 
     Option
-      ['I'] ["ignore-retweets"]
+      "I" ["ignore-retweets"]
       (NoArg set_ignore_retweets)
       "Ignore retweets.",
 
     Option
-      ['v'] ["verbose"]
+      "v" ["verbose"]
       (NoArg set_verbose)
       "Be verbose about stuff."
   ]
@@ -129,19 +129,19 @@ parse_int s =
     _         -> Nothing
 
 set_consumer_key :: String -> Options -> IO Options
-set_consumer_key arg opts = do
+set_consumer_key arg opts =
   return opts { opt_consumer_key = Just arg }
 
 set_consumer_secret :: String -> Options -> IO Options
-set_consumer_secret arg opts = do
+set_consumer_secret arg opts =
   return opts { opt_consumer_secret = Just arg }
 
 set_access_token :: String -> Options -> IO Options
-set_access_token arg opts = do
+set_access_token arg opts =
   return opts { opt_access_token = Just arg }
 
 set_access_secret :: String -> Options -> IO Options
-set_access_secret arg opts = do
+set_access_secret arg opts =
   return opts { opt_access_secret = Just arg }
 
 set_heartbeat :: String -> Options -> IO Options
@@ -166,15 +166,15 @@ set_verbose opts =
   return opts { opt_verbose = True }
 
 set_sendmail_path :: String -> Options -> IO Options
-set_sendmail_path arg opts = do
+set_sendmail_path arg opts =
   return opts { opt_sendmail_path = arg }
 
 set_to :: String -> Options -> IO Options
-set_to arg opts = do
+set_to arg opts =
   return opts { opt_to = Just arg }
 
 set_from :: String -> Options -> IO Options
-set_from arg opts = do
+set_from arg opts =
   return opts { opt_from = Just arg }
 
 
@@ -204,9 +204,7 @@ parse_options = do
   -- list, one after another, on a default_options record. The end
   -- result should be an Options instance with all of its members set
   -- correctly.
-  opts <- foldl (>>=) (return default_options) actions
-
-  return opts
+  foldl (>>=) (return default_options) actions
 
 
 -- | A list of parse errors relating to the heartbeat.