clean up and fix test suite compilation

Author: leana8959

Cabal-described/src/Distribution/Described.hs

@@ -73,6 +73,7 @@ import Distribution.PackageDescription.FieldGrammar (CompatLicenseFile, CompatDa
 import Distribution.FieldGrammar.Newtypes
 import Distribution.ModuleName                     (ModuleName)
 import Distribution.System                         (Arch, OS, knownArches, knownOSs)
+import Distribution.Types.Annotation
 import Distribution.Types.AbiDependency            (AbiDependency)
 import Distribution.Types.AbiHash                  (AbiHash)
 import Distribution.Types.BenchmarkType            (BenchmarkType)

Cabal-tests/tests/HackageTests.hs

@@ -189,7 +189,7 @@ parseParsecTest keepGoing fpath bs = do
 parseParsecTest' :: Bool -> FilePath -> B.ByteString -> IO ParsecResult
 parseParsecTest' keepGoing fpath bs = do
     let (warnings, result) = Parsec.runParseResult $
-                             withSource (PCabalFile (fpath, bs)) $ Parsec.parseGenericPackageDescription @Conc bs
+                             withSource (PCabalFile (fpath, bs)) $ Parsec.parseGenericPackageDescriptionPrim @Conc bs
 
     let w | null warnings = 0
           | otherwise     = 1
@@ -364,7 +364,7 @@ roundtripTest testFieldsTransform fpath bs = do
     parse :: String -> B8.ByteString -> IO (GenericPackageDescriptionWith Conc)
     parse phase c = do
         let (_, x') = Parsec.runParseResult $
-                      withSource (PCabalFile (fpath, c)) $ (Parsec.parseGenericPackageDescription @Conc) c
+                      withSource (PCabalFile (fpath, c)) $ (Parsec.parseGenericPackageDescriptionPrim @Conc) c
         case x' of
             Right gpd -> pure gpd
             Left (_, errs) -> do

Cabal-tests/tests/NoThunks.hs

@@ -35,6 +35,7 @@ import Test.Tasty                             (defaultMain, testGroup)
 import Test.Tasty.HUnit                       (assertFailure, testCase)
 
 import Distribution.PackageDescription
+import Distribution.Parsec.Position
 
 import qualified Data.ByteString      as BS
 import qualified Distribution.License as License
@@ -119,6 +120,8 @@ instance NoThunks UnqualComponentName
 instance NoThunks Version
 instance NoThunks VersionRange
 
+instance NoThunks Position
+
 instance NoThunks ShortText where
 
 instance NoThunks a => NoThunks (PerCompilerFlavor a)

Cabal-tests/tests/custom-setup/CabalDoctestSetup.hs

@@ -98,8 +98,8 @@ import Data.String
 import Distribution.Package
        (InstalledPackageId, Package (..))
 import Distribution.PackageDescription
-       (BuildInfo, Executable (..), GenericPackageDescription,
-       Library, LibraryWith (..), PackageDescription, TestSuite (..), BuildInfoWith (..))
+       (BuildInfoWith (..), Executable, ExecutableWith (..), GenericPackageDescription,
+       Library, LibraryWith (..), PackageDescription, TestSuiteWith (..), BuildInfoWith (..))
 import Distribution.Simple
        (UserHooks (..), autoconfUserHooks, defaultMainWithHooks,
        simpleUserHooks)
@@ -142,7 +142,7 @@ import Distribution.Types.UnqualComponentName
 
 -- For amendGPD
 import Distribution.PackageDescription
-       (CondTreeWith (..))
+       (CondTree (..))
 import Distribution.Types.GenericPackageDescription
        (GenericPackageDescriptionWith (condTestSuites))
 

Cabal/src/Distribution/Simple/PackageDescription.hs

@@ -1,5 +1,4 @@
 {-# LANGUAGE DataKinds #-}
-{-# LANGUAGE TypeApplications #-}
 
 -----------------------------------------------------------------------------
 

cabal-testsuite/src/Test/Cabal/Plan.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# OPTIONS_GHC -Wno-orphans #-}