Merge pull request #233 from mbj/upgrade/ghc-source-gen

Upgrade ghc-source-gen
mbj · Dec 11, 2024 · e4f5c97 · e4f5c97
2 parents 9c94db8 + f18e577
commit e4f5c97
Show file tree

Hide file tree

Showing 256 changed files with 294 additions and 282 deletions.
diff --git a/generator/package.yaml b/generator/package.yaml
@@ -17,7 +17,7 @@ dependencies:
 - ghc
 - ghc-paths
 - ghc-source-gen
-- hpack
+- hpack >= 0.37
 - mtl
 - shakespeare
 - stratosphere

diff --git a/generator/src/Stratosphere/Generator/Declaration.hs b/generator/src/Stratosphere/Generator/Declaration.hs
@@ -254,7 +254,8 @@ genRecord Record{..} = runGen $ do
         recordConstructor = GHC.RecordCon
           { rcon_ext  = GHC.EpAnnNotUsed
           , rcon_con  = mkLocated $ GHC.mkRdrUnqual $ GHC.mkDataOcc recordName
-          , rcon_flds = GHC.HsRecFields [newValueField] (Just (GHC.L (GHC.UnhelpfulSpan GHC.UnhelpfulGenerated) 1))
+          , rcon_flds = GHC.HsRecFields
+             [newValueField] (Just (GHC.L (GHC.UnhelpfulSpan GHC.UnhelpfulGenerated) (GHC.RecFieldsDotDot 1)))
           }
 
         mkPure :: GHC.HsExpr' -> GHC.HsExpr'
@@ -300,7 +301,7 @@ genRecord Record{..} = runGen $ do
       . GHC.HsRecFields []
       $ if forceNull || List.null properties
           then Nothing
-          else Just (GHC.L (GHC.UnhelpfulSpan GHC.UnhelpfulGenerated) 0)
+          else Just (GHC.L (GHC.UnhelpfulSpan GHC.UnhelpfulGenerated) (GHC.RecFieldsDotDot 0))
       where
         constructorName :: GHC.LocatedN GHC.RdrName
         constructorName = mkLocated . GHC.mkRdrUnqual $ GHC.mkDataOcc recordName
@@ -332,20 +333,18 @@ genRecordBoot Record{..} = runGen $ do
           (GHC.HsQTvs GHC.NoExtField [])
           GHC.Prefix
       $ GHC.HsDataDefn
-          GHC.NoExtField
-          GHC.DataType
-          Nothing
-          Nothing
-          ( Just
-          $ mkLocated
-            (GHC.HsTyVar
-              GHC.EpAnnNotUsed
-              GHC.NotPromoted
-              (mkLocated . GHC.mkRdrUnqual $ GHC.mkDataOcc "Prelude.Type")
-            )
-          )
-          []
-          []
+          { dd_ext = GHC.NoExtField
+          , dd_ctxt = Nothing
+          , dd_cType = Nothing
+          , dd_kindSig = Just $ mkLocated
+              (GHC.HsTyVar
+                GHC.EpAnnNotUsed
+                GHC.NotPromoted
+                (mkLocated . GHC.mkRdrUnqual $ GHC.mkDataOcc "Prelude.Type")
+              )
+          , dd_cons = GHC.DataTypeCons False []
+          , dd_derivs = []
+          }
 
     genResourcePropertiesInstance :: Generator GHC.HsDecl'
     genResourcePropertiesInstance

diff --git a/generator/stratosphere-generator.cabal b/generator/stratosphere-generator.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.1.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -74,7 +74,7 @@ executable stratosphere-generator
     , ghc
     , ghc-paths
     , ghc-source-gen
-    , hpack
+    , hpack >=0.37
     , mtl
     , shakespeare
     , stratosphere

