[commit: ghc] ghc-7.4: Update safe haskell error/warn formatting (95dc4ec)

[Paolo Capriotti]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : ghc-7.4

http://hackage.haskell.org/trac/ghc/changeset/95dc4ecf58d84c2076991b5fb538342451940fa5

>---------------------------------------------------------------

commit 95dc4ecf58d84c2076991b5fb538342451940fa5
Author: David Terei <davidterei at gmail.com>
Date:   Tue Apr 3 12:37:30 2012 -0700

    Update safe haskell error/warn formatting

>---------------------------------------------------------------

 compiler/main/HscMain.hs |   29 +++++++++++++----------------
 1 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/compiler/main/HscMain.hs b/compiler/main/HscMain.hs
index 15a175f..f8e2b5d 100644
--- a/compiler/main/HscMain.hs
+++ b/compiler/main/HscMain.hs
@@ -1011,8 +1011,8 @@ hscCheckSafe' dflags m l = do
         case iface of
             -- can't load iface to check trust!
             Nothing -> throwErrors $ unitBag $ mkPlainErrMsg l
-                        $ text "Can't load the interface file for" <+> ppr m <>
-                          text ", to check that it can be safely imported"
+                         $ text "Can't load the interface file for" <+> ppr m
+                           <> text ", to check that it can be safely imported"
 
             -- got iface, check trust
             Just iface' -> do
@@ -1026,18 +1026,19 @@ hscCheckSafe' dflags m l = do
                     -- General errors we throw but Safe errors we log
                     (True, True ) -> return $ trust == Sf_Trustworthy
                     (True, False) -> liftIO . throwIO $ pkgTrustErr
-                    (False, _   ) -> logWarnings modTrustErr >> return (trust == Sf_Trustworthy)
+                    (False, _   ) -> logWarnings modTrustErr
+                                     >> return (trust == Sf_Trustworthy)
 
                 where
                     pkgTrustErr = mkSrcErr $ unitBag $ mkPlainErrMsg l $
-                        sep [ ppr (moduleName m) <> text ":"
-                            , text "Can't be safely imported!"
+                        sep [ ppr (moduleName m)
+                                <> text ": Can't be safely imported!"
                             , 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 $
-                        sep [ ppr (moduleName m) <> text ":"
-                            , text "Can't be safely imported!"
+                        sep [ ppr (moduleName m)
+                                <> text ": Can't be safely imported!"
                             , text "The module itself isn't safe." ]
 
     -- | Check the package a module resides in is trusted. Safe compiled
@@ -1081,8 +1082,8 @@ checkPkgTrust dflags pkgs =
             = Nothing
             | otherwise
             = Just $ mkPlainErrMsg noSrcSpan
-                   $ text "The package (" <> ppr pkg <> text ") is required"
-                  <> text " to be trusted but it isn't!"
+                   $ text "The package (" <> ppr pkg <> text ") is required" <>
+                     text " to be trusted but it isn't!"
 
 -- | Set module to unsafe and wipe trust information.
 --
@@ -1106,19 +1107,15 @@ wipeTrust tcg_env whyUnsafe = do
     whyUnsafe' df = vcat [ text "Warning:" <+> quotes pprMod
                              <+> text "has been infered as unsafe!"
                        , text "Reason:"
-                       , nest 4 $
-                           (vcat $ badFlags df) $+$
-                           (vcat $ pprErrMsgBagWithLoc whyUnsafe)
+                       , nest 4 $ (vcat $ badFlags df) $+$
+                                  (vcat $ pprErrMsgBagWithLoc whyUnsafe)
                        ]
-
     badFlags df   = concat $ map (badFlag df) unsafeFlags
-
     badFlag df (str,loc,on,_)
         | on df     = [mkLocMessage (loc df) $
                             text str <+> text "is not allowed in Safe Haskell"]
         | otherwise = []
 
-
 --------------------------------------------------------------
 -- Simplifiers
 --------------------------------------------------------------