diff options
author | Sylvain Henry <sylvain@haskus.fr> | 2021-05-06 22:22:02 +0200 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-05-12 21:41:44 -0400 |
commit | 0ef119071347f7bc14f0fa89904b0cfd0b230ac1 (patch) | |
tree | 7a80b3942ae6bd18391f9b924ad55bb001392288 /compiler/GHC/Rename | |
parent | bfabf94f63b6644bd32982fd13ea0c8bca9aeae4 (diff) | |
download | haskell-0ef119071347f7bc14f0fa89904b0cfd0b230ac1.tar.gz |
Fully remove HsVersions.h
Replace uses of WARN macro with calls to:
warnPprTrace :: Bool -> SDoc -> a -> a
Remove the now unused HsVersions.h
Bump haddock submodule
Diffstat (limited to 'compiler/GHC/Rename')
-rw-r--r-- | compiler/GHC/Rename/Env.hs | 2 | ||||
-rw-r--r-- | compiler/GHC/Rename/Expr.hs | 2 | ||||
-rw-r--r-- | compiler/GHC/Rename/HsType.hs | 2 | ||||
-rw-r--r-- | compiler/GHC/Rename/Module.hs | 2 | ||||
-rw-r--r-- | compiler/GHC/Rename/Names.hs | 4 | ||||
-rw-r--r-- | compiler/GHC/Rename/Pat.hs | 2 | ||||
-rw-r--r-- | compiler/GHC/Rename/Splice.hs | 2 |
7 files changed, 1 insertions, 15 deletions
diff --git a/compiler/GHC/Rename/Env.hs b/compiler/GHC/Rename/Env.hs index 2425a253a5..9a4f22979e 100644 --- a/compiler/GHC/Rename/Env.hs +++ b/compiler/GHC/Rename/Env.hs @@ -55,8 +55,6 @@ module GHC.Rename.Env ( ) where -#include "HsVersions.h" - import GHC.Prelude import GHC.Iface.Load ( loadInterfaceForName, loadSrcInterface_maybe ) diff --git a/compiler/GHC/Rename/Expr.hs b/compiler/GHC/Rename/Expr.hs index 3d27e77ea5..e1b68e2504 100644 --- a/compiler/GHC/Rename/Expr.hs +++ b/compiler/GHC/Rename/Expr.hs @@ -25,8 +25,6 @@ module GHC.Rename.Expr ( AnnoBody ) where -#include "HsVersions.h" - import GHC.Prelude import GHC.Rename.Bind ( rnLocalBindsAndThen, rnLocalValBindsLHS, rnLocalValBindsRHS diff --git a/compiler/GHC/Rename/HsType.hs b/compiler/GHC/Rename/HsType.hs index c827b92a45..268e6418cf 100644 --- a/compiler/GHC/Rename/HsType.hs +++ b/compiler/GHC/Rename/HsType.hs @@ -77,8 +77,6 @@ import qualified Data.List.NonEmpty as NE import Data.List.NonEmpty (NonEmpty(..)) import Control.Monad -#include "HsVersions.h" - {- These type renamers are in a separate module, rather than in (say) GHC.Rename.Module, to break several loops. diff --git a/compiler/GHC/Rename/Module.hs b/compiler/GHC/Rename/Module.hs index 1a5fcedf8f..0e536b7461 100644 --- a/compiler/GHC/Rename/Module.hs +++ b/compiler/GHC/Rename/Module.hs @@ -16,8 +16,6 @@ module GHC.Rename.Module ( rnSrcDecls, addTcgDUs, findSplice ) where -#include "HsVersions.h" - import GHC.Prelude import {-# SOURCE #-} GHC.Rename.Expr( rnLExpr ) diff --git a/compiler/GHC/Rename/Names.hs b/compiler/GHC/Rename/Names.hs index 40853a16e2..f4bde99be0 100644 --- a/compiler/GHC/Rename/Names.hs +++ b/compiler/GHC/Rename/Names.hs @@ -30,8 +30,6 @@ module GHC.Rename.Names ( ImportDeclUsage ) where -#include "HsVersions.h" - import GHC.Prelude import GHC.Driver.Env @@ -341,7 +339,7 @@ rnImportDecl this_mod -- Compiler sanity check: if the import didn't say -- {-# SOURCE #-} we should not get a hi-boot file - WARN( (want_boot == NotBoot) && (mi_boot iface == IsBoot), ppr imp_mod_name ) do + warnPprTrace ((want_boot == NotBoot) && (mi_boot iface == IsBoot)) (ppr imp_mod_name) $ do -- Issue a user warning for a redundant {- SOURCE -} import -- NB that we arrange to read all the ordinary imports before diff --git a/compiler/GHC/Rename/Pat.hs b/compiler/GHC/Rename/Pat.hs index 5934f36f54..0d14420be4 100644 --- a/compiler/GHC/Rename/Pat.hs +++ b/compiler/GHC/Rename/Pat.hs @@ -49,8 +49,6 @@ import GHC.Prelude import {-# SOURCE #-} GHC.Rename.Expr ( rnLExpr ) import {-# SOURCE #-} GHC.Rename.Splice ( rnSplicePat ) -#include "HsVersions.h" - import GHC.Hs import GHC.Tc.Utils.Monad import GHC.Tc.Utils.Zonk ( hsOverLitName ) diff --git a/compiler/GHC/Rename/Splice.hs b/compiler/GHC/Rename/Splice.hs index f3bab6c3fe..4027c89e79 100644 --- a/compiler/GHC/Rename/Splice.hs +++ b/compiler/GHC/Rename/Splice.hs @@ -11,8 +11,6 @@ module GHC.Rename.Splice ( , traceSplice, SpliceInfo(..) ) where -#include "HsVersions.h" - import GHC.Prelude import GHC.Types.Name |