-addShortErrLocLine :: SrcLoc -> Message -> ErrMsg
-addErrLocHdrLine :: SrcLoc -> Message -> Message -> ErrMsg
-addWarnLocHdrLine :: SrcLoc -> Message -> Message -> ErrMsg
-addShortWarnLocLine :: SrcLoc -> Message -> WarnMsg
-
-addShortErrLocLine locn rest_of_err_msg
- | isGoodSrcLoc locn = (locn, hang (ppr locn <> colon) 4
- rest_of_err_msg)
- | otherwise = (locn, rest_of_err_msg)
-
-addErrLocHdrLine locn hdr rest_of_err_msg
- = ( locn
- , hang (ppr locn <> colon<+> hdr)
- 4 rest_of_err_msg
- )
-
-addWarnLocHdrLine locn hdr rest_of_err_msg
- = ( locn
- , hang (ppr locn <> colon <+> ptext SLIT("Warning:") <+> hdr)
- 4 (rest_of_err_msg)
- )
-
-addShortWarnLocLine locn rest_of_err_msg
- | isGoodSrcLoc locn = (locn, hang (ppr locn <> colon) 4
- (ptext SLIT("Warning:") <+> rest_of_err_msg))
- | otherwise = (locn, rest_of_err_msg)
+addShortErrLocLine :: SrcLoc -> PrintUnqualified -> Message -> ErrMsg
+addShortWarnLocLine :: SrcLoc -> PrintUnqualified -> Message -> WarnMsg
+ -- Used heavily by renamer/typechecker
+ -- Be refined about qualification, return an ErrMsg