Remove unnecessary CPP directives, following move to GHC 9.2.4

Author: mpilgrem

src/Options/Applicative/Builder/Extra.hs

@@ -1,5 +1,4 @@
 {-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE CPP                 #-}
 {-# LANGUAGE RecordWildCards     #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
@@ -287,8 +286,4 @@ unescapeBashArg input = go input
     go (x : xs) = x : go xs
 
 showHelpText :: ParseError
-#if MIN_VERSION_optparse_applicative(0,16,0)
 showHelpText = ShowHelpText Nothing
-#else
-showHelpText = ShowHelpText
-#endif

src/Stack/Build.hs

@@ -1,6 +1,5 @@
 {-# LANGUAGE NoImplicitPrelude   #-}
 {-# LANGUAGE ConstraintKinds     #-}
-{-# LANGUAGE CPP                 #-}
 {-# LANGUAGE DeriveDataTypeable  #-}
 {-# LANGUAGE FlexibleContexts    #-}
 {-# LANGUAGE OverloadedStrings   #-}
@@ -20,12 +19,8 @@ module Stack.Build
 
 import           Stack.Prelude hiding (loadPackage)
 import           Data.Aeson (Value (Object, Array), (.=), object)
-#if MIN_VERSION_aeson(2,0,0)
 import qualified Data.Aeson.Key as Key
 import qualified Data.Aeson.KeyMap as KeyMap
-#else
-import qualified Data.HashMap.Strict as HM
-#endif
 import           Data.List ((\\), isPrefixOf)
 import           Data.List.Extra (groupSort)
 import qualified Data.List.NonEmpty as NE
@@ -299,11 +294,7 @@ queryBuildInfo selectors0 =
     select front (sel:sels) value =
         case value of
             Object o ->
-#if MIN_VERSION_aeson(2,0,0)
                 case KeyMap.lookup (Key.fromText sel) o of
-#else
-                case HM.lookup sel o of
-#endif
                     Nothing -> err "Selector not found"
                     Just value' -> cont value'
             Array v ->
@@ -338,23 +329,15 @@ rawBuildInfo = do
     wantedCompiler <- view $ wantedCompilerVersionL.to (utf8BuilderToText . display)
     actualCompiler <- view $ actualCompilerVersionL.to compilerVersionText
     return $ object
-#if MIN_VERSION_aeson(2,0,0)
         [ "locals" .= Object (KeyMap.fromList $ map localToPair locals)
-#else
-        [ "locals" .= Object (HM.fromList $ map localToPair locals)
-#endif
         , "compiler" .= object
             [ "wanted" .= wantedCompiler
             , "actual" .= actualCompiler
             ]
         ]
   where
     localToPair lp =
-#if MIN_VERSION_aeson(2,0,0)
         (Key.fromText $ T.pack $ packageNameString $ packageName p, value)
-#else
-        (T.pack $ packageNameString $ packageName p, value)
-#endif
       where
         p = lpPackage lp
         value = object
@@ -376,11 +359,7 @@ checkComponentsBuildable lps =
 checkSubLibraryDependencies :: HasLogFunc env => [ProjectPackage] -> RIO env ()
 checkSubLibraryDependencies proj = do
   forM_ proj $ \p -> do
-#if MIN_VERSION_Cabal(3,4,0)
     C.GenericPackageDescription _ _ _ lib subLibs foreignLibs exes tests benches <- liftIO $ cpGPD . ppCommon $ p
-#else
-    C.GenericPackageDescription _ _ lib subLibs foreignLibs exes tests benches <- liftIO $ cpGPD . ppCommon $ p
-#endif
 
     let dependencies = concatMap getDeps subLibs <>
                        concatMap getDeps foreignLibs <>

src/Stack/Build/Execute.hs

@@ -1,6 +1,5 @@
 {-# LANGUAGE NoImplicitPrelude     #-}
 {-# LANGUAGE ConstraintKinds       #-}
-{-# LANGUAGE CPP                   #-}
 {-# LANGUAGE DataKinds             #-}
 {-# LANGUAGE FlexibleContexts      #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
@@ -1221,11 +1220,7 @@ withSingleContext ActionContext {..} ee@ExecuteEnv {..} task@Task {..} allDeps m
                             let macroDeps = mapMaybe snd matchedDeps
                                 cppMacrosFile = setupDir </> relFileSetupMacrosH
                                 cppArgs = ["-optP-include", "-optP" ++ toFilePath cppMacrosFile]
-#if MIN_VERSION_Cabal(3,4,0)
                             writeBinaryFileAtomic cppMacrosFile (encodeUtf8Builder (T.pack (C.generatePackageVersionMacros (packageVersion package) macroDeps)))
-#else
-                            writeBinaryFileAtomic cppMacrosFile (encodeUtf8Builder (T.pack (C.generatePackageVersionMacros macroDeps)))
-#endif
                             return (packageDBArgs ++ depsArgs ++ cppArgs)
 
                         -- This branch is usually taken for builds, and

src/Stack/Build/Installed.hs

@@ -1,6 +1,5 @@
 {-# LANGUAGE NoImplicitPrelude     #-}
 {-# LANGUAGE ConstraintKinds       #-}
-{-# LANGUAGE CPP                   #-}
 {-# LANGUAGE FlexibleContexts      #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE OverloadedStrings     #-}
@@ -148,9 +147,6 @@ processLoadResult mdb (reason, lh) = do
         maybe mempty (\db -> ", from " <> displayShow db <> ",") mdb <>
         " due to" <>
         case reason of
-#if !MIN_VERSION_GLASGOW_HASKELL(9,0,1,0)
-            Allowed -> " the impossible?!?!"
-#endif
             UnknownPkg -> " it being unknown to the resolver / extra-deps."
             WrongLocation mloc loc -> " wrong location: " <> displayShow (mloc, loc)
             WrongVersion actual wanted ->

src/Stack/BuildPlan.hs

@@ -1,6 +1,5 @@
 {-# LANGUAGE NoImplicitPrelude   #-}
 {-# LANGUAGE ConstraintKinds     #-}
-{-# LANGUAGE CPP                 #-}
 {-# LANGUAGE DataKinds           #-}
 {-# LANGUAGE DeriveDataTypeable  #-}
 {-# LANGUAGE FlexibleContexts    #-}
@@ -225,11 +224,7 @@ selectPackageBuildPlan platform compiler pool gpd =
     flagCombinations :: NonEmpty [(FlagName, Bool)]
     flagCombinations = mapM getOptions (genPackageFlags gpd)
       where
-#if MIN_VERSION_Cabal(3,4,0)
         getOptions :: C.PackageFlag -> NonEmpty (FlagName, Bool)
-#else
-        getOptions :: C.Flag -> NonEmpty (FlagName, Bool)
-#endif
         getOptions f
             | flagManual f = (fname, flagDefault f) :| []
             | flagDefault f = (fname, True) :| [(fname, False)]

src/Stack/Config.hs

@@ -1,6 +1,5 @@
 {-# LANGUAGE NoImplicitPrelude   #-}
 {-# LANGUAGE ConstraintKinds     #-}
-{-# LANGUAGE CPP                 #-}
 {-# LANGUAGE DataKinds           #-}
 {-# LANGUAGE FlexibleContexts    #-}
 {-# LANGUAGE LambdaCase          #-}
@@ -154,9 +153,6 @@ makeConcreteResolver (ARResolver r) = pure r
 makeConcreteResolver ar = do
     r <-
         case ar of
-#if !MIN_VERSION_GLASGOW_HASKELL(9,0,1,0)
-            ARResolver r -> assert False $ makeConcreteResolver (ARResolver r)
-#endif
             ARGlobal -> do
                 config <- view configL
                 implicitGlobalDir <- getImplicitGlobalProjectDir config

src/Stack/ConfigCmd.hs

@@ -1,6 +1,5 @@
 {-# LANGUAGE NoImplicitPrelude   #-}
 {-# LANGUAGE ConstraintKinds     #-}
-{-# LANGUAGE CPP                 #-}
 {-# LANGUAGE FlexibleContexts    #-}
 {-# LANGUAGE GADTs               #-}
 {-# LANGUAGE OverloadedStrings   #-}
@@ -18,15 +17,10 @@ module Stack.ConfigCmd
        ,cfgCmdName) where
 
 import           Stack.Prelude
-#if MIN_VERSION_aeson(2,0,0)
 import qualified Data.Aeson.Key as Key
 import qualified Data.Aeson.KeyMap as KeyMap
-#endif
 import           Data.ByteString.Builder (byteString)
 import qualified Data.Map.Merge.Strict as Map
-#if !MIN_VERSION_aeson(2,0,0)
-import qualified Data.HashMap.Strict as HMap
-#endif
 import qualified Data.Text as T
 import qualified Data.Yaml as Yaml
 import qualified Options.Applicative as OA
@@ -81,11 +75,7 @@ cfgCmdSet cmd = do
         liftIO (Yaml.decodeFileEither (toFilePath configFilePath)) >>= either throwM return
     newValue <- cfgCmdSetValue (parent configFilePath) cmd
     let cmdKey = cfgCmdSetOptionName cmd
-#if MIN_VERSION_aeson(2,0,0)
         config' = KeyMap.insert (Key.fromText cmdKey) newValue config
-#else
-        config' = HMap.insert cmdKey newValue config
-#endif
     if config' == config
         then logInfo
                  (fromString (toFilePath configFilePath) <>

src/Stack/Init.hs

@@ -1,6 +1,5 @@
 {-# LANGUAGE NoImplicitPrelude     #-}
 {-# LANGUAGE ConstraintKinds       #-}
-{-# LANGUAGE CPP                   #-}
 {-# LANGUAGE FlexibleContexts      #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE OverloadedStrings     #-}
@@ -14,15 +13,10 @@ module Stack.Init
     ) where
 
 import           Stack.Prelude
-#if MIN_VERSION_aeson(2,0,0)
 import qualified Data.Aeson.KeyMap               as KeyMap
-#endif
 import qualified Data.ByteString.Builder         as B
 import qualified Data.ByteString.Char8           as BC
 import qualified Data.Foldable                   as F
-#if !MIN_VERSION_aeson(2,0,0)
-import qualified Data.HashMap.Strict             as HM
-#endif
 import qualified Data.IntMap                     as IntMap
 import           Data.List.Extra                 (groupSortOn)
 import qualified Data.List.NonEmpty              as NonEmpty
@@ -185,20 +179,12 @@ renderStackYaml p ignoredPackages dupPackages =
            B.byteString headerHelp
         <> B.byteString "\n\n"
         <> F.foldMap (goComment o) comments
-#if MIN_VERSION_aeson(2,0,0)
         <> goOthers (o `KeyMap.difference` KeyMap.fromList comments)
-#else
-        <> goOthers (o `HM.difference` HM.fromList comments)
-#endif
         <> B.byteString footerHelp
         <> "\n"
 
     goComment o (name, comment) =
-#if MIN_VERSION_aeson(2,0,0)
         case (convert <$> KeyMap.lookup name o) <|> nonPresentValue name of
-#else
-        case (convert <$> HM.lookup name o) <|> nonPresentValue name of
-#endif
             Nothing -> assert (name == "user-message") mempty
             Just v ->
                 B.byteString comment <>
@@ -242,11 +228,7 @@ renderStackYaml p ignoredPackages dupPackages =
         | otherwise = ""
 
     goOthers o
-#if MIN_VERSION_aeson(2,0,0)
         | KeyMap.null o = mempty
-#else
-        | HM.null o = mempty
-#endif
         | otherwise = assert False $ B.byteString $ Yaml.encode o
 
     -- Per Section Help

src/Stack/New.hs

@@ -1,6 +1,5 @@
 {-# LANGUAGE NoImplicitPrelude   #-}
 {-# LANGUAGE ConstraintKinds     #-}
-{-# LANGUAGE CPP                 #-}
 {-# LANGUAGE DeriveDataTypeable  #-}
 {-# LANGUAGE FlexibleContexts    #-}
 {-# LANGUAGE OverloadedStrings   #-}
@@ -19,9 +18,7 @@ module Stack.New
 import           Stack.Prelude
 import           Control.Monad.Trans.Writer.Strict
 import           Data.Aeson as A
-#if MIN_VERSION_aeson(2,0,0)
 import qualified Data.Aeson.KeyMap as KeyMap
-#endif
 import qualified Data.ByteString.Base64 as B64
 import           Data.ByteString.Builder (lazyByteString)
 import qualified Data.ByteString.Lazy as LB
@@ -44,9 +41,6 @@ import           Stack.Constants
 import           Stack.Constants.Config
 import           Stack.Types.Config
 import           Stack.Types.TemplateName
-#if !MIN_VERSION_aeson(2,0,0)
-import qualified RIO.HashMap as HM
-#endif
 import           RIO.Process
 import qualified Text.Mustache as Mustache
 import qualified Text.Mustache.Render as Mustache
@@ -215,11 +209,7 @@ settingsFromRepoTemplatePath (RepoTemplatePath Github user name) =
     , tplExtract = \bs -> do
         decodedJson <- eitherDecode (LB.fromStrict bs)
         case decodedJson of
-#if MIN_VERSION_aeson(2,0,0)
           Object o | Just (String content) <- KeyMap.lookup "content" o -> do
-#else
-          Object o | Just (String content) <- HM.lookup "content" o -> do
-#endif
                        let noNewlines = T.filter (/= '\n')
                        bsContent <- B64.decode $ T.encodeUtf8 (noNewlines content)
                        mapLeft show $ decodeUtf8' bsContent

src/Stack/Options/Completion.hs

@@ -1,5 +1,4 @@
 {-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE CPP               #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TupleSections     #-}
 
@@ -17,9 +16,6 @@ import           Data.Maybe
 import qualified Data.Set as Set
 import qualified Data.Text as T
 import qualified Distribution.PackageDescription as C
-#if !MIN_VERSION_Cabal(3,4,0)
-import qualified Distribution.Types.UnqualComponentName as C
-#endif
 import           Options.Applicative
 import           Options.Applicative.Builder.Extra
 import           Stack.Constants (ghcShowOptionsOutput)