diff --git a/services/accessanalyzer/stratosphere-accessanalyzer.cabal b/services/accessanalyzer/stratosphere-accessanalyzer.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/acmpca/stratosphere-acmpca.cabal b/services/acmpca/stratosphere-acmpca.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/amazonmq/stratosphere-amazonmq.cabal b/services/amazonmq/stratosphere-amazonmq.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/amplify/stratosphere-amplify.cabal b/services/amplify/stratosphere-amplify.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/amplifyuibuilder/stratosphere-amplifyuibuilder.cabal b/services/amplifyuibuilder/stratosphere-amplifyuibuilder.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/apigateway/stratosphere-apigateway.cabal b/services/apigateway/stratosphere-apigateway.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/apigatewayv2/stratosphere-apigatewayv2.cabal b/services/apigatewayv2/stratosphere-apigatewayv2.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/appconfig/stratosphere-appconfig.cabal b/services/appconfig/stratosphere-appconfig.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/appflow/stratosphere-appflow.cabal b/services/appflow/stratosphere-appflow.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/appintegrations/stratosphere-appintegrations.cabal b/services/appintegrations/stratosphere-appintegrations.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/applicationautoscaling/stratosphere-applicationautoscaling.cabal b/services/applicationautoscaling/stratosphere-applicationautoscaling.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/applicationinsights/stratosphere-applicationinsights.cabal b/services/applicationinsights/stratosphere-applicationinsights.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/applicationsignals/stratosphere-applicationsignals.cabal b/services/applicationsignals/stratosphere-applicationsignals.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/appmesh/stratosphere-appmesh.cabal b/services/appmesh/stratosphere-appmesh.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/apprunner/stratosphere-apprunner.cabal b/services/apprunner/stratosphere-apprunner.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/appstream/stratosphere-appstream.cabal b/services/appstream/stratosphere-appstream.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/appsync/stratosphere-appsync.cabal b/services/appsync/stratosphere-appsync.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/apptest/stratosphere-apptest.cabal b/services/apptest/stratosphere-apptest.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/aps/stratosphere-aps.cabal b/services/aps/stratosphere-aps.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/arczonalshift/stratosphere-arczonalshift.cabal b/services/arczonalshift/stratosphere-arczonalshift.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/ask/stratosphere-ask.cabal b/services/ask/stratosphere-ask.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/athena/stratosphere-athena.cabal b/services/athena/stratosphere-athena.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/auditmanager/stratosphere-auditmanager.cabal b/services/auditmanager/stratosphere-auditmanager.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/autoscaling/stratosphere-autoscaling.cabal b/services/autoscaling/stratosphere-autoscaling.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/autoscalingplans/stratosphere-autoscalingplans.cabal b/services/autoscalingplans/stratosphere-autoscalingplans.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/b2bi/stratosphere-b2bi.cabal b/services/b2bi/stratosphere-b2bi.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/backup/stratosphere-backup.cabal b/services/backup/stratosphere-backup.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/backupgateway/stratosphere-backupgateway.cabal b/services/backupgateway/stratosphere-backupgateway.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/batch/stratosphere-batch.cabal b/services/batch/stratosphere-batch.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/bcmdataexports/stratosphere-bcmdataexports.cabal b/services/bcmdataexports/stratosphere-bcmdataexports.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/bedrock/stratosphere-bedrock.cabal b/services/bedrock/stratosphere-bedrock.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/billingconductor/stratosphere-billingconductor.cabal b/services/billingconductor/stratosphere-billingconductor.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/budgets/stratosphere-budgets.cabal b/services/budgets/stratosphere-budgets.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/cassandra/stratosphere-cassandra.cabal b/services/cassandra/stratosphere-cassandra.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/ce/stratosphere-ce.cabal b/services/ce/stratosphere-ce.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/certificatemanager/stratosphere-certificatemanager.cabal b/services/certificatemanager/stratosphere-certificatemanager.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/chatbot/stratosphere-chatbot.cabal b/services/chatbot/stratosphere-chatbot.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/cleanrooms/stratosphere-cleanrooms.cabal b/services/cleanrooms/stratosphere-cleanrooms.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/cleanroomsml/stratosphere-cleanroomsml.cabal b/services/cleanroomsml/stratosphere-cleanroomsml.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/services/cloud9/stratosphere-cloud9.cabal b/services/cloud9/stratosphere-cloud9.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack