Add NFData instances for HLS plugin support

rm41339 · rm41339 · commit 710c97caeedb · 2025-08-21T17:52:13.000+02:00
diff --git a/Cabal-syntax/src/Distribution/Compiler.hs b/Cabal-syntax/src/Distribution/Compiler.hs
@@ -224,6 +224,7 @@ data AbiTag
   deriving (Eq, Generic, Show, Read)
 
 instance Binary AbiTag
+instance NFData AbiTag
 instance Structured AbiTag
 
 instance Pretty AbiTag where
diff --git a/Cabal/src/Distribution/Simple/Compiler.hs b/Cabal/src/Distribution/Simple/Compiler.hs
@@ -130,6 +130,7 @@ data Compiler = Compiler
   deriving (Eq, Generic, Show, Read)
 
 instance Binary Compiler
+instance NFData Compiler
 instance Structured Compiler
 
 showCompilerId :: Compiler -> String
@@ -205,6 +206,7 @@ data PackageDBX fp
   deriving (Eq, Generic, Ord, Show, Read, Functor, Foldable, Traversable)
 
 instance Binary fp => Binary (PackageDBX fp)
+instance NFData fp => NFData (PackageDBX fp)
 instance Structured fp => Structured (PackageDBX fp)
 
 -- | Parse a PackageDB stack entry
@@ -305,6 +307,7 @@ data OptimisationLevel
   deriving (Bounded, Enum, Eq, Generic, Read, Show)
 
 instance Binary OptimisationLevel
+instance NFData OptimisationLevel
 instance Structured OptimisationLevel
 
 instance Parsec OptimisationLevel where
@@ -354,6 +357,7 @@ data DebugInfoLevel
   deriving (Bounded, Enum, Eq, Generic, Read, Show)
 
 instance Binary DebugInfoLevel
+instance NFData DebugInfoLevel
 instance Structured DebugInfoLevel
 
 instance Parsec DebugInfoLevel where
@@ -607,6 +611,7 @@ data ProfDetailLevel
   deriving (Eq, Generic, Read, Show)
 
 instance Binary ProfDetailLevel
+instance NFData ProfDetailLevel
 instance Structured ProfDetailLevel
 
 instance Parsec ProfDetailLevel where
diff --git a/Cabal/src/Distribution/Simple/InstallDirs.hs b/Cabal/src/Distribution/Simple/InstallDirs.hs
@@ -109,6 +109,14 @@ data InstallDirs dir = InstallDirs
   deriving (Eq, Read, Show, Functor, Generic)
 
 instance Binary dir => Binary (InstallDirs dir)
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+instance NFData dir => NFData (InstallDirs dir)
+>>>>>>> e6a34d613 (Add NFData instances for HLS plugin support)
+=======
+instance NFData dir => NFData (InstallDirs dir) 
+>>>>>>> c01ca5064 (Add NFData instances for HLS plugin support)
 instance Structured dir => Structured (InstallDirs dir)
 
 instance (Semigroup dir, Monoid dir) => Monoid (InstallDirs dir) where
@@ -397,6 +405,7 @@ newtype PathTemplate = PathTemplate [PathComponent]
   deriving (Eq, Ord, Generic)
 
 instance Binary PathTemplate
+instance NFData PathTemplate
 instance Structured PathTemplate
 
 type PathTemplateEnv = [(PathTemplateVariable, PathTemplate)]
diff --git a/Cabal/src/Distribution/Simple/InstallDirs/Internal.hs b/Cabal/src/Distribution/Simple/InstallDirs/Internal.hs
@@ -14,6 +14,14 @@ data PathComponent
   deriving (Eq, Ord, Generic)
 
 instance Binary PathComponent
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+instance NFData PathComponent
+>>>>>>> e6a34d613 (Add NFData instances for HLS plugin support)
+=======
+instance NFData PathComponent 
+>>>>>>> c01ca5064 (Add NFData instances for HLS plugin support)
 instance Structured PathComponent
 
 data PathTemplateVariable
@@ -67,6 +75,7 @@ data PathTemplateVariable
   deriving (Eq, Ord, Generic)
 
 instance Binary PathTemplateVariable
+instance NFData PathTemplateVariable
 instance Structured PathTemplateVariable
 
 instance Show PathTemplateVariable where
diff --git a/Cabal/src/Distribution/Simple/Setup/Haddock.hs b/Cabal/src/Distribution/Simple/Setup/Haddock.hs
@@ -75,6 +75,14 @@ import qualified Text.PrettyPrint as Disp
 data HaddockTarget = ForHackage | ForDevelopment deriving (Eq, Show, Generic)
 
 instance Binary HaddockTarget
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+instance NFData HaddockTarget
+>>>>>>> e6a34d613 (Add NFData instances for HLS plugin support)
+=======
+instance NFData HaddockTarget 
+>>>>>>> c01ca5064 (Add NFData instances for HLS plugin support)
 instance Structured HaddockTarget
 
 instance Pretty HaddockTarget where
diff --git a/Cabal/src/Distribution/Simple/Setup/Test.hs b/Cabal/src/Distribution/Simple/Setup/Test.hs
@@ -60,6 +60,7 @@ data TestShowDetails = Never | Failures | Always | Streaming | Direct
   deriving (Eq, Ord, Enum, Bounded, Generic, Show)
 
 instance Binary TestShowDetails
+instance NFData TestShowDetails
 instance Structured TestShowDetails
 
 knownTestShowDetails :: [TestShowDetails]
diff --git a/Cabal/src/Distribution/Types/DumpBuildInfo.hs b/Cabal/src/Distribution/Types/DumpBuildInfo.hs
@@ -13,6 +13,7 @@ data DumpBuildInfo
   deriving (Read, Show, Eq, Ord, Enum, Bounded, Generic)
 
 instance Binary DumpBuildInfo
+instance NFData DumpBuildInfo
 instance Structured DumpBuildInfo
 
 instance Parsec DumpBuildInfo where
diff --git a/Cabal/src/Distribution/Types/ParStrat.hs b/Cabal/src/Distribution/Types/ParStrat.hs
@@ -1,5 +1,7 @@
 module Distribution.Types.ParStrat where
 
+import Distribution.Compat.Prelude
+
 -- | How to control parallelism, e.g. a fixed number of jobs or by using a system semaphore.
 data ParStratX sem
   = -- | Compile in parallel with the given number of jobs (`-jN` or `-j`).
@@ -10,6 +12,11 @@ data ParStratX sem
     Serial
   deriving (Show)
 
+instance NFData sem => NFData (ParStratX sem) where
+  rnf (NumJobs m) = rnf m
+  rnf (UseSem s) = rnf s
+  rnf Serial = ()
+
 -- | Used by Cabal to indicate that we want to use this specific semaphore (created by cabal-install)
 type ParStrat = ParStratX String
 
diff --git a/Cabal/src/Distribution/Utils/NubList.hs b/Cabal/src/Distribution/Utils/NubList.hs
@@ -75,6 +75,9 @@ instance (Ord a, Binary a) => Binary (NubList a) where
 
 instance Structured a => Structured (NubList a)
 
+instance (Ord a, NFData a) => NFData (NubList a) where
+  rnf (NubList xs) = rnf xs
+
 -- | NubListR : A right-biased version of 'NubList'. That is @toNubListR
 -- ["-XNoFoo", "-XFoo", "-XNoFoo"]@ will result in @["-XFoo", "-XNoFoo"]@,
 -- unlike the normal 'NubList', which is left-biased. Built on top of
diff --git a/Cabal/src/Distribution/Verbosity.hs b/Cabal/src/Distribution/Verbosity.hs
@@ -111,7 +111,12 @@ instance Bounded Verbosity where
   maxBound = mkVerbosity maxBound
 
 instance Binary Verbosity
+instance NFData Verbosity
+<<<<<<< HEAD
 instance Structured Verbosity
+=======
+instance Structured Verbosity 
+>>>>>>> c01ca5064 (Add NFData instances for HLS plugin support)
 
 -- | In 'silent' mode, we should not print /anything/ unless an error occurs.
 silent :: Verbosity
diff --git a/Cabal/src/Distribution/Verbosity/Internal.hs b/Cabal/src/Distribution/Verbosity/Internal.hs
@@ -12,6 +12,14 @@ data VerbosityLevel = Silent | Normal | Verbose | Deafening
   deriving (Generic, Show, Read, Eq, Ord, Enum, Bounded)
 
 instance Binary VerbosityLevel
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+instance NFData VerbosityLevel
+>>>>>>> e6a34d613 (Add NFData instances for HLS plugin support)
+=======
+instance NFData VerbosityLevel 
+>>>>>>> c01ca5064 (Add NFData instances for HLS plugin support)
 instance Structured VerbosityLevel
 
 data VerbosityFlag
@@ -26,4 +34,12 @@ data VerbosityFlag
   deriving (Generic, Show, Read, Eq, Ord, Enum, Bounded)
 
 instance Binary VerbosityFlag
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+instance NFData VerbosityFlag
+>>>>>>> e6a34d613 (Add NFData instances for HLS plugin support)
+=======
+instance NFData VerbosityFlag 
+>>>>>>> c01ca5064 (Add NFData instances for HLS plugin support)
 instance Structured VerbosityFlag
diff --git a/cabal-install-solver/src/Distribution/Solver/Types/ConstraintSource.hs b/cabal-install-solver/src/Distribution/Solver/Types/ConstraintSource.hs
@@ -63,6 +63,7 @@ data ConstraintSource =
   deriving (Show, Eq, Generic)
 
 instance Binary ConstraintSource
