diff options
Diffstat (limited to 'compiler/GHC/Rename')
| -rw-r--r-- | compiler/GHC/Rename/Module.hs | 2 | ||||
| -rw-r--r-- | compiler/GHC/Rename/Names.hs | 4 | ||||
| -rw-r--r-- | compiler/GHC/Rename/Utils.hs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/compiler/GHC/Rename/Module.hs b/compiler/GHC/Rename/Module.hs index bc2c7d3d5d..8ac2d1a485 100644 --- a/compiler/GHC/Rename/Module.hs +++ b/compiler/GHC/Rename/Module.hs @@ -1987,7 +1987,7 @@ rnInjectivityAnn tvBndrs (L _ (TyVarSig _ resTv)) ; when (noRnErrors && not (Set.null rhsValid)) $ do { let errorVars = Set.toList rhsValid ; addErrAt srcSpan $ ( hsep - [ text "Unknown type variable" <> plural errorVars + [ text "Unknown type" <+> plural "variable" errorVars , text "on the RHS of injectivity condition:" , interpp'SP errorVars ] ) } diff --git a/compiler/GHC/Rename/Names.hs b/compiler/GHC/Rename/Names.hs index ed08087899..1fe8522040 100644 --- a/compiler/GHC/Rename/Names.hs +++ b/compiler/GHC/Rename/Names.hs @@ -1701,8 +1701,8 @@ badImportItemErrDataCon :: OccName -> ModIface -> ImpDeclSpec -> IE GhcPs -> SDoc badImportItemErrDataCon dataType_occ iface decl_spec ie = vcat [ text "In module" - <+> quotes (ppr (is_mod decl_spec)) - <+> source_import <> colon + <+> (quotes (ppr (is_mod decl_spec)) <+> source_import) + <> colon , nest 2 $ quotes datacon <+> text "is a data constructor of" <+> quotes dataType diff --git a/compiler/GHC/Rename/Utils.hs b/compiler/GHC/Rename/Utils.hs index 3c4f5d065f..b7811b9987 100644 --- a/compiler/GHC/Rename/Utils.hs +++ b/compiler/GHC/Rename/Utils.hs @@ -408,7 +408,7 @@ addNameClashErrRn rdr_name gres shadowedNameWarn :: OccName -> [SDoc] -> SDoc shadowedNameWarn occ shadowed_locs = sep [text "This binding for" <+> quotes (ppr occ) - <+> text "shadows the existing binding" <> plural shadowed_locs, + <+> text "shadows the existing" <+> plural "binding" shadowed_locs, nest 2 (vcat shadowed_locs)] |