diff options
| author | Vladislav Zavialov <vlad.z.4096@gmail.com> | 2020-04-13 16:29:44 +0300 |
|---|---|---|
| committer | Vladislav Zavialov <vlad.z.4096@gmail.com> | 2020-04-23 17:21:28 +0300 |
| commit | e21f3023b095d9bbd000330b56aaaa2977134335 (patch) | |
| tree | e4f66eb46539c3d62b47648297915d19d8105f6a /compiler/GHC/Rename/Module.hs | |
| parent | 8ea37b01b6ab16937f7b528b6bbae9fade9f1361 (diff) | |
| download | haskell-wip/semigroup-sdoc.tar.gz | |
Use Semigroup's (<>) for Doc/SDocwip/semigroup-sdoc
Before this patch, Outputable.hs defined its own (<>) which caused
conflicts with (Data.Semigroup.<>) and thus led to inconvenience.
However, replacing it is not trivial due to a different fixity:
http://www.haskell.org/pipermail/libraries/2011-November/017066.html
Nevertheless, it is possible to update the pretty-printing code to work
with (<>) of a different fixitiy, and that's what this patch implements.
Now Doc and SDoc are instances of Semigroup.
Diffstat (limited to 'compiler/GHC/Rename/Module.hs')
| -rw-r--r-- | compiler/GHC/Rename/Module.hs | 2 |
1 files changed, 1 insertions, 1 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 ] ) } |