removed redundant code (mostly imports)

src/Mtlstats/Actions.hs

@@ -40,12 +40,10 @@ module Mtlstats.Actions
   ) where
 
 import Control.Monad.Trans.State (modify)
-import qualified Data.Map as M
 import Data.Maybe (fromMaybe)
-import Lens.Micro (over, (^.), (&), (.~), (?~), (%~), (+~))
+import Lens.Micro ((^.), (&), (.~), (%~))
 
 import Mtlstats.Types
-import Mtlstats.Util
 
 -- | Starts a new season
 startNewSeason :: ProgState -> ProgState

src/Mtlstats/Actions/NewGame/GoalieInput.hs

@@ -25,6 +25,7 @@ module Mtlstats.Actions.NewGame.GoalieInput
   , setGameGoalie
   ) where
 
+import Control.Monad (void)
 import qualified Data.Map as M
 import Data.Maybe (fromMaybe)
 import Lens.Micro ((^.), (&), (.~), (%~), (+~))
@@ -42,10 +43,10 @@ finishGoalieEntry s = s & progMode.gameStateL.gameGoaliesRecorded
 recordGoalieStats :: ProgState -> ProgState
 recordGoalieStats s = fromMaybe s $ do
   let gs = s^.progMode.gameStateL
-  gid    <- gs^.gameSelectedGoalie
+  gid   <- gs^.gameSelectedGoalie
-  goalie <- nth gid $ s^.database.dbGoalies
+  mins  <- gs^.gameGoalieMinsPlayed
-  mins   <- gs^.gameGoalieMinsPlayed
+  goals <- gs^.gameGoalsAllowed
-  goals  <- gs^.gameGoalsAllowed
+  void $ nth gid $ s^.database.dbGoalies
 
   let
     gameStats = M.findWithDefault newGoalieStats gid $ gs^.gameGoalieStats

src/Mtlstats/Control.hs

@@ -21,25 +21,20 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 module Mtlstats.Control (dispatch) where
 
-import Control.Monad (join, when)
+import Control.Monad (join)
-import Control.Monad.Extra (ifM)
 import Control.Monad.Trans.State (gets, modify)
-import Data.Char (toUpper)
+import Data.Maybe (fromJust)
-import Data.Maybe (fromJust, fromMaybe, isJust)
+import Lens.Micro ((^.))
-import Lens.Micro ((^.), (.~), (%~))
 import Lens.Micro.Extras (view)
 import qualified UI.NCurses as C
 
 import Mtlstats.Actions
 import Mtlstats.Control.EditPlayer
 import Mtlstats.Control.NewGame
-import Mtlstats.Format
 import Mtlstats.Handlers
 import Mtlstats.Menu
 import Mtlstats.Prompt
-import Mtlstats.Report
 import Mtlstats.Types
-import Mtlstats.Util
 
 -- | Reads the program state and returs the apropriate controller to
 -- run

src/Mtlstats/Prompt.hs

@@ -46,15 +46,13 @@ import Control.Monad.Extra (whenJust)
 import Control.Monad.Trans.State (gets, modify)
 import Data.Char (isDigit, toUpper)
 import Data.Foldable (forM_)
-import Data.Maybe (fromMaybe)
+import Lens.Micro ((^.), (&), (.~), (?~))
-import Lens.Micro ((^.), (&), (.~), (?~), (%~))
 import Lens.Micro.Extras (view)
 import Text.Read (readMaybe)
 import qualified UI.NCurses as C
 
 import Mtlstats.Actions
 import Mtlstats.Config
-import Mtlstats.Format
 import Mtlstats.Types
 import Mtlstats.Util
 

src/Mtlstats/Prompt/NewGame/GoalieInput.hs

@@ -27,13 +27,10 @@ module Mtlstats.Prompt.NewGame.GoalieInput
   , goalsAllowedPrompt
   ) where
 
-import Control.Monad (when)
+import Control.Monad.Trans.State (modify)
-import Control.Monad.Trans.State (gets, modify)
+import Lens.Micro ((?~))
-import Data.Maybe (fromMaybe)
-import Lens.Micro ((^.), (.~), (?~))
 
 import Mtlstats.Actions.NewGame.GoalieInput
-import Mtlstats.Config
 import Mtlstats.Prompt
 import Mtlstats.Types
 

src/Mtlstats/Types/Menu.hs

@@ -38,7 +38,6 @@ module Mtlstats.Types.Menu (
 
 import Lens.Micro ((^.))
 import Lens.Micro.TH (makeLenses)
-import qualified UI.NCurses as C
 
 import Mtlstats.Types
 

test/Actions/NewGameSpec.hs

@@ -46,6 +46,7 @@ spec = describe "NewGame" $ do
   assignPMinsSpec
   GoalieInput.spec
 
+overtimeCheckSpec :: Spec
 overtimeCheckSpec = describe "overtimeCheck" $ do
 
   context "tie game" $ do

test/ActionsSpec.hs

@@ -24,16 +24,12 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 module ActionsSpec (spec) where
 
 import Control.Monad (replicateM)
-import qualified Data.Map as M
+import Lens.Micro ((^.), (&), (.~), (?~))
-import Data.Maybe (fromJust)
-import Lens.Micro ((^.), (&), (.~), (?~), (%~))
-import System.Random (randomRIO)
 import Test.Hspec
   ( Spec
   , context
   , describe
   , it
-  , runIO
   , shouldBe
   , shouldNotBe
   , shouldSatisfy
@@ -41,7 +37,6 @@ import Test.Hspec
 
 import Mtlstats.Actions
 import Mtlstats.Types
-import Mtlstats.Util
 
 import qualified Actions.NewGameSpec as NewGame
 import qualified TypesSpec as TS

test/ReportSpec.hs

@@ -21,7 +21,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 module ReportSpec (spec) where
 
-import Lens.Micro ((&), (?~), (%~))
+import Lens.Micro ((&), (?~))
 import Test.Hspec (Spec, context, describe, it, shouldBe)
 
 import Mtlstats.Report

test/TypesSpec.hs

@@ -33,7 +33,6 @@ module TypesSpec
 import Control.Monad (replicateM)
 import Data.Aeson (FromJSON, ToJSON, decode, encode, toJSON)
 import Data.Aeson.Types (Value (Object))
-import Data.ByteString.Lazy (ByteString)
 import qualified Data.HashMap.Strict as HM
 import Lens.Micro (Lens', (&), (^.), (.~), (?~))
 import System.Random (randomRIO)