Fix ghc-8.0.1 warnings

borsboom · borsboom · commit c7920f655231 · 2016-08-07T06:30:03.000-07:00
diff --git a/Setup.hs b/Setup.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}
 module Main (main) where
 
 import Data.List ( nub, sortBy )
diff --git a/src/Stack/Setup.hs b/src/Stack/Setup.hs
@@ -645,7 +645,7 @@ getInstalledGhcjs installed goodVersion =
     goodPackage (ToolGhcjs cv) = if goodVersion cv then Just cv else Nothing
     goodPackage _ = Nothing
 
-downloadAndInstallTool :: (MonadIO m, MonadMask m, MonadLogger m, MonadReader env m, HasConfig env, HasHttpManager env, MonadBaseControl IO m)
+downloadAndInstallTool :: (MonadIO m, MonadMask m, MonadLogger m, MonadReader env m, HasHttpManager env, MonadBaseControl IO m)
                        => Path Abs Dir
                        -> SetupInfo
                        -> DownloadInfo
@@ -755,7 +755,7 @@ getOSKey platform =
         Platform arch os -> throwM $ UnsupportedSetupCombo os arch
 
 downloadFromInfo
-    :: (MonadIO m, MonadMask m, MonadLogger m, MonadReader env m, HasConfig env, HasHttpManager env, MonadBaseControl IO m)
+    :: (MonadIO m, MonadMask m, MonadLogger m, MonadReader env m, HasHttpManager env, MonadBaseControl IO m)
     => Path Abs Dir -> DownloadInfo -> Tool -> m (Path Abs File, ArchiveType)
 downloadFromInfo programsDir downloadInfo tool = do
     at <-
diff --git a/src/Text/PrettyPrint/Leijen/Extended.hs b/src/Text/PrettyPrint/Leijen/Extended.hs
@@ -226,7 +226,7 @@ displayAnsi :: (Display a, HasAnsiAnn (Ann a)) => a -> T.Text
 displayAnsi = LT.toStrict . displayAnsiSimple . renderDefault . toAnsiDoc . display
 
 hDisplayAnsi
-    :: (Display a, HasAnsiAnn (Ann a), MonadIO m, MonadReader env m)
+    :: (Display a, HasAnsiAnn (Ann a), MonadIO m)
     => Handle -> a -> m ()
 hDisplayAnsi h x = liftIO $ do
     useAnsi <- hSupportsANSI h

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+{-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}`
`1`	`2`	`module Main (main) where`
`2`	`3`
`3`	`4`	`import Data.List ( nub, sortBy )`