summaryrefslogtreecommitdiff
path: root/compiler
diff options
context:
space:
mode:
authorChristiaan Baaij <christiaan.baaij@gmail.com>2021-06-24 19:39:51 +0200
committerMarge Bot <ben+marge-bot@smart-cactus.org>2021-09-17 09:35:18 -0400
commit885f17c89919d21815365da71eb7f9c489e5bfa3 (patch)
treef58aa1111ef2d229b3568a0ef00db6ec24ce8574 /compiler
parent64923cf295ea914db458547432237a5ed1eff571 (diff)
downloadhaskell-885f17c89919d21815365da71eb7f9c489e5bfa3.tar.gz
Improve error messages involving operators from Data.Type.Ord
Fixes #20009
Diffstat (limited to 'compiler')
-rw-r--r--compiler/GHC/Builtin/Names.hs13
1 files changed, 7 insertions, 6 deletions
diff --git a/compiler/GHC/Builtin/Names.hs b/compiler/GHC/Builtin/Names.hs
index 913b8a4ed9..d5da296cb6 100644
--- a/compiler/GHC/Builtin/Names.hs
+++ b/compiler/GHC/Builtin/Names.hs
@@ -559,7 +559,7 @@ gHC_PRIM, gHC_PRIM_PANIC, gHC_PRIM_EXCEPTION,
tYPEABLE, tYPEABLE_INTERNAL, gENERICS,
rEAD_PREC, lEX, gHC_INT, gHC_WORD, mONAD, mONAD_FIX, mONAD_ZIP, mONAD_FAIL,
aRROW, gHC_DESUGAR, rANDOM, gHC_EXTS,
- cONTROL_EXCEPTION_BASE, gHC_TYPELITS, gHC_TYPELITS_INTERNAL,
+ cONTROL_EXCEPTION_BASE, gHC_TYPEERROR, gHC_TYPELITS, gHC_TYPELITS_INTERNAL,
gHC_TYPENATS, gHC_TYPENATS_INTERNAL,
dATA_COERCE, dEBUG_TRACE, uNSAFE_COERCE :: Module
@@ -621,6 +621,7 @@ rANDOM = mkBaseModule (fsLit "System.Random")
gHC_EXTS = mkBaseModule (fsLit "GHC.Exts")
cONTROL_EXCEPTION_BASE = mkBaseModule (fsLit "Control.Exception.Base")
gHC_GENERICS = mkBaseModule (fsLit "GHC.Generics")
+gHC_TYPEERROR = mkBaseModule (fsLit "GHC.TypeError")
gHC_TYPELITS = mkBaseModule (fsLit "GHC.TypeLits")
gHC_TYPELITS_INTERNAL = mkBaseModule (fsLit "GHC.TypeLits.Internal")
gHC_TYPENATS = mkBaseModule (fsLit "GHC.TypeNats")
@@ -1455,19 +1456,19 @@ errorMessageTypeErrorFamName
:: Name
errorMessageTypeErrorFamName =
- tcQual gHC_TYPELITS (fsLit "TypeError") errorMessageTypeErrorFamKey
+ tcQual gHC_TYPEERROR (fsLit "TypeError") errorMessageTypeErrorFamKey
typeErrorTextDataConName =
- dcQual gHC_TYPELITS (fsLit "Text") typeErrorTextDataConKey
+ dcQual gHC_TYPEERROR (fsLit "Text") typeErrorTextDataConKey
typeErrorAppendDataConName =
- dcQual gHC_TYPELITS (fsLit ":<>:") typeErrorAppendDataConKey
+ dcQual gHC_TYPEERROR (fsLit ":<>:") typeErrorAppendDataConKey
typeErrorVAppendDataConName =
- dcQual gHC_TYPELITS (fsLit ":$$:") typeErrorVAppendDataConKey
+ dcQual gHC_TYPEERROR (fsLit ":$$:") typeErrorVAppendDataConKey
typeErrorShowTypeDataConName =
- dcQual gHC_TYPELITS (fsLit "ShowType") typeErrorShowTypeDataConKey
+ dcQual gHC_TYPEERROR (fsLit "ShowType") typeErrorShowTypeDataConKey
-- Unsafe coercion proofs
unsafeEqualityProofName, unsafeEqualityTyConName, unsafeCoercePrimName,