diff options
| author | Iavor S. Diatchki <iavor.diatchki@gmail.com> | 2012-03-19 20:11:50 -0700 |
|---|---|---|
| committer | Iavor S. Diatchki <iavor.diatchki@gmail.com> | 2012-03-19 20:11:50 -0700 |
| commit | deed56f4473d93a40159ea5422d1840512952f3f (patch) | |
| tree | 1e8363871d12bbf18f4899bae4f5b6e9124278a6 /compiler/utils | |
| parent | 62b25ec4d4654151ff36641b23adb7422e36da00 (diff) | |
| parent | d7bd9ee63968f6e4df6b32eff8ff11d866dca794 (diff) | |
| download | haskell-deed56f4473d93a40159ea5422d1840512952f3f.tar.gz | |
Merge remote-tracking branch 'origin/master' into type-nats
Diffstat (limited to 'compiler/utils')
| -rw-r--r-- | compiler/utils/Outputable.lhs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/utils/Outputable.lhs b/compiler/utils/Outputable.lhs index b96ae5e063..b58fcd4817 100644 --- a/compiler/utils/Outputable.lhs +++ b/compiler/utils/Outputable.lhs @@ -958,10 +958,9 @@ warnPprTrace :: Bool -> String -> Int -> SDoc -> a -> a warnPprTrace _ _file _line _msg x | opt_NoDebugOutput = x warnPprTrace False _file _line _msg x = x warnPprTrace True file line msg x - = pprDebugAndThen trace "WARNING:" doc x + = pprDebugAndThen trace str msg x where - doc = sep [hsep [text "WARNING: file", text file, text "line", int line], - msg] + str = showSDoc (hsep [text "WARNING: file", text file <> comma, text "line", int line]) assertPprPanic :: String -> Int -> SDoc -> a -- ^ Panic with an assertation failure, recording the given file and line number. |