Don't import FastString in HsVersions.h

Modules that need it import it themselves instead.

compiler/HsVersions.h

@@ -60,21 +60,12 @@ name = Util.global (value);
 #define WARN(e,msg)    if False && (e) then pprPanic "WARN" (msg) else
 #endif
 
--- This conditional lets us switch off the "import FastString"
--- when compiling FastString itself, or when compiling modules that
--- don't use it (and would otherwise get warnings, which we treat
--- as errors). Can we do this more nicely?
-#if !defined(COMPILING_FAST_STRING) && !defined(FAST_STRING_NOT_NEEDED)
--- 
-import qualified FastString as FS 
-#endif
-
 #if defined(__GLASGOW_HASKELL__)
-#define SLIT(x)	 (FS.mkLitString# (x#))
-#define FSLIT(x) (FS.mkFastString# (x#))
+#define SLIT(x)	 (FastString.mkLitString# (x#))
+#define FSLIT(x) (FastString.mkFastString# (x#))
 #else
-#define SLIT(x)  (FS.mkLitString (x))
-#define FSLIT(x) (FS.mkFastString (x))
+#define SLIT(x)  (FastString.mkLitString (x))
+#define FSLIT(x) (FastString.mkFastString (x))
 #endif
 
 -- Useful for declaring arguments to be strict

compiler/basicTypes/BasicTypes.lhs

