Commit 7ed67597 authored by dterei's avatar dterei

Update safe haskell error/warn formatting

parent c690214d
...@@ -1031,8 +1031,8 @@ hscCheckSafe' dflags m l = do ...@@ -1031,8 +1031,8 @@ hscCheckSafe' dflags m l = do
case iface of case iface of
-- can't load iface to check trust! -- can't load iface to check trust!
Nothing -> throwErrors $ unitBag $ mkPlainErrMsg l Nothing -> throwErrors $ unitBag $ mkPlainErrMsg l
$ text "Can't load the interface file for" <+> ppr m <> $ text "Can't load the interface file for" <+> ppr m
text ", to check that it can be safely imported" <> text ", to check that it can be safely imported"
-- got iface, check trust -- got iface, check trust
Just iface' -> do Just iface' -> do
...@@ -1053,14 +1053,14 @@ hscCheckSafe' dflags m l = do ...@@ -1053,14 +1053,14 @@ hscCheckSafe' dflags m l = do
where where
pkgTrustErr = mkSrcErr $ unitBag $ mkPlainErrMsg l $ pkgTrustErr = mkSrcErr $ unitBag $ mkPlainErrMsg l $
sep [ ppr (moduleName m) <> text ":" sep [ ppr (moduleName m)
, text "Can't be safely imported!" <> text ": Can't be safely imported!"
, text "The package (" <> ppr (modulePackageId m) , text "The package (" <> ppr (modulePackageId m)
<> text ") the module resides in isn't trusted." <> text ") the module resides in isn't trusted."
] ]
modTrustErr = unitBag $ mkPlainErrMsg l $ modTrustErr = unitBag $ mkPlainErrMsg l $
sep [ ppr (moduleName m) <> text ":" sep [ ppr (moduleName m)
, text "Can't be safely imported!" <> text ": Can't be safely imported!"
, text "The module itself isn't safe." ] , text "The module itself isn't safe." ]
-- | Check the package a module resides in is trusted. Safe compiled -- | Check the package a module resides in is trusted. Safe compiled
...@@ -1115,8 +1115,8 @@ checkPkgTrust dflags pkgs = ...@@ -1115,8 +1115,8 @@ checkPkgTrust dflags pkgs =
= Nothing = Nothing
| otherwise | otherwise
= Just $ mkPlainErrMsg noSrcSpan = Just $ mkPlainErrMsg noSrcSpan
$ text "The package (" <> ppr pkg <> text ") is required" $ text "The package (" <> ppr pkg <> text ") is required" <>
<> text " to be trusted but it isn't!" text " to be trusted but it isn't!"
-- | Set module to unsafe and wipe trust information. -- | Set module to unsafe and wipe trust information.
-- --
...@@ -1139,19 +1139,15 @@ wipeTrust tcg_env whyUnsafe = do ...@@ -1139,19 +1139,15 @@ wipeTrust tcg_env whyUnsafe = do
pprMod = ppr $ moduleName $ tcg_mod tcg_env pprMod = ppr $ moduleName $ tcg_mod tcg_env
whyUnsafe' df = vcat [ quotes pprMod <+> text "has been infered as unsafe!" whyUnsafe' df = vcat [ quotes pprMod <+> text "has been infered as unsafe!"
, text "Reason:" , text "Reason:"
, nest 4 $ , nest 4 $ (vcat $ badFlags df) $+$
(vcat $ badFlags df) $+$ (vcat $ pprErrMsgBagWithLoc whyUnsafe)
(vcat $ pprErrMsgBagWithLoc whyUnsafe)
] ]
badFlags df = concat $ map (badFlag df) unsafeFlags badFlags df = concat $ map (badFlag df) unsafeFlags
badFlag df (str,loc,on,_) badFlag df (str,loc,on,_)
| on df = [mkLocMessage SevOutput (loc df) $ | on df = [mkLocMessage SevOutput (loc df) $
text str <+> text "is not allowed in Safe Haskell"] text str <+> text "is not allowed in Safe Haskell"]
| otherwise = [] | otherwise = []
-------------------------------------------------------------- --------------------------------------------------------------
-- Simplifiers -- Simplifiers
-------------------------------------------------------------- --------------------------------------------------------------
......
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