hlint hack.

This commit is contained in:
Kazu Yamamoto 2014-03-27 16:35:41 +09:00
parent 992013df05
commit 187f718de0
2 changed files with 4 additions and 5 deletions

View File

@ -158,7 +158,7 @@ getPackageDbPackages cdir = (getPkgDb >>= listDbPackages) `E.catch` handler
listDbPackages :: FilePath -> IO [Package]
listDbPackages pkgdir = do
files <- filter (".conf" `isSuffixOf`) <$> getDirectoryContents pkgdir
mapM extractPackage $ map (pkgdir </>) files
mapM (extractPackage . (pkgdir </>)) files
extractPackage :: FilePath -> IO Package
extractPackage pconf = do
@ -173,7 +173,7 @@ extractPackage pconf = do
parseId = parse idKey
extractId = extract idKeyLength
parse key = head . filter (key `isPrefixOf`)
extract keylen = fst . break isSpace . dropWhile isSpace . drop keylen
extract keylen = takeWhile (not . isSpace) . dropWhile isSpace . drop keylen
nameKey :: String
nameKey = "name:"

View File

@ -39,7 +39,7 @@ debug opt cradle fileName = do
, "Cabal file: " ++ cabalFile
, "GHC options: " ++ unwords gopts
, "Include directories: " ++ unwords incDir
, "Dependent packages: " ++ (intercalate ", " $ map fst pkgs)
, "Dependent packages: " ++ intercalate ", " (map fst pkgs)
]
where
currentDir = cradleCurrentDir cradle
@ -68,8 +68,7 @@ root :: Options
-> Cradle
-> FilePath -- ^ A target file.
-> Ghc String
root _ cradle _ = do
return $ rootDir ++ "\n"
root _ cradle _ = return $ rootDir ++ "\n"
where
currentDir = cradleCurrentDir cradle
mCabalDir = cradleCabalDir cradle