diff --git a/app/Main.hs b/app/Main.hs index 969fb75..6499af0 100644 --- a/app/Main.hs +++ b/app/Main.hs @@ -1,7 +1,6 @@ module Main where import Control.Error.Util -import Control.Monad import Control.Monad.Except import Control.Monad.Reader import Data.ByteString ( ByteString ) @@ -11,24 +10,19 @@ import Data.Dates ( getCurrentDateTime , DateTime(..) ) import Data.Functor ( (<&>) ) -import Data.List import Data.Maybe import Data.Semigroup ( (<>) ) import qualified Data.Text as T import Data.Time.Calendar import Data.Time.Clock -import Data.Time.Clock.POSIX import Data.Time.Format import Data.Time.Format.ISO8601 import GHup import GitHub.Auth -import GitHub.Data.Definitions -import GitHub.Data.Name import GitHub.Data.Repos import GitHub.Data.URL import HPath import Options.Applicative -import Safe import System.Console.Pretty import System.Exit import Text.Layout.Table @@ -126,14 +120,14 @@ main :: IO () main = do -- wrapper to run effects with settings let run e = do - settings <- exceptT - (\_ -> die - . color Red - $ "Could not get settings, make sure to run 'ghup config' first" - ) - pure - $ getSettings - (flip runReaderT) settings . runExceptT . withExceptT show $ e + settings <- exceptT + (\_ -> die + . color Red + $ "Could not get settings, make sure to run 'ghup config' first" + ) + pure + $ getSettings + (flip runReaderT) settings . runExceptT . withExceptT show $ e e <- execParser (info (opts <**> helper) idm) >>= \case -- fork @@ -155,10 +149,10 @@ main = do -- list-forks ListForks (ListForkOptions {..}) -> run $ do mtime <- liftIO $ case lSince of - Just t -> do + Just t' -> do dt <- getCurrentDateTime let mt = - either (const Nothing) Just . parseDate dt . UTF8.toString $ t + either (const Nothing) Just . parseDate dt . UTF8.toString $ t' pure $ mt >>= \t -> (parseTimeM True diff --git a/ghup.cabal b/ghup.cabal index aafa457..41aa611 100644 --- a/ghup.cabal +++ b/ghup.cabal @@ -54,12 +54,12 @@ executable ghup , mtl ^>= 2.2 , optparse-applicative ^>= 0.15 , pretty-terminal ^>= 0.1 - , safe ^>= 0.3 , table-layout ^>= 0.8 , text ^>= 1.2 , time ^>= 1.9 , utf8-string ^>= 1.0 hs-source-dirs: app + ghc-options: -Wall default-language: Haskell2010 default-extensions: LambdaCase, MultiWayIf, RecordWildCards, TupleSections