projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TysWiredIn is now warning-free
[ghc-hetmet.git]
/
compiler
/
main
/
Packages.lhs
diff --git
a/compiler/main/Packages.lhs
b/compiler/main/Packages.lhs
index
d10d873
..
c6b208c
100644
(file)
--- a/
compiler/main/Packages.lhs
+++ b/
compiler/main/Packages.lhs
@@
-19,7
+19,6
@@
module Packages (
-- * Inspecting the set of packages in scope
getPackageIncludePath,
-- * Inspecting the set of packages in scope
getPackageIncludePath,
- getPackageCIncludes,
getPackageLibraryPath,
getPackageLinkOpts,
getPackageExtraCcOpts,
getPackageLibraryPath,
getPackageLinkOpts,
getPackageExtraCcOpts,
@@
-46,7
+45,6
@@
import Util
import Maybes ( expectJust, MaybeErr(..) )
import Panic
import Outputable
import Maybes ( expectJust, MaybeErr(..) )
import Panic
import Outputable
-import Pretty ( Doc )
import System.Environment ( getEnv )
import Distribution.InstalledPackageInfo
import System.Environment ( getEnv )
import Distribution.InstalledPackageInfo
@@
-347,9
+345,9
@@
hideOldPackages dflags pkgs = mapM maybe_hide pkgs
| not (exposed p) = return p
| (p' : _) <- later_versions = do
debugTraceMsg dflags 2 $
| not (exposed p) = return p
| (p' : _) <- later_versions = do
debugTraceMsg dflags 2 $
- (ptext SLIT("hiding package") <+>
+ (ptext (sLit "hiding package") <+>
text (showPackageId (package p)) <+>
text (showPackageId (package p)) <+>
- ptext SLIT("to avoid conflict with later version") <+>
+ ptext (sLit "to avoid conflict with later version") <+>
text (showPackageId (package p')))
return (p {exposed=False})
| otherwise = return p
text (showPackageId (package p')))
return (p {exposed=False})
| otherwise = return p
@@
-410,15
+408,15
@@
findWiredInPackages dflags pkgs preload this_package = do
where
notfound = do
debugTraceMsg dflags 2 $
where
notfound = do
debugTraceMsg dflags 2 $
- ptext SLIT("wired-in package ")
+ ptext (sLit "wired-in package ")
<> text wired_pkg
<> text wired_pkg
- <> ptext SLIT(" not found.")
+ <> ptext (sLit " not found.")
return Nothing
pick pkg = do
debugTraceMsg dflags 2 $
return Nothing
pick pkg = do
debugTraceMsg dflags 2 $
- ptext SLIT("wired-in package ")
+ ptext (sLit "wired-in package ")
<> text wired_pkg
<> text wired_pkg
- <> ptext SLIT(" mapped to ")
+ <> ptext (sLit " mapped to ")
<> text (showPackageId (package pkg))
return (Just (package pkg))
<> text (showPackageId (package pkg))
return (Just (package pkg))
@@
-485,8
+483,8
@@
elimDanglingDeps dflags pkgs ignored = go [] pkgs'
reportElim (p, deps) =
debugTraceMsg dflags 2 $
reportElim (p, deps) =
debugTraceMsg dflags 2 $
- (ptext SLIT("package") <+> pprPkg p <+>
- ptext SLIT("will be ignored due to missing or recursive dependencies:") $$
+ (ptext (sLit "package") <+> pprPkg p <+>
+ ptext (sLit "will be ignored due to missing or recursive dependencies:") $$
nest 2 (hsep (map (text.showPackageId) deps)))
-- -----------------------------------------------------------------------------
nest 2 (hsep (map (text.showPackageId) deps)))
-- -----------------------------------------------------------------------------
@@
-594,11
+592,6
@@
getPackageIncludePath dflags pkgs = do
ps <- getPreloadPackagesAnd dflags pkgs
return (nub (filter notNull (concatMap includeDirs ps)))
ps <- getPreloadPackagesAnd dflags pkgs
return (nub (filter notNull (concatMap includeDirs ps)))
- -- includes are in reverse dependency order (i.e. rts first)
-getPackageCIncludes :: [PackageConfig] -> IO [String]
-getPackageCIncludes pkg_configs = do
- return (reverse (nub (filter notNull (concatMap includes pkg_configs))))
-
getPackageLibraryPath :: DynFlags -> [PackageId] -> IO [String]
getPackageLibraryPath dflags pkgs = do
ps <- getPreloadPackagesAnd dflags pkgs
getPackageLibraryPath :: DynFlags -> [PackageId] -> IO [String]
getPackageLibraryPath dflags pkgs = do
ps <- getPreloadPackagesAnd dflags pkgs
@@
-695,13
+688,13
@@
add_package pkg_db ps (p, mb_parent)
missingPackageErr :: String -> IO [PackageConfig]
missingPackageErr p = throwDyn (CmdLineError (showSDoc (missingPackageMsg p)))
missingPackageErr :: String -> IO [PackageConfig]
missingPackageErr p = throwDyn (CmdLineError (showSDoc (missingPackageMsg p)))
-missingPackageMsg :: String -> PprStyle -> Doc
-missingPackageMsg p = ptext SLIT("unknown package:") <+> text p
+missingPackageMsg :: String -> SDoc
+missingPackageMsg p = ptext (sLit "unknown package:") <+> text p
-missingDependencyMsg :: Maybe PackageId -> PprStyle -> Doc
+missingDependencyMsg :: Maybe PackageId -> SDoc
missingDependencyMsg Nothing = empty
missingDependencyMsg (Just parent)
missingDependencyMsg Nothing = empty
missingDependencyMsg (Just parent)
- = space <> parens (ptext SLIT("dependency of") <+> ftext (packageIdFS parent))
+ = space <> parens (ptext (sLit "dependency of") <+> ftext (packageIdFS parent))
-- -----------------------------------------------------------------------------
-- -----------------------------------------------------------------------------