diff options
| author | Duncan Coutts <duncan@well-typed.com> | 2014-08-23 13:12:20 +0100 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2014-08-29 12:39:04 +0100 |
| commit | 29f84d30e3283c3da50c7c37a544672db5eee2b7 (patch) | |
| tree | 327494b9dcab9d7ddb43589e18622ef8f09e6963 /compiler/ghci | |
| parent | 6930a88c307825d95f22ed9cb8ba3c894b600905 (diff) | |
| download | haskell-29f84d30e3283c3da50c7c37a544672db5eee2b7.tar.gz | |
Fix long lines and trailing whitespace
in the previous patches in this series
Diffstat (limited to 'compiler/ghci')
| -rw-r--r-- | compiler/ghci/Linker.lhs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/compiler/ghci/Linker.lhs b/compiler/ghci/Linker.lhs index f581f9f59a..d4de513ba8 100644 --- a/compiler/ghci/Linker.lhs +++ b/compiler/ghci/Linker.lhs @@ -1117,7 +1117,8 @@ linkPackage dflags pkg objs = [ obj | Object obj <- classifieds ] archs = [ arch | Archive arch <- classifieds ] - maybePutStr dflags ("Loading package " ++ sourcePackageIdString pkg ++ " ... ") + maybePutStr dflags + ("Loading package " ++ sourcePackageIdString pkg ++ " ... ") -- See comments with partOfGHCi when (packageName pkg `notElem` partOfGHCi) $ do @@ -1132,8 +1133,11 @@ linkPackage dflags pkg maybePutStr dflags "linking ... " ok <- resolveObjs - if succeeded ok then maybePutStrLn dflags "done." - else throwGhcExceptionIO (InstallationError ("unable to load package `" ++ sourcePackageIdString pkg ++ "'")) + if succeeded ok + then maybePutStrLn dflags "done." + else let errmsg = "unable to load package `" + ++ sourcePackageIdString pkg ++ "'" + in throwGhcExceptionIO (InstallationError errmsg) -- we have already searched the filesystem; the strings passed to load_dyn -- can be passed directly to loadDLL. They are either fully-qualified |