From 8edc70fef3f3a54238d981153a6ac42b2d7f0bde Mon Sep 17 00:00:00 2001
From: Alec Theriault <alec.theriault@gmail.com>
Date: Sat, 28 Mar 2020 13:12:50 -0400
Subject: Cleanup up GHC flags in `.cabal` files

  * enable more useful warning flags in `haddock-api`, handle the new
    warnings generated

  * remove `-fwarn-tabs` (now we'd use `-Wtabs`, but this has been in
    `-Wall` for a while now)
---
 haddock-api/haddock-api.cabal                   | 12 ++++++++----
 haddock-api/src/Haddock/Interface/Specialize.hs |  2 +-
 haddock-api/src/Haddock/InterfaceFile.hs        |  2 +-
 haddock-library/haddock-library.cabal           |  2 +-
 haddock.cabal                                   |  2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal
index 54255e09..4abfd984 100644
--- a/haddock-api/haddock-api.cabal
+++ b/haddock-api/haddock-api.cabal
@@ -63,10 +63,14 @@ library
 
   hs-source-dirs: src
 
-  ghc-options: -funbox-strict-fields -Wall -fwarn-tabs -O2
-  ghc-options: -Wall
-  if impl(ghc >= 8.0)
-    ghc-options: -Wcompat -Wnoncanonical-monad-instances
+  ghc-options: -funbox-strict-fields -O2
+               -Wall
+               -Wcompat
+               -Widentities
+               -Wredundant-constraints
+               -Wnoncanonical-monad-instances
+               -Wmissing-home-modules
+
 
   exposed-modules:
     Documentation.Haddock
diff --git a/haddock-api/src/Haddock/Interface/Specialize.hs b/haddock-api/src/Haddock/Interface/Specialize.hs
index 19b03596..492818bd 100644
--- a/haddock-api/src/Haddock/Interface/Specialize.hs
+++ b/haddock-api/src/Haddock/Interface/Specialize.hs
@@ -295,7 +295,7 @@ renameBinder (KindedTyVar x lname lkind) =
 renameBinder (XTyVarBndr nec) = noExtCon nec
 
 -- | Core renaming logic.
-renameName :: (Eq name, SetName name) => name -> Rename name name
+renameName :: SetName name => name -> Rename name name
 renameName name = do
     RenameEnv { .. } <- get
     case Map.lookup (getName name) rneCtx of
diff --git a/haddock-api/src/Haddock/InterfaceFile.hs b/haddock-api/src/Haddock/InterfaceFile.hs
index 7b0f29f4..cb60fb00 100644
--- a/haddock-api/src/Haddock/InterfaceFile.hs
+++ b/haddock-api/src/Haddock/InterfaceFile.hs
@@ -158,7 +158,7 @@ writeInterfaceFile filename iface = do
 type NameCacheAccessor m = (m NameCache, NameCache -> m ())
 
 
-nameCacheFromGhc :: forall m. (GhcMonad m, MonadIO m) => NameCacheAccessor m
+nameCacheFromGhc :: GhcMonad m => NameCacheAccessor m
 nameCacheFromGhc = ( read_from_session , write_to_session )
   where
     read_from_session = do
diff --git a/haddock-library/haddock-library.cabal b/haddock-library/haddock-library.cabal
index 1a06d0e5..24ca920f 100644
--- a/haddock-library/haddock-library.cabal
+++ b/haddock-library/haddock-library.cabal
@@ -44,7 +44,7 @@ common lib-defaults
     , text         ^>= 1.2.3.0
     , parsec       ^>= 3.1.13.0
 
-  ghc-options: -funbox-strict-fields -Wall -fwarn-tabs
+  ghc-options: -funbox-strict-fields -Wall
   if impl(ghc >= 8.0)
     ghc-options: -Wcompat -Wnoncanonical-monad-instances
 
diff --git a/haddock.cabal b/haddock.cabal
index f01fe8fc..1d6ad180 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -62,7 +62,7 @@ executable haddock
   default-language:     Haskell2010
   main-is:              Main.hs
   hs-source-dirs:       driver
-  ghc-options:          -funbox-strict-fields -Wall -fwarn-tabs -O2 -threaded
+  ghc-options:          -funbox-strict-fields -Wall -O2 -threaded
 
   -- haddock typically only supports a single GHC major version
   build-depends:
-- 
cgit v1.2.3