From 544d3515eeef0d9c2727416ca1b5c3ac23c19265 Mon Sep 17 00:00:00 2001
From: "Paolo G. Giarrusso" <p.giarrusso@gmail.com>
Date: Thu, 4 Aug 2016 16:05:14 +0200
Subject: [PATCH] Fix GHC 8 warnings from -Wredundant-constraints

See #2439.
---
 src/Stack/Build/Cache.hs         | 6 +++---
 src/Stack/Build/ConstructPlan.hs | 2 +-
 src/Stack/Ghci.hs                | 4 ++--
 src/Stack/New.hs                 | 2 +-
 src/Stack/Types/StackT.hs        | 2 +-
 src/test/Stack/StoreSpec.hs      | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Stack/Build/Cache.hs b/src/Stack/Build/Cache.hs
index 6014e412d2..34fbbe42d7 100644
--- a/src/Stack/Build/Cache.hs
+++ b/src/Stack/Build/Cache.hs
@@ -114,7 +114,7 @@ instance Store BuildCache
 instance NFData BuildCache
 
 -- | Try to read the dirtiness cache for the given package directory.
-tryGetBuildCache :: (MonadIO m, MonadReader env m, HasConfig env, MonadThrow m, MonadLogger m, HasEnvConfig env, MonadBaseControl IO m)
+tryGetBuildCache :: (MonadIO m, MonadReader env m, MonadThrow m, MonadLogger m, HasEnvConfig env, MonadBaseControl IO m)
                  => Path Abs Dir -> m (Maybe (Map FilePath FileCacheInfo))
 tryGetBuildCache = liftM (fmap buildCacheTimes) . tryGetCache buildCacheFile
 
@@ -174,7 +174,7 @@ deleteCaches dir = do
     ignoringAbsence (removeFile cfp)
 
 -- | Write to a cache.
-writeCache :: (Store a, NFData a, HasTypeHash a, Eq a, MonadIO m, MonadLogger m)
+writeCache :: (Store a, HasTypeHash a, Eq a, MonadIO m, MonadLogger m)
            => Path Abs Dir
            -> (Path Abs Dir -> m (Path Abs File))
            -> a
@@ -202,7 +202,7 @@ tryGetFlagCache gid = do
     fp <- flagCacheFile gid
     decodeFileMaybe fp
 
-writeFlagCache :: (MonadIO m, MonadReader env m, HasEnvConfig env, MonadThrow m, MonadLogger m, MonadBaseControl IO m)
+writeFlagCache :: (MonadIO m, MonadReader env m, HasEnvConfig env, MonadThrow m, MonadLogger m)
                => Installed
                -> ConfigCache
                -> m ()
diff --git a/src/Stack/Build/ConstructPlan.hs b/src/Stack/Build/ConstructPlan.hs
index c73eec2920..a77a34950f 100644
--- a/src/Stack/Build/ConstructPlan.hs
+++ b/src/Stack/Build/ConstructPlan.hs
@@ -124,7 +124,7 @@ instance HasEnvConfig Ctx where
     getEnvConfig = ctxEnvConfig
 
 constructPlan :: forall env m.
-                 (MonadCatch m, MonadReader env m, HasEnvConfig env, MonadIO m, MonadLoggerIO m, MonadBaseControl IO m, HasHttpManager env)
+                 (MonadCatch m, MonadReader env m, HasEnvConfig env, MonadLoggerIO m, MonadBaseControl IO m, HasHttpManager env)
               => MiniBuildPlan
               -> BaseConfigOpts
               -> [LocalPackage]
diff --git a/src/Stack/Ghci.hs b/src/Stack/Ghci.hs
index bb036524c3..93669c8863 100644
--- a/src/Stack/Ghci.hs
+++ b/src/Stack/Ghci.hs
@@ -111,7 +111,7 @@ instance Show GhciException where
 -- given options and configure it with the load paths and extensions
 -- of those targets.
 ghci