@@ -58,7 +58,7 @@ module BasicTypes(
 
 #include "HsVersions.h"
 
-import FastString( FastString )
+import FastString
 import Outputable
 \end{code}
 

compiler/basicTypes/IdInfo.lhs

@@ -92,6 +92,7 @@ import ForeignCall
 import NewDemand
 import Outputable	
 import Module
+import FastString
 
 import Data.Maybe
 

compiler/basicTypes/NameEnv.lhs

@@ -16,8 +16,6 @@ module NameEnv (
 	elemNameEnv, mapNameEnv
     ) where
 
--- XXX This define is a bit of a hack, and should be done more nicely
-#define FAST_STRING_NOT_NEEDED 1
 #include "HsVersions.h"
 
 import Name

compiler/basicTypes/NameSet.lhs

@@ -22,8 +22,6 @@ module NameSet (
 	findUses, duDefs, duUses, allUses
     ) where
 
--- XXX This define is a bit of a hack, and should be done more nicely
-#define FAST_STRING_NOT_NEEDED 1
 #include "HsVersions.h"
 
 import Name

compiler/basicTypes/NewDemand.lhs

@@ -23,8 +23,6 @@ module NewDemand(
 	pprIfaceStrictSig, appIsBottom, isBottomingSig, seqStrictSig,
      ) where
 
--- XXX This define is a bit of a hack, and should be done more nicely
-#define FAST_STRING_NOT_NEEDED 1
 #include "HsVersions.h"
 
 import StaticFlags

compiler/basicTypes/VarEnv.lhs

@@ -46,6 +46,7 @@ import Maybes
 import Outputable
 import FastTypes
 import StaticFlags
+import FastString
 \end{code}
 
 

compiler/basicTypes/VarSet.lhs

@@ -17,8 +17,6 @@ module VarSet (
 	elemVarSetByKey
     ) where
 
--- XXX This define is a bit of a hack, and should be done more nicely
-#define FAST_STRING_NOT_NEEDED 1
 #include "HsVersions.h"
 
 import Var

compiler/cmm/CmmCPSGen.hs

@@ -33,6 +33,7 @@ import StaticFlags
 import Unique
 import Maybe
 import List
+import FastString
 
 import Panic
 

compiler/cmm/CmmInfo.hs

@@ -276,6 +276,3 @@ mkStdInfoTable type_descr closure_descr cl_type srt_len layout_lit
 
     type_lit = packHalfWordsCLit cl_type srt_len
 
-
-_unused :: FS.FastString -- stops a warning
-_unused = undefined

compiler/cmm/CmmLint.hs

@@ -27,6 +27,7 @@ import Outputable
 import PprCmm
 import Unique
 import Constants
+import FastString
 
 import Control.Monad
 

compiler/cmm/CmmOpt.hs

@@ -574,5 +574,3 @@ isComparisonExpr _other 	    = False
 isPicReg (CmmReg (CmmGlobal PicBaseReg)) = True
 isPicReg _ = False
 
-_unused :: FS.FastString -- stops a warning
-_unused = undefined

compiler/cmm/MachOp.hs

@@ -90,6 +90,7 @@ module MachOp 	(
 
 import Constants
 import Outputable
+import FastString
 
 -- -----------------------------------------------------------------------------
 -- MachRep

compiler/cmm/MkZipCfg.hs

@@ -360,5 +360,3 @@ Emitting a Branch at this point is fine:
 freshBlockId :: String -> UniqSM BlockId
 freshBlockId _ = do { u <- getUniqueUs; return $ BlockId u }
 
-_unused :: FS.FastString
-_unused = undefined

compiler/cmm/OptimizationFuel.hs

@@ -48,11 +48,6 @@ oneLessFuel f = f
 diffFuel _ _ = 0
 #endif
 
--- stop warnings about things that aren't used
-_unused :: {-State#-} () -> FS.FastString
-_unused = undefined panic
-
-
 data FuelState = FuelState { fs_fuellimit :: OptimizationFuel, fs_lastpass :: String }
 newtype FuelMonad a = FuelMonad (FuelState -> (a, FuelState))
 

compiler/cmm/ZipCfg.hs

@@ -707,5 +707,3 @@ pprGraph (Graph tail blockenv) =
     where pprBlock (Block id tail) = ppr id <> colon $$ ppr tail
           blocks = postorder_dfs_from blockenv tail
 
-_unused :: FS.FastString
-_unused = undefined

compiler/cmm/ZipDataflow0.hs

@@ -1088,10 +1088,6 @@ subAnalysis' m =
   where pprFacts env = nest 2 $ vcat $ map pprFact $ ufmToList env
         pprFact (id, a) = hang (ppr id <> colon) 4 (ppr a)
 
-
-_unused :: FS.FastString
-_unused = undefined
-
 null_b_ft = BComp "do nothing" Nothing no2 no2 no2
     where no2 _ _ = Nothing
 

compiler/codeGen/CgBindery.lhs

@@ -62,6 +62,7 @@ import StgSyn
 import Unique
 import UniqSet
 import Outputable
+import FastString
 
 \end{code}
 

compiler/codeGen/CgCon.lhs

@@ -52,6 +52,7 @@ import PrelInfo
 import Outputable
 import ListSetOps
 import Util
+import FastString
 \end{code}
 
 

compiler/codeGen/CgForeignCall.hs

@@ -43,6 +43,7 @@ import ClosureInfo
 import Constants
 import StaticFlags
 import Outputable
+import FastString
 
 import Control.Monad
 

compiler/codeGen/CgHeapery.lhs

@@ -52,6 +52,7 @@ import Util
 import Constants
 import PackageConfig
 import Outputable
+import FastString
 
 import Data.List
 \end{code}

compiler/codeGen/CgPrimOp.hs

@@ -35,6 +35,7 @@ import PrimOp
 import SMRep
 import Constants
 import Outputable
+import FastString
 
 -- ---------------------------------------------------------------------------
 -- Code generation for PrimOps

compiler/codeGen/CgTailCall.lhs

@@ -474,8 +474,3 @@ adjustSpAndHp newRealSp
 	}
 \end{code}
 
-Some things are unused.
-\begin{code}
-_unused :: FS.FastString
-_unused = undefined
-\end{code}

compiler/codeGen/SMRep.lhs

@@ -53,6 +53,7 @@ import MachOp
 import StaticFlags
 import Constants
 import Outputable
+import FastString
 
 import Data.Word
 \end{code}

compiler/coreSyn/CoreFVs.lhs

@@ -30,8 +30,6 @@ module CoreFVs (
 	freeVarsOf		-- CoreExprWithFVs -> IdSet
     ) where
 
--- XXX This define is a bit of a hack, and should be done more nicely
-#define FAST_STRING_NOT_NEEDED 1
 #include "HsVersions.h"
 
 import CoreSyn

compiler/coreSyn/CoreLint.lhs

@@ -39,6 +39,7 @@ import StaticFlags
 import ListSetOps
 import DynFlags
 import Outputable
+import FastString
 import Util
 import Data.Maybe
 \end{code}

compiler/coreSyn/CorePrep.lhs

@@ -35,6 +35,7 @@ import DynFlags
 import Util
 import Outputable
 import MonadUtils
+import FastString
 \end{code}
 
 -- ---------------------------------------------------------------------------

compiler/coreSyn/CoreSubst.lhs

@@ -43,6 +43,7 @@ import UniqSupply
 import Maybes
 import Outputable
 import PprCore		()		-- Instances
+import FastString
 
 import Data.List
 \end{code}

compiler/coreSyn/CoreTidy.lhs

@@ -11,8 +11,6 @@ module CoreTidy (
 	tidyExpr, tidyVarOcc, tidyRule, tidyRules 
     ) where
 
--- XXX This define is a bit of a hack, and should be done more nicely
-#define FAST_STRING_NOT_NEEDED 1
 #include "HsVersions.h"
 
 import CoreSyn

compiler/coreSyn/CoreUnfold.lhs

@@ -48,6 +48,7 @@ import Type
 import PrelNames
 import Bag
 import FastTypes
+import FastString
 import Outputable
 
 \end{code}

compiler/deSugar/DsGRHSs.lhs

@@ -15,8 +15,6 @@ Matching guarded right-hand-sides (GRHSs)
 
 module DsGRHSs ( dsGuarded, dsGRHSs ) where
 
--- XXX This define is a bit of a hack, and should be done more nicely
-#define FAST_STRING_NOT_NEEDED 1
 #include "HsVersions.h"
 
 import {-# SOURCE #-} DsExpr  ( dsLExpr, dsLocalBinds )

compiler/deSugar/DsListComp.lhs

@@ -15,8 +15,6 @@ Desugaring list comprehensions and array comprehensions
 
 module DsListComp ( dsListComp, dsPArrComp ) where
 
--- XXX This define is a bit of a hack, and should be done more nicely
-#define FAST_STRING_NOT_NEEDED 1
 #include "HsVersions.h"
 
 import {-# SOURCE #-} DsExpr ( dsLExpr, dsLocalBinds )

compiler/deSugar/DsMonad.lhs

@@ -59,6 +59,7 @@ import OccName
 import DynFlags
 import ErrUtils
 import MonadUtils
+import FastString
 
 import Data.IORef
 \end{code}

compiler/deSugar/Match.lhs

@@ -43,6 +43,7 @@ import Maybes
 import Util
 import Name
 import Outputable
+import FastString
 \end{code}
 
 This function is a wrapper of @match@, it must be called from all the parts where 

compiler/deSugar/MatchCon.lhs

@@ -15,8 +15,6 @@ Pattern-matching constructors
 
 module MatchCon ( matchConFamily ) where
 
--- XXX This define is a bit of a hack, and should be done more nicely
-#define FAST_STRING_NOT_NEEDED 1
 #include "HsVersions.h"
 
 import {-# SOURCE #-} Match	( match )

compiler/ghci/RtClosureInspect.hs

@@ -68,6 +68,7 @@ import PrelNames
 import TysWiredIn
 
 import Outputable
+import FastString
 import Panic
 
 #ifndef GHCI_TABLES_NEXT_TO_CODE

compiler/hsSyn/HsBinds.lhs

@@ -35,6 +35,7 @@ import SrcLoc
 import Util
 import Var
 import Bag
+import FastString
 \end{code}
 
 %************************************************************************

compiler/hsSyn/HsDoc.hs

@@ -6,8 +6,6 @@ module HsDoc (
   ppr_mbDoc
   ) where
 
--- XXX This define is a bit of a hack, and should be done more nicely
-#define FAST_STRING_NOT_NEEDED 1
 #include "HsVersions.h"
 
 import Outputable

compiler/hsSyn/HsSyn.lhs

@@ -46,6 +46,7 @@ import IfaceSyn		( IfaceBinding )
 import Outputable
 import SrcLoc		( Located(..) )
 import Module		( Module, ModuleName )
+import FastString
 \end{code}
 
 All we actually declare here is the top-level structure for a module.

compiler/hsSyn/HsTypes.lhs

@@ -38,6 +38,7 @@ import BasicTypes
 import SrcLoc
 import StaticFlags
 import Outputable
+import FastString
 \end{code}
 
 

compiler/iface/LoadIface.lhs

@@ -58,6 +58,7 @@ import Outputable
 import BinIface
 import Panic
 import Util
+import FastString
 
 import Control.Monad
 import Data.List

compiler/iface/TcIface.lhs

@@ -58,8 +58,9 @@ import Maybes
 import SrcLoc
 import DynFlags
 import Util
-import Control.Monad
+import FastString
 
+import Control.Monad
 import Data.List
 import Data.Maybe
 \end{code}

compiler/main/CmdLineParser.hs

@@ -14,8 +14,6 @@ module CmdLineParser (
         CmdLineP(..), getCmdLineState, putCmdLineState
   ) where
 
--- XXX This define is a bit of a hack, and should be done more nicely
-#define FAST_STRING_NOT_NEEDED 1
 #include "HsVersions.h"
 
 import Util

compiler/main/Constants.lhs

@@ -13,8 +13,6 @@ import Data.Bits (shiftL)
 -- we want; if we just hope a -I... will get the right one, we could
 -- be in trouble.
 
--- XXX This define is a bit of a hack, and should be done more nicely
-#define FAST_STRING_NOT_NEEDED 1
 #include "HsVersions.h"
 #include "../includes/MachRegs.h"
 #include "../includes/Constants.h"

compiler/main/DriverMkDepend.hs

@@ -35,6 +35,7 @@ import Panic
 import SrcLoc
 import Data.List
 import CmdLineParser
+import FastString
 
 import ErrUtils         ( debugTraceMsg, putMsg )
 

compiler/main/DriverPipeline.hs

@@ -45,6 +45,7 @@ import Maybes		( expectJust )
 import ParserCoreUtils	( getCoreModuleName )
 import SrcLoc		( unLoc )
 import SrcLoc		( Located(..) )
+import FastString
 
 import Control.Exception as Exception
 import Data.IORef	( readIORef, writeIORef, IORef )

compiler/main/DynFlags.hs

@@ -60,8 +60,6 @@ module DynFlags (
     compilerInfo,
   ) where
 
--- XXX This define is a bit of a hack, and should be done more nicely
-#define FAST_STRING_NOT_NEEDED 1
 #include "HsVersions.h"
 
 import Module

compiler/main/ErrUtils.lhs

@@ -28,8 +28,6 @@ module ErrUtils (
 	debugTraceMsg,	
     ) where
 
--- XXX This define is a bit of a hack, and should be done more nicely
-#define FAST_STRING_NOT_NEEDED 1
 #include "HsVersions.h"
 
 import Bag		( Bag, bagToList, isEmptyBag, emptyBag )

compiler/main/GHC.hs

@@ -266,6 +266,7 @@ import BasicTypes
 import Maybes		( expectJust, mapCatMaybes )
 import HaddockParse
 import HaddockLex       ( tokenise )
+import FastString
 
 import Control.Concurrent
 import System.Directory ( getModificationTime, doesFileExist,

compiler/main/HscStats.lhs

@@ -6,8 +6,6 @@
 \begin{code}
 module HscStats ( ppSourceStats ) where
 
--- XXX This define is a bit of a hack, and should be done more nicely
-#define FAST_STRING_NOT_NEEDED 1
 #include "HsVersions.h"
 
 import HsSyn

compiler/main/HscTypes.lhs

@@ -112,7 +112,7 @@ import BreakArray
 import SrcLoc		( SrcSpan, Located )
 import LazyUniqFM		( lookupUFM, eltsUFM, emptyUFM )
 import UniqSupply	( UniqSupply )
-import FastString	( FastString )
+import FastString
 import StringBuffer	( StringBuffer )
 
 import System.FilePath

compiler/main/PackageConfig.hs

@@ -22,10 +22,6 @@ import Distribution.Package
 import Distribution.Version
 import Distribution.Compat.ReadP ( readP_to_S )
 
--- warning suppression
-_unused :: FS.FastString
-_unused = FSLIT("")
-
 -- -----------------------------------------------------------------------------
 -- Our PackageConfig type is just InstalledPackageInfo from Cabal.  Later we
 -- might need to extend it with some GHC-specific stuff, but for now it's fine.

compiler/main/PprTyThing.hs

@@ -27,6 +27,7 @@ import TcType
 import Var
 import Name
 import Outputable
+import FastString
 
 -- -----------------------------------------------------------------------------
 -- Pretty-printing entities that we get from the GHC API

compiler/main/StaticFlags.hs

@@ -75,7 +75,7 @@ module StaticFlags (
 
 import CmdLineParser
 import Config
-import FastString	( FastString, mkFastString )
+import FastString
 import Util
 import Maybes		( firstJust )
 import Panic

compiler/main/SysTools.lhs

@@ -74,7 +74,7 @@ import CString		( CString, peekCString )
 
 import System.Process	( runInteractiveProcess, getProcessExitCode )
 import Control.Concurrent( forkIO, newChan, readChan, writeChan )
-import FastString       ( mkFastString )
+import FastString
 import SrcLoc           ( SrcLoc, mkSrcLoc, noSrcSpan, mkSrcSpan )
 \end{code}
 

compiler/main/TidyPgm.lhs

@@ -45,9 +45,6 @@ import FastBool hiding ( fastOr )
 import Data.List	( partition )
 import Data.Maybe	( isJust )
 import Data.IORef	( IORef, readIORef, writeIORef )
-
-_dummy :: FS.FastString
-_dummy = FSLIT("")
 \end{code}
 
 

compiler/nativeGen/PositionIndependentCode.hs

@@ -76,6 +76,7 @@ import qualified Outputable
 
 import Panic            ( panic )
 import DynFlags
+import FastString
 
 
 -- The most important function here is cmmMakeDynamicReference.

compiler/nativeGen/RegAllocLinear.hs

@@ -101,6 +101,7 @@ import UniqFM
 import UniqSupply
 import Outputable
 import State
+import FastString
 
 import Data.Maybe
 import Data.List

compiler/nativeGen/RegLiveness.hs

@@ -46,6 +46,7 @@ import UniqFM
 import UniqSupply
 import Bag
 import State
+import FastString
 
 import Data.List
 import Data.Maybe

compiler/prelude/ForeignCall.lhs

@@ -26,7 +26,7 @@ module ForeignCall (
 
 #include "HsVersions.h"
 
-import FastString	( FastString, unpackFS )
+import FastString
 import Char		( isAlphaNum )
 import Binary
 import Outputable

compiler/prelude/TysPrim.lhs

@@ -68,7 +68,7 @@ import SrcLoc
 import Unique		( mkAlphaTyVarUnique, pprUnique )
 import PrelNames
 import StaticFlags
-import FastString	( FastString, mkFastString )
+import FastString
 import Outputable
 
 import Char 		( ord, chr )

compiler/profiling/SCCfinal.lhs

@@ -25,8 +25,6 @@ This is now a sort-of-normal STG-to-STG pass (WDP 94/06), run by stg2stg.
 \begin{code}
 module SCCfinal ( stgMassageForProfiling ) where
 
--- XXX This define is a bit of a hack, and should be done more nicely
-#define FAST_STRING_NOT_NEEDED 1
 #include "HsVersions.h"
 
 import StgSyn

compiler/rename/RnBinds.lhs

@@ -60,6 +60,7 @@ import BasicTypes	( RecFlag(..) )
 import Digraph		( SCC(..), stronglyConnComp )
 import Bag
 import Outputable
+import FastString
 import Maybes		( orElse )
 import Util		( filterOut )
 import Monad		( foldM, unless )

compiler/rename/RnNames.lhs

@@ -49,6 +49,7 @@ import ErrUtils
 import BasicTypes	( DeprecTxt, Fixity )
 import DriverPhases	( isHsBoot )
 import Util
+import FastString
 import ListSetOps
 import Data.List        ( partition, concatMap, (\\), delete )
 import IO		( openFile, IOMode(..) )

compiler/rename/RnSource.lhs

@@ -49,6 +49,7 @@ import NameEnv
 import LazyUniqFM
 import OccName 
 import Outputable
+import FastString
 import SrcLoc		( Located(..), unLoc, noLoc )
 import DynFlags	( DynFlag(..) )
 import Maybe            ( isNothing )

compiler/rename/RnTypes.lhs

@@ -31,6 +31,7 @@ import NameSet
 import BasicTypes	( compareFixity, funTyFixity, negateFixity, 
 			  Fixity(..), FixityDirection(..) )
 import Outputable
+import FastString
 
 #include "HsVersions.h"
 \end{code}

compiler/simplCore/CSE.lhs

@@ -23,6 +23,7 @@ import StaticFlags	( opt_PprStyle_Debug )