Remove useless PackageId parameter

It is now in the Reader part of CheckM monad.
ffaf1 · Jun 19, 2023 · 47bcbb3 · 47bcbb3
1 parent 2177619
commit 47bcbb3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Cabal/src/Distribution/PackageDescription/Check.hs b/Cabal/src/Distribution/PackageDescription/Check.hs
@@ -309,7 +309,7 @@ checkGenericPackageDescription
       mapM_
         ( checkCondTarget
             genPackageFlags_
-            (checkExecutable (package packageDescription_) ads)
+            (checkExecutable ads)
             (const id)
         )
         condExecutables_

diff --git a/Cabal/src/Distribution/PackageDescription/Check/Target.hs b/Cabal/src/Distribution/PackageDescription/Check/Target.hs
@@ -129,12 +129,10 @@ checkForeignLib
 
 checkExecutable
   :: Monad m
-  => PackageId
-  -> [AssocDep] -- “Inherited” dependencies for PVP checks.
+  => [AssocDep] -- “Inherited” dependencies for PVP checks.
   -> Executable
   -> CheckM m ()
 checkExecutable
-  pid
   ads
   exe@( Executable
           exeName_
@@ -150,6 +148,7 @@ checkExecutable
       (null modulePath_)
       (PackageBuildImpossible (NoMainIs exeName_))
     -- This check does not apply to scripts.
+    pid <- asksCM (pnPackageId . ccNames)
     checkP
       ( pid /= fakePackageId
           && not (null modulePath_)