+instance NFData ConstraintSource
 instance Structured ConstraintSource
 
 -- | Description of a 'ConstraintSource'.
diff --git a/cabal-install-solver/src/Distribution/Solver/Types/OptionalStanza.hs b/cabal-install-solver/src/Distribution/Solver/Types/OptionalStanza.hs
@@ -57,6 +57,7 @@ enableStanzas optionalStanzas = ComponentRequestedSpec
     }
 
 instance Binary OptionalStanza
+instance NFData OptionalStanza 
 instance Structured OptionalStanza
 
 -------------------------------------------------------------------------------
diff --git a/cabal-install-solver/src/Distribution/Solver/Types/PackageConstraint.hs b/cabal-install-solver/src/Distribution/Solver/Types/PackageConstraint.hs
@@ -96,6 +96,7 @@ data PackageProperty
   deriving (Eq, Show, Generic)
 
 instance Binary PackageProperty
+instance NFData PackageProperty 
 instance Structured PackageProperty
 
 instance Pretty PackageProperty where
diff --git a/cabal-install-solver/src/Distribution/Solver/Types/ProjectConfigPath.hs b/cabal-install-solver/src/Distribution/Solver/Types/ProjectConfigPath.hs
@@ -117,6 +117,7 @@ instance Ord ProjectConfigPath where
             bImporters = snd $ unconsProjectConfigPath pb
 
 instance Binary ProjectConfigPath
+instance NFData ProjectConfigPath
 instance Structured ProjectConfigPath
 
 -- | Renders the path like this;
diff --git a/cabal-install-solver/src/Distribution/Solver/Types/Settings.hs b/cabal-install-solver/src/Distribution/Solver/Types/Settings.hs
@@ -95,6 +95,18 @@ instance Structured AllowBootLibInstalls
 instance Structured OnlyConstrained
 instance Structured SolveExecutables
 
+instance NFData ReorderGoals
+instance NFData CountConflicts
+instance NFData FineGrainedConflicts
+instance NFData IndependentGoals 
+instance NFData PreferOldest
+instance NFData MinimizeConflictSet 
+instance NFData AvoidReinstalls
+instance NFData ShadowPkgs
+instance NFData StrongFlags
+instance NFData AllowBootLibInstalls
+instance NFData OnlyConstrained
+
 instance Pretty OnlyConstrained where
   pretty OnlyConstrainedAll  = PP.text "all"
   pretty OnlyConstrainedNone = PP.text "none"
diff --git a/cabal-install/src/Distribution/Client/BuildReports/Types.hs b/cabal-install/src/Distribution/Client/BuildReports/Types.hs
@@ -39,6 +39,7 @@ data ReportLevel = NoReports | AnonymousReports | DetailedReports
   deriving (Eq, Ord, Enum, Bounded, Show, Generic)
 
 instance Binary ReportLevel
+instance NFData ReportLevel
 instance Structured ReportLevel
 
 instance Pretty ReportLevel where
diff --git a/cabal-install/src/Distribution/Client/CmdInstall/ClientInstallFlags.hs b/cabal-install/src/Distribution/Client/CmdInstall/ClientInstallFlags.hs
@@ -61,6 +61,7 @@ instance Semigroup ClientInstallFlags where
   (<>) = gmappend
 
 instance Binary ClientInstallFlags
+instance NFData ClientInstallFlags
 instance Structured ClientInstallFlags
 
 defaultClientInstallFlags :: ClientInstallFlags
diff --git a/cabal-install/src/Distribution/Client/Dependency/Types.hs b/cabal-install/src/Distribution/Client/Dependency/Types.hs
@@ -24,6 +24,8 @@ data Solver = Modular
 instance Binary PreSolver
 instance Binary Solver
 
+instance NFData PreSolver
+
 instance Structured PreSolver
 instance Structured Solver
 
diff --git a/cabal-install/src/Distribution/Client/ProjectConfig/Types.hs b/cabal-install/src/Distribution/Client/ProjectConfig/Types.hs
@@ -249,6 +249,8 @@ data ProjectFileParser
   | CompareParser
   deriving (Eq, Show, Generic)
 
+instance NFData ProjectFileParser
+
 defaultProjectFileParser :: ProjectFileParser
 #ifdef LEGACY_COMPARISON
 defaultProjectFileParser = CompareParser
@@ -355,13 +357,28 @@ instance Structured ProjectConfigProvenance
 instance Structured PackageConfig
 instance Structured ProjectFileParser
 
