hasufell/ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove some redundant calls to withCabal

Browse Source 
`chCached` already handles that
This commit is contained in:
Daniel Gröber 2015-11-26 16:19:50 +01:00
parent 412cee9abf
commit 0d97646694
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Language/Haskell/GhcMod/CabalHelper.hs
View File

@ -60,7 +60,7 @@ getGhcMergedPkgOptions = chCached $ \distdir -> Cached {
cacheLens = Just (lGmcMergedPkgOptions . lGmCaches), cacheLens = Just (lGmcMergedPkgOptions . lGmCaches),
cacheFile = mergedPkgOptsCacheFile distdir, cacheFile = mergedPkgOptsCacheFile distdir,
cachedAction = \_tcf (_progs, _projdir, _ver) _ma -> do cachedAction = \_tcf (_progs, _projdir, _ver) _ma -> do
opts <- withCabal $ runCHQuery ghcMergedPkgOptions opts <- runCHQuery ghcMergedPkgOptions
return ([setupConfigPath distdir], opts) return ([setupConfigPath distdir], opts)
} }
@ -70,7 +70,7 @@ getCabalPackageDbStack = chCached $ \distdir -> Cached {
cacheFile = pkgDbStackCacheFile distdir, cacheFile = pkgDbStackCacheFile distdir,
cachedAction = \_tcf (_progs, _projdir, _ver) _ma -> do cachedAction = \_tcf (_progs, _projdir, _ver) _ma -> do
crdl <- cradle crdl <- cradle
dbs <- withCabal $ map chPkgToGhcPkg <$> dbs <- map chPkgToGhcPkg <$>
runCHQuery packageDbStack runCHQuery packageDbStack
return ([setupConfigFile crdl, sandboxConfigFile crdl], dbs) return ([setupConfigFile crdl, sandboxConfigFile crdl], dbs)
} }