Skip to content

Commit 477cf79

Browse files
committed
Werror
1 parent 109954f commit 477cf79

File tree

1 file changed

+6
-6
lines changed
  • ghcide/session-loader/Development/IDE/Session

1 file changed

+6
-6
lines changed

ghcide/session-loader/Development/IDE/Session/Implicit.hs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,18 @@ implicitConfig = (fmap . first) (CradleConfig noDeps) . inferCradleTree
4343

4444

4545
inferCradleTree :: FilePath -> MaybeT IO (CradleTree a, FilePath)
46-
inferCradleTree fp =
46+
inferCradleTree start_dir =
4747
maybeItsBios
4848
-- If we have both a config file (cabal.project/stack.yaml) and a work dir
4949
-- (dist-newstyle/.stack-work), prefer that
50-
<|> (cabalExecutable >> cabalConfigDir fp >>= \dir -> cabalWorkDir dir >> pure (cabalCradle dir))
51-
<|> (stackExecutable >> stackConfigDir fp >>= \dir -> stackWorkDir dir >> stackCradle dir)
50+
<|> (cabalExecutable >> cabalConfigDir start_dir >>= \dir -> cabalWorkDir dir >> pure (cabalCradle dir))
51+
<|> (stackExecutable >> stackConfigDir start_dir >>= \dir -> stackWorkDir dir >> stackCradle dir)
5252
-- Redo the checks, but don't check for the work-dir, maybe the user hasn't run a build yet
53-
<|> (cabalExecutable >> cabalConfigDir fp >>= pure . cabalCradle)
54-
<|> (stackExecutable >> stackConfigDir fp >>= stackCradle)
53+
<|> (cabalExecutable >> cabalConfigDir start_dir >>= pure . cabalCradle)
54+
<|> (stackExecutable >> stackConfigDir start_dir >>= stackCradle)
5555

5656
where
57-
maybeItsBios = (\wdir -> (Bios (Program $ wdir </> ".hie-bios") Nothing Nothing, wdir)) <$> biosWorkDir fp
57+
maybeItsBios = (\wdir -> (Bios (Program $ wdir </> ".hie-bios") Nothing Nothing, wdir)) <$> biosWorkDir start_dir
5858

5959
stackCradle :: FilePath -> MaybeT IO (CradleTree a, FilePath)
6060
stackCradle fp = do

0 commit comments

Comments
 (0)