+instance NFData ProjectConfigToParse where
+  rnf (ProjectConfigToParse bs) = rnf bs
+
+instance NFData ProjectConfig
+instance NFData ProjectConfigBuildOnly
+instance NFData ProjectConfigShared
+
+instance NFData ProjectConfigProvenance where
+  rnf Implicit = ()
+  rnf (Explicit path) = rnf path
+
+instance NFData PackageConfig
+
 -- | Newtype wrapper for 'Map' that provides a 'Monoid' instance that takes
 -- the last value rather than the first value for overlapping keys.
 newtype MapLast k v = MapLast {getMapLast :: Map k v}
   deriving (Eq, Show, Functor, Generic, Binary)
 
 instance (Structured k, Structured v) => Structured (MapLast k v)
 
+instance (NFData k, NFData v) => NFData (MapLast k v)
+
 instance Ord k => Monoid (MapLast k v) where
   mempty = MapLast Map.empty
   mappend = (<>)
@@ -378,6 +395,8 @@ newtype MapMappend k v = MapMappend {getMapMappend :: Map k v}
 
 instance (Structured k, Structured v) => Structured (MapMappend k v)
 
+instance (NFData k, NFData v) => NFData (MapMappend k v)
+
 instance (Semigroup v, Ord k) => Monoid (MapMappend k v) where
   mempty = MapMappend Map.empty
   mappend = (<>)
@@ -462,6 +481,7 @@ data SolverSettings = SolverSettings
   deriving (Eq, Show, Generic)
 
 instance Binary SolverSettings
+instance NFData SolverSettings
 instance Structured SolverSettings
 
 -- | Resolved configuration for things that affect how we build and not the
@@ -501,3 +521,6 @@ data BuildTimeSettings = BuildTimeSettings
   , buildSettingProgPathExtra :: [FilePath]
   , buildSettingHaddockOpen :: Bool
   }
+  deriving (Generic)
+
+instance NFData BuildTimeSettings
diff --git a/cabal-install/src/Distribution/Client/Targets.hs b/cabal-install/src/Distribution/Client/Targets.hs
@@ -609,6 +609,7 @@ data UserQualifier
   deriving (Eq, Show, Generic)
 
 instance Binary UserQualifier
+instance NFData UserQualifier
 instance Structured UserQualifier
 
 -- | Version of 'ConstraintScope' that a user may specify on the
@@ -623,6 +624,7 @@ data UserConstraintScope
   deriving (Eq, Show, Generic)
 
 instance Binary UserConstraintScope
+instance NFData UserConstraintScope
 instance Structured UserConstraintScope
 
 fromUserQualifier :: UserQualifier -> Qualifier
@@ -643,6 +645,7 @@ data UserConstraint
   deriving (Eq, Show, Generic)
 
 instance Binary UserConstraint
+instance NFData UserConstraint
 instance Structured UserConstraint
 
 userConstraintPackageName :: UserConstraint -> PackageName
diff --git a/cabal-install/src/Distribution/Client/Types/AllowNewer.hs b/cabal-install/src/Distribution/Client/Types/AllowNewer.hs
@@ -203,6 +203,14 @@ instance Structured RelaxedDep
 instance Structured AllowNewer
 instance Structured AllowOlder
 
+instance NFData RelaxDeps
+instance NFData RelaxDepMod
+instance NFData RelaxDepScope
+instance NFData RelaxDepSubject
+instance NFData RelaxedDep
+instance NFData AllowNewer
+instance NFData AllowOlder
+
 -- | Return 'True' if 'RelaxDeps' specifies a non-empty set of relaxations
 --
 -- Equivalent to @isRelaxDeps = (/= 'mempty')@
diff --git a/cabal-install/src/Distribution/Client/Types/InstallMethod.hs b/cabal-install/src/Distribution/Client/Types/InstallMethod.hs
@@ -14,6 +14,14 @@ data InstallMethod
   deriving (Eq, Show, Generic, Bounded, Enum)
 
 instance Binary InstallMethod
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+instance NFData InstallMethod
+>>>>>>> e6a34d613 (Add NFData instances for HLS plugin support)
+=======
+instance NFData InstallMethod 
+>>>>>>> c01ca5064 (Add NFData instances for HLS plugin support)
 instance Structured InstallMethod
 
 -- | Last
diff --git a/cabal-install/src/Distribution/Client/Types/OverwritePolicy.hs b/cabal-install/src/Distribution/Client/Types/OverwritePolicy.hs
diff --git a/cabal-install/src/Distribution/Client/Types/Repo.hs b/cabal-install/src/Distribution/Client/Types/Repo.hs
diff --git a/cabal-install/src/Distribution/Client/Types/SourceRepo.hs b/cabal-install/src/Distribution/Client/Types/SourceRepo.hs
diff --git a/cabal-install/src/Distribution/Client/Types/WriteGhcEnvironmentFilesPolicy.hs b/cabal-install/src/Distribution/Client/Types/WriteGhcEnvironmentFilesPolicy.hs
diff --git a/changelog.d/pr-11097 b/changelog.d/pr-11097