-    :: (HasBuildConfig r, HasHttpManager r, MonadMask m, HasLogLevel r, HasTerminal r, HasEnvConfig r, MonadReader r m, MonadIO m, MonadLoggerIO m, MonadBaseUnlift IO m)
+    :: (HasBuildConfig r, HasHttpManager r, MonadMask m, HasLogLevel r, HasTerminal r, HasEnvConfig r, MonadReader r m, MonadLoggerIO m, MonadBaseUnlift IO m)
     => GhciOpts -> m ()
 ghci opts@GhciOpts{..} = do
     bopts <- asks (configBuild . getConfig)
@@ -276,7 +276,7 @@ figureOutMainFile bopts mainIsTargets targets0 packages =
 -- | Create a list of infos for each target containing necessary
 -- information to load that package/components.
 ghciSetup
-    :: (HasHttpManager r, HasBuildConfig r, MonadMask m, HasTerminal r, HasLogLevel r, HasEnvConfig r, MonadReader r m, MonadIO m, MonadLoggerIO m, MonadBaseUnlift IO m)
+    :: (HasHttpManager r, HasBuildConfig r, MonadMask m, HasTerminal r, HasLogLevel r, HasEnvConfig r, MonadReader r m, MonadLoggerIO m, MonadBaseUnlift IO m)
     => GhciOpts
     -> m (Map PackageName SimpleTarget, Maybe (Map PackageName SimpleTarget), [GhciPkgInfo])
 ghciSetup GhciOpts{..} = do
diff --git a/src/Stack/New.hs b/src/Stack/New.hs
index 12b25d7184..fa4c26a8d6 100644
--- a/src/Stack/New.hs
+++ b/src/Stack/New.hs
@@ -129,7 +129,7 @@ data TemplateFrom = LocalTemp | RemoteTemp
 -- | Download and read in a template's text content.
 loadTemplate
     :: forall m r.
-       (HasConfig r, HasHttpManager r, MonadReader r m, MonadIO m, MonadThrow m, MonadCatch m, MonadLogger m)
+       (HasConfig r, HasHttpManager r, MonadReader r m, MonadIO m, MonadCatch m, MonadLogger m)
     => TemplateName -> (TemplateFrom -> m ()) -> m Text
 loadTemplate name logIt = do
     templateDir <- asks (templatesDir . getConfig)
diff --git a/src/Stack/Types/StackT.hs b/src/Stack/Types/StackT.hs
index a77354f515..033a144831 100644
--- a/src/Stack/Types/StackT.hs
+++ b/src/Stack/Types/StackT.hs
@@ -227,7 +227,7 @@ stickyLoggerFunc loc src level msg = do
     liftIO $ func loc src level msg
 
 getStickyLoggerFunc
-    :: (HasSticky r, HasLogLevel r, HasSupportsUnicode r, ToLogStr msg, MonadReader r m, MonadIO m)
+    :: (HasSticky r, HasLogLevel r, HasSupportsUnicode r, ToLogStr msg, MonadReader r m)
     => m (Loc -> LogSource -> LogLevel -> msg -> IO ())
 getStickyLoggerFunc = do
     sticky <- asks getSticky
diff --git a/src/test/Stack/StoreSpec.hs b/src/test/Stack/StoreSpec.hs
index 8e1c17b986..f022bd49e7 100644
--- a/src/test/Stack/StoreSpec.hs
+++ b/src/test/Stack/StoreSpec.hs
@@ -45,7 +45,7 @@ instance Monad m => Serial m BS.ByteString where
 instance (Monad m, Serial m a, Ord a) => Serial m (Set a) where
     series = fmap setFromList series
 
-addMinAndMaxBounds :: forall a. (Bounded a, Eq a, Num a) => [a] -> [a]
+addMinAndMaxBounds :: forall a. (Bounded a, Eq a) => [a] -> [a]
 addMinAndMaxBounds xs =
     (if (minBound :: a) `notElem` xs then [minBound] else []) ++
     (if (maxBound :: a) `notElem` xs && (maxBound :: a) /= minBound then maxBound : xs else xs)