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

Refactoring according to hlint.

Browse Source
This commit is contained in:
Kazu Yamamoto 2013-03-03 15:57:31 +09:00
parent 8d5822d342
commit cf0fb7aacd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cradle.hs
View File

@ -38,7 +38,7 @@ findCradle Nothing = do
wdir <- getCurrentDirectory wdir <- getCurrentDirectory
cfiles <- cabalDir wdir cfiles <- cabalDir wdir
case cfiles of case cfiles of
Nothing -> return $ Cradle { Nothing -> return Cradle {
cradleCurrentDir = wdir cradleCurrentDir = wdir
, cradleCabalDir = Nothing , cradleCabalDir = Nothing
, cradleCabalFile = Nothing , cradleCabalFile = Nothing
@ -49,7 +49,7 @@ findCradle Nothing = do
conf = packageConfName sbox strver conf = packageConfName sbox strver
confOpts = ghcPackageConfOptions ver conf confOpts = ghcPackageConfOptions ver conf
exist <- doesFileExist conf exist <- doesFileExist conf
return $ Cradle { return Cradle {
cradleCurrentDir = wdir cradleCurrentDir = wdir
, cradleCabalDir = Just cdir , cradleCabalDir = Just cdir
, cradleCabalFile = Just cfile , cradleCabalFile = Just cfile
@ -72,7 +72,7 @@ ghcVersion :: IO (String, Int)
ghcVersion = ghcVer >>= toTupple ghcVersion = ghcVer >>= toTupple
where where
ghcVer = programFindVersion ghcProgram silent (programName ghcProgram) ghcVer = programFindVersion ghcProgram silent (programName ghcProgram)
toTupple Nothing = throwIO $ userError $ "ghc not found" toTupple Nothing = throwIO $ userError "ghc not found"
toTupple (Just v) toTupple (Just v)
| length vs < 2 = return (verstr, 0) | length vs < 2 = return (verstr, 0)
| otherwise = return (verstr, ver) | otherwise = return (verstr, ver)