Commit af332442 authored by Sylvain Henry's avatar Sylvain Henry Committed by Marge Bot

Modules: Utils and Data (#13009)

Update Haddock submodule

Metric Increase:
   haddock.compiler
parent b0fbfc75
......@@ -293,7 +293,7 @@ module GHC (
#include "HsVersions.h"
import GhcPrelude hiding (init)
import GHC.Prelude hiding (init)
import GHC.ByteCode.Types
import GHC.Runtime.Eval
......@@ -342,16 +342,16 @@ import GHC.SysTools
import GHC.SysTools.BaseDir
import GHC.Types.Annotations
import GHC.Types.Module
import Panic
import GHC.Utils.Panic
import GHC.Platform
import Bag ( listToBag )
import ErrUtils
import MonadUtils
import Util
import StringBuffer
import Outputable
import GHC.Data.Bag ( listToBag )
import GHC.Utils.Error
import GHC.Utils.Monad
import GHC.Utils.Misc
import GHC.Data.StringBuffer
import GHC.Utils.Outputable
import GHC.Types.Basic
import FastString
import GHC.Data.FastString
import qualified GHC.Parser as Parser
import GHC.Parser.Lexer
import GHC.Parser.Annotation
......@@ -373,13 +373,13 @@ import Data.Typeable ( Typeable )
import Data.Word ( Word8 )
import Control.Monad
import System.Exit ( exitWith, ExitCode(..) )
import Exception
import GHC.Utils.Exception
import Data.IORef
import System.FilePath
import Control.Concurrent
import Control.Applicative ((<|>))
import Maybes
import GHC.Data.Maybe
import System.IO.Error ( isDoesNotExistError )
import System.Environment ( getEnv )
import System.Directory
......
......@@ -159,7 +159,7 @@ where
#include "HsVersions.h"
import GhcPrelude
import GHC.Prelude
import GHC.Types.Module
import GHC.Types.Name.Occurrence
......@@ -167,7 +167,7 @@ import GHC.Types.Name.Reader
import GHC.Types.Unique
import GHC.Types.Name
import GHC.Types.SrcLoc
import FastString
import GHC.Data.FastString
{-
************************************************************************
......
......@@ -6,7 +6,7 @@
module GHC.Builtin.Names.TH where
import GhcPrelude ()
import GHC.Prelude ()
import GHC.Builtin.Names( mk_known_key_name )
import GHC.Types.Module( Module, mkModuleNameFS, mkModule, thUnitId )
......@@ -14,7 +14,7 @@ import GHC.Types.Name( Name )
import GHC.Types.Name.Occurrence( tcName, clsName, dataName, varName )
import GHC.Types.Name.Reader( RdrName, nameRdrName )
import GHC.Types.Unique
import FastString
import GHC.Data.FastString
-- To add a name, do three things
--
......
......@@ -25,7 +25,7 @@ module GHC.Builtin.PrimOps (
#include "HsVersions.h"
import GhcPrelude
import GHC.Prelude
import GHC.Builtin.Types.Prim
import GHC.Builtin.Types
......@@ -45,8 +45,8 @@ import GHC.Types.SrcLoc ( wiredInSrcSpan )
import GHC.Types.ForeignCall ( CLabelString )
import GHC.Types.Unique ( Unique, mkPrimOpIdUnique, mkPrimOpWrapperUnique )
import GHC.Types.Module ( UnitId )
import Outputable
import FastString
import GHC.Utils.Outputable
import GHC.Data.FastString
{-
************************************************************************
......
module GHC.Builtin.PrimOps where
import GhcPrelude ()
import GHC.Prelude ()
data PrimOp
......@@ -130,7 +130,7 @@ module GHC.Builtin.Types (
#include "HsVersions.h"
import GhcPrelude
import GHC.Prelude
import {-# SOURCE #-} GHC.Types.Id.Make ( mkDataConWorkId, mkDictSelId )
......@@ -159,10 +159,10 @@ import GHC.Types.ForeignCall
import GHC.Types.SrcLoc ( noSrcSpan )
import GHC.Types.Unique
import Data.Array
import FastString
import Outputable
import Util
import BooleanFormula ( mkAnd )
import GHC.Data.FastString
import GHC.Utils.Outputable
import GHC.Utils.Misc
import GHC.Data.BooleanFormula ( mkAnd )
import qualified Data.ByteString.Char8 as BS
......
......@@ -21,10 +21,10 @@ module GHC.Builtin.Types.Literals
, typeSymbolAppendTyCon
) where
import GhcPrelude
import GHC.Prelude
import GHC.Core.Type
import Pair
import GHC.Data.Pair
import GHC.Tc.Utils.TcType ( TcType, tcEqType )
import GHC.Core.TyCon ( TyCon, FamTyConFlav(..), mkFamilyTyCon
, Injectivity(..) )
......@@ -33,7 +33,7 @@ import GHC.Tc.Types.Constraint ( Xi )
import GHC.Core.Coercion.Axiom ( CoAxiomRule(..), BuiltInSynFamily(..), TypeEqn )
import GHC.Types.Name ( Name, BuiltInSyntax(..) )
import GHC.Builtin.Types
import GHC.Builtin.Types.Prim ( mkTemplateAnonTyConBinders )
import GHC.Builtin.Types.Prim ( mkTemplateAnonTyConBinders )
import GHC.Builtin.Names
( gHC_TYPELITS
, gHC_TYPENATS
......@@ -49,9 +49,7 @@ import GHC.Builtin.Names
, typeSymbolCmpTyFamNameKey
, typeSymbolAppendFamNameKey
)
import FastString ( FastString
, fsLit, nilFS, nullFS, unpackFS, mkFastString, appendFS
)
import GHC.Data.FastString
import qualified Data.Map as Map
import Data.Maybe ( isJust )
import Control.Monad ( guard )
......
......@@ -90,7 +90,7 @@ module GHC.Builtin.Types.Prim(
#include "HsVersions.h"
import GhcPrelude
import GHC.Prelude
import {-# SOURCE #-} GHC.Builtin.Types
( runtimeRepTy, unboxedTupleKind, liftedTypeKind
......@@ -116,8 +116,8 @@ import GHC.Core.TyCon
import GHC.Types.SrcLoc
import GHC.Types.Unique
import GHC.Builtin.Names
import FastString
import Outputable
import GHC.Data.FastString
import GHC.Utils.Outputable
import GHC.Core.TyCo.Rep -- Doesn't need special access, but this is easier to avoid
-- import loops which show up if you import Type instead
......
......@@ -26,17 +26,17 @@ module GHC.Builtin.Uniques
#include "HsVersions.h"
import GhcPrelude
import GHC.Prelude
import GHC.Builtin.Types
import GHC.Core.TyCon
import GHC.Core.DataCon
import GHC.Types.Id
import GHC.Types.Basic
import Outputable
import GHC.Utils.Outputable
import GHC.Types.Unique
import GHC.Types.Name
import Util
import GHC.Utils.Misc
import Data.Bits
import Data.Maybe
......
module GHC.Builtin.Uniques where
import GhcPrelude
import GHC.Prelude
import GHC.Types.Unique
import GHC.Types.Name
import GHC.Types.Basic
......
......@@ -47,7 +47,7 @@ module GHC.Builtin.Utils (
#include "HsVersions.h"
import GhcPrelude
import GHC.Prelude
import GHC.Builtin.Uniques
import GHC.Types.Unique ( isValidKnownKeyUnique )
......@@ -63,14 +63,14 @@ import GHC.Types.Id
import GHC.Types.Name
import GHC.Types.Name.Env
import GHC.Types.Id.Make
import Outputable
import GHC.Utils.Outputable
import GHC.Builtin.Types.Prim
import GHC.Builtin.Types
import GHC.Driver.Types
import GHC.Core.Class
import GHC.Core.TyCon
import GHC.Types.Unique.FM
import Util
import GHC.Utils.Misc
import GHC.Builtin.Types.Literals ( typeNatTyCons )
import GHC.Hs.Doc
......
......@@ -15,7 +15,7 @@ module GHC.ByteCode.Asm (
#include "HsVersions.h"
import GhcPrelude
import GHC.Prelude
import GHC.ByteCode.Instr
import GHC.ByteCode.InfoTable
......@@ -28,13 +28,13 @@ import GHC.Types.Name
import GHC.Types.Name.Set
import GHC.Types.Literal
import GHC.Core.TyCon
import FastString
import GHC.Data.FastString
import GHC.StgToCmm.Layout ( ArgRep(..) )
import GHC.Runtime.Heap.Layout
import GHC.Driver.Session
import Outputable
import GHC.Utils.Outputable
import GHC.Platform
import Util
import GHC.Utils.Misc
import GHC.Types.Unique
import GHC.Types.Unique.DSet
......
......@@ -9,7 +9,7 @@ module GHC.ByteCode.InfoTable ( mkITbls ) where
#include "HsVersions.h"
import GhcPrelude
import GHC.Prelude
import GHC.ByteCode.Types
import GHC.Runtime.Interpreter
......@@ -22,8 +22,8 @@ import GHC.Core.TyCon ( TyCon, tyConFamilySize, isDataTyCon, tyConDataCons
import GHC.Types.RepType
import GHC.StgToCmm.Layout ( mkVirtConstrSizes )
import GHC.StgToCmm.Closure ( tagForCon, NonVoid (..) )
import Util
import Panic
import GHC.Utils.Misc
import GHC.Utils.Panic
{-
Manufacturing of info tables for DataCons
......
......@@ -11,15 +11,15 @@ module GHC.ByteCode.Instr (
#include "HsVersions.h"
import GhcPrelude
import GHC.Prelude
import GHC.ByteCode.Types
import GHCi.RemoteTypes
import GHCi.FFI (C_ffi_cif)
import GHC.StgToCmm.Layout ( ArgRep(..) )
import GHC.Core.Ppr
import Outputable
import FastString
import GHC.Utils.Outputable
import GHC.Data.FastString
import GHC.Types.Name
import GHC.Types.Unique
import GHC.Types.Id
......
......@@ -18,7 +18,7 @@ module GHC.ByteCode.Linker (
#include "HsVersions.h"
import GhcPrelude
import GHC.Prelude
import GHCi.RemoteTypes
import GHCi.ResolvedBCO
......@@ -32,10 +32,10 @@ import GHC.Types.Name
import GHC.Types.Name.Env
import GHC.Builtin.PrimOps
import GHC.Types.Module
import FastString
import Panic
import Outputable
import Util
import GHC.Data.FastString
import GHC.Utils.Panic
import GHC.Utils.Outputable
import GHC.Utils.Misc
-- Standard libraries
import Data.Array.Unboxed
......
......@@ -13,13 +13,13 @@ module GHC.ByteCode.Types
, CCostCentre
) where
import GhcPrelude
import GHC.Prelude
import FastString
import GHC.Data.FastString
import GHC.Types.Id
import GHC.Types.Name
import GHC.Types.Name.Env
import Outputable
import GHC.Utils.Outputable
import GHC.Builtin.PrimOps
import SizedSeq
import GHC.Core.Type
......
......@@ -28,7 +28,7 @@ module GHC.Cmm (
module GHC.Cmm.Expr,
) where
import GhcPrelude
import GHC.Prelude
import GHC.Types.Id
import GHC.Types.CostCentre
......@@ -41,7 +41,7 @@ import GHC.Cmm.Dataflow.Block
import GHC.Cmm.Dataflow.Collections
import GHC.Cmm.Dataflow.Graph
import GHC.Cmm.Dataflow.Label
import Outputable
import GHC.Utils.Outputable
import Data.ByteString (ByteString)
-----------------------------------------------------------------------------
......
......@@ -8,7 +8,7 @@ module GHC.Cmm.BlockId
, blockLbl, infoTblLbl
) where
import GhcPrelude
import GHC.Prelude
import GHC.Cmm.CLabel
import GHC.Types.Id.Info
......
......@@ -114,7 +114,7 @@ module GHC.Cmm.CLabel (
#include "HsVersions.h"
import GhcPrelude
import GHC.Prelude
import GHC.Types.Id.Info
import GHC.Types.Basic
......@@ -125,12 +125,12 @@ import GHC.Types.Name
import GHC.Types.Unique
import GHC.Builtin.PrimOps
import GHC.Types.CostCentre
import Outputable
import FastString
import GHC.Utils.Outputable
import GHC.Data.FastString
import GHC.Driver.Session
import GHC.Platform
import GHC.Types.Unique.Set
import Util
import GHC.Utils.Misc
import GHC.Core.Ppr ( {- instances -} )
import GHC.CmmToAsm.Config
......
......@@ -5,7 +5,7 @@ module GHC.Cmm.CallConv (
realArgRegsCover
) where
import GhcPrelude
import GHC.Prelude
import GHC.Cmm.Expr
import GHC.Runtime.Heap.Layout
......@@ -14,7 +14,7 @@ import GHC.Cmm.Ppr () -- For Outputable instances
import GHC.Driver.Session
import GHC.Platform
import Outputable
import GHC.Utils.Outputable
-- Calculate the 'GlobalReg' or stack locations for function call
-- parameters as used by the Cmm calling convention.
......
......@@ -6,7 +6,7 @@ module GHC.Cmm.CommonBlockElim
where
import GhcPrelude hiding (iterate, succ, unzip, zip)
import GHC.Prelude hiding (iterate, succ, unzip, zip)
import GHC.Cmm.BlockId
import GHC.Cmm
......@@ -23,8 +23,8 @@ import Data.Maybe (mapMaybe)
import qualified Data.List as List
import Data.Word
import qualified Data.Map as M
import Outputable
import qualified TrieMap as TM
import GHC.Utils.Outputable
import qualified GHC.Data.TrieMap as TM
import GHC.Types.Unique.FM
import GHC.Types.Unique
import Control.Arrow (first, second)
......
......@@ -10,7 +10,7 @@ module GHC.Cmm.ContFlowOpt
)
where
import GhcPrelude hiding (succ, unzip, zip)
import GHC.Prelude hiding (succ, unzip, zip)
import GHC.Cmm.Dataflow.Block
import GHC.Cmm.Dataflow.Collections
......@@ -20,9 +20,9 @@ import GHC.Cmm.BlockId
import GHC.Cmm
import GHC.Cmm.Utils
import GHC.Cmm.Switch (mapSwitchTargets, switchTargetsToList)
import Maybes
import Panic
import Util
import GHC.Data.Maybe
import GHC.Utils.Panic
import GHC.Utils.Misc
import Control.Monad
......
......@@ -34,7 +34,7 @@ module GHC.Cmm.Dataflow
)
where
import GhcPrelude
import GHC.Prelude
import GHC.Cmm