Commit 616dd87f authored by Duncan Coutts's avatar Duncan Coutts Committed by Edward Z. Yang
Browse files

Fix a few minor issues spotted in code review

parent da728988
......@@ -107,7 +107,7 @@ pprPackageConfig InstalledPackageInfo {..} =
field "trusted" (ppr trusted),
field "import-dirs" (fsep (map text importDirs)),
field "library-dirs" (fsep (map text libraryDirs)),
field "hs-libraries" (fsep (map text hsLibraries)),
field "hs-libraries" (fsep (map text hsLibraries)),
field "extra-libraries" (fsep (map text extraLibraries)),
field "extra-ghci-libraries" (fsep (map text extraGHCiLibraries)),
field "include-dirs" (fsep (map text includeDirs)),
......
......@@ -1363,7 +1363,8 @@ add_package pkg_db ipid_map ps (p, mb_parent)
| Just pid <- Map.lookup ipid ipid_map
= add_package pkg_db ipid_map ps (pid, Just p)
| otherwise
= Failed (missingPackageMsg ipid <> missingDependencyMsg mb_parent)
= Failed (missingPackageMsg ipid
<> missingDependencyMsg mb_parent)
missingPackageErr :: Outputable pkgid => DynFlags -> pkgid -> IO a
missingPackageErr dflags p
......
......@@ -57,7 +57,6 @@ import Control.Concurrent
import qualified Data.ByteString.Char8 as BS
import Data.Binary as Bin
--import qualified Data.Binary.Get as Bin
#if defined(mingw32_HOST_OS)
-- mingw32 needs these for getExecDir
......@@ -2141,4 +2140,4 @@ instance Binary PackageKey where
case n of
0 -> do a <- get; b <- get; c <- get; return (PackageKey a b c)
1 -> do a <- get; return (OldPackageKey a)
_ -> error ("Binary PackageKey: bad branch " ++ show n)
_ -> fail ("Binary PackageKey: bad branch " ++ show n)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment