[Git][ghc/ghc][wip/unwire-ghc-experimental] compiler: Make ghc-experimental not wired in

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch wip/unwire-ghc-experimental at Glasgow Haskell Compiler / GHC


Commits:
4e618ba3 by Matthew Pickering at 2024-05-30T17:07:33+01:00
compiler: Make ghc-experimental not wired in

If you need to wire in definitions, then place them in ghc-internal and
reexport them from ghc-experimental.

Ticket #24903

- - - - -


3 changed files:

- compiler/GHC/Builtin/Names.hs
- compiler/GHC/Unit/Types.hs
- libraries/ghc-experimental/ghc-experimental.cabal


Changes:

=====================================
compiler/GHC/Builtin/Names.hs
=====================================
@@ -669,10 +669,6 @@ gHC_INTERNAL_OVER_LABELS = mkGhcInternalModule (fsLit "GHC.Internal.OverloadedLa
 gHC_INTERNAL_RECORDS :: Module
 gHC_INTERNAL_RECORDS = mkGhcInternalModule (fsLit "GHC.Internal.Records")
 
-dATA_TUPLE_EXPERIMENTAL, dATA_SUM_EXPERIMENTAL :: Module
-dATA_TUPLE_EXPERIMENTAL = mkExperimentalModule (fsLit "Data.Tuple.Experimental")
-dATA_SUM_EXPERIMENTAL = mkExperimentalModule (fsLit "Data.Sum.Experimental")
-
 rOOT_MAIN :: Module
 rOOT_MAIN       = mkMainModule (fsLit ":Main") -- Root module for initialisation
 
@@ -714,9 +710,6 @@ mkMainModule m = mkModule mainUnit (mkModuleNameFS m)
 mkMainModule_ :: ModuleName -> Module
 mkMainModule_ m = mkModule mainUnit m
 
-mkExperimentalModule :: FastString -> Module
-mkExperimentalModule m = mkModule experimentalUnit (mkModuleNameFS m)
-
 {-
 ************************************************************************
 *                                                                      *


=====================================
compiler/GHC/Unit/Types.hs
=====================================
@@ -77,7 +77,6 @@ module GHC.Unit.Types
    , mainUnit
    , thisGhcUnit
    , interactiveUnit
-   , experimentalUnit
 
    , isInteractiveModule
    , wiredInUnitIds
@@ -594,11 +593,10 @@ Make sure you change 'GHC.Unit.State.findWiredInUnits' if you add an entry here.
 -}
 
 bignumUnitId, primUnitId, ghcInternalUnitId, baseUnitId, rtsUnitId,
-  mainUnitId, thisGhcUnitId, interactiveUnitId,
-  experimentalUnitId :: UnitId
+  mainUnitId, thisGhcUnitId, interactiveUnitId :: UnitId
 
 bignumUnit, primUnit, ghcInternalUnit, baseUnit, rtsUnit,
-  mainUnit, thisGhcUnit, interactiveUnit, experimentalUnit  :: Unit
+  mainUnit, thisGhcUnit, interactiveUnit :: Unit
 
 primUnitId        = UnitId (fsLit "ghc-prim")
 bignumUnitId      = UnitId (fsLit "ghc-bignum")
@@ -607,7 +605,6 @@ baseUnitId        = UnitId (fsLit "base")
 rtsUnitId         = UnitId (fsLit "rts")
 thisGhcUnitId     = UnitId (fsLit cProjectUnitId) -- See Note [GHC's Unit Id]
 interactiveUnitId = UnitId (fsLit "interactive")
-experimentalUnitId = UnitId (fsLit "ghc-experimental")
 
 primUnit          = RealUnit (Definite primUnitId)
 bignumUnit        = RealUnit (Definite bignumUnitId)
@@ -616,7 +613,6 @@ baseUnit          = RealUnit (Definite baseUnitId)
 rtsUnit           = RealUnit (Definite rtsUnitId)
 thisGhcUnit       = RealUnit (Definite thisGhcUnitId)
 interactiveUnit   = RealUnit (Definite interactiveUnitId)
-experimentalUnit  = RealUnit (Definite experimentalUnitId)
 
 -- | This is the package Id for the current program.  It is the default
 -- package Id if you don't specify a package name.  We don't add this prefix
@@ -634,7 +630,6 @@ wiredInUnitIds =
    , ghcInternalUnitId
    , baseUnitId
    , rtsUnitId
-   , experimentalUnitId
    ]
    -- NB: ghc is no longer part of the wired-in units since its unit-id, given
    -- by hadrian or cabal, is no longer overwritten and now matches both the


=====================================
libraries/ghc-experimental/ghc-experimental.cabal
=====================================
@@ -35,4 +35,3 @@ library
                       ghc-prim >= 0.11 && < 0.12
     hs-source-dirs:   src
     default-language: Haskell2010
-    ghc-options: -this-unit-id ghc-experimental



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4e618ba370a1ec2c29a851352ab275f72249ca20

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4e618ba370a1ec2c29a851352ab275f72249ca20
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20240530/d6946577/attachment-0001.html>