fixed pedantic warnings and hlint stuff

app/Main.hs

@@ -29,8 +29,6 @@ import System.Console.HCL (Request, reqFail, reqIO, runRequest)
 import System.Environment (lookupEnv)
 import System.Random (getStdGen)
 
-import Password
-
 import Types
 import UI
 import Util

app/UI.hs

@@ -22,12 +22,10 @@ License along with this program.  If not, see
 
 module UI (getMasterPass, mainMenu) where
 
-import Control.Applicative ((<|>))
 import Control.Lens (over, set, view, (^.))
 import Control.Monad (when)
 import Control.Monad.Trans.Class (lift)
 import qualified Control.Monad.Trans.State as S
-import Data.Maybe (maybe)
 import System.Console.HCL
   ( Request
   , prompt
@@ -39,7 +37,6 @@ import System.Console.HCL
   , reqPassword
   , reqResp
   , required
-  , runRequest
   )
 
 import Password
@@ -215,19 +212,20 @@ showPass x = do
   withService x
     (lift $ putStrLn "The service could not be found in the database.") $
     \d -> do
-      pw <- S.gets $ view masterPass
-      lift $ putStrLn $ case pwGenerate pw d of
+      mp <- S.gets $ view masterPass
+      lift $ putStrLn $ case pwGenerate mp d of
         Nothing -> "The password data were not valid."
         Just pw -> "password for " ++ x ++ ": " ++ pw
 
 -- TODO: refactor this monstrosity
 editPolicy :: PWPolicy -> Request PWPolicy
-editPolicy p = do
-  p <- edit "length" (p^.pwLength) pwLength p
-  p <- edit "min upper case"  (p^.pwUpper) pwUpper p
-  p <- edit "min lower case" (p^.pwLower) pwLower p
-  p <- edit "min digits" (p^.pwDigits) pwDigits p
-  p <- special p
+editPolicy policy = do
+  p <-
+    edit "length" (policy^.pwLength) pwLength policy >>=
+    edit "min upper case"  (policy^.pwUpper) pwUpper >>=
+    edit "min lower case" (policy^.pwLower) pwLower  >>=
+    edit "min digits" (policy^.pwDigits) pwDigits    >>=
+    special
   if validatePWPolicy p
     then return p
     else do
@@ -237,9 +235,9 @@ editPolicy p = do
       reqFail
   where
     edit l v t p = do
-      v <- reqDefault
+      v' <- reqDefault
         (prompt ("new " ++ l ++ " (default " ++ show v ++ "): ") reqInt) v
-      return $ set t v p
+      return $ set t v' p
     special p = do
       reqIO $ putStrLn $ "Special characters are currently " ++
         (case p^.pwSpecial of

app/Util.hs

@@ -38,14 +38,13 @@ import Control.Monad (join)
 import Control.Monad.Trans.Class (lift)
 import qualified Control.Monad.Trans.State as S
 import Data.Aeson (decodeFileStrict, encodeFile)
-import Data.Maybe (fromJust)
+import Data.Maybe (fromJust, fromMaybe)
 import System.Console.HCL
   ( Request
   , prompt
   , reqAgree
   , reqChar
   , reqDefault
-  , reqIf
   , reqIO
   , reqMenu
   , required
@@ -79,9 +78,7 @@ withService
   -> S.StateT Status IO a
 withService srv fb act = do
   db <- S.gets $ view database
-  case pwGetService srv db of
-    Nothing -> fb
-    Just x  -> act x
+  maybe fb act $ pwGetService srv db
 
 ifServExists
   :: String
@@ -109,9 +106,7 @@ confirm x = prompt (x ++ " (y/n): ") $ reqAgree Nothing $ fmap return reqChar
 loadFrom :: FilePath -> Request PWDatabase
 loadFrom path = reqDefault
   (reqIO (decodeFileStrict path))
-  (Just newPWDatabase) >>= maybe
-  (return newPWDatabase)
-  return
+  (Just newPWDatabase) >>= (return . fromMaybe newPWDatabase)
 
 save :: S.StateT Status IO ()
 save = do