Print unticked promoted data constructors (#20531)

Before this patch, GHC unconditionally printed ticks before promoted
data constructors:

	ghci> type T = True  -- unticked (user-written)
	ghci> :kind! T
	T :: Bool
	= 'True              -- ticked (compiler output)

After this patch, GHC prints ticks only when necessary:

	ghci> type F = False    -- unticked (user-written)
	ghci> :kind! F
	F :: Bool
	= False                 -- unticked (compiler output)

	ghci> data False        -- introduce ambiguity
	ghci> :kind! F
	F :: Bool
	= 'False                -- ticked by necessity (compiler output)

The old behavior can be enabled by -fprint-redundant-promotion-ticks.

Summary of changes:
* Rename PrintUnqualified to NamePprCtx
* Add QueryPromotionTick to it
* Consult the GlobalRdrEnv to decide whether to print a tick (see mkPromTick)
* Introduce -fprint-redundant-promotion-ticks

Co-authored-by: Artyom Kuznetsov <hi@wzrd.ht>

28 files changed, 47 insertions, 47 deletions

diff --git a/testsuite/tests/linear/should_fail/Linear1.stderr b/testsuite/tests/linear/should_fail/Linear1.stderr
index 8d68aff479..eed8b735b8 100644
--- a/testsuite/tests/linear/should_fail/Linear1.stderr
+++ b/testsuite/tests/linear/should_fail/Linear1.stderr
@@ -1,10 +1,10 @@
 
 Linear1.hs:10:14: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘x’
     • In an equation for ‘incorrectDup’: incorrectDup x = (x, x)
 
 Linear1.hs:14:15: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘x’
     • In an equation for ‘incorrectDrop’: incorrectDrop x = ()
diff --git a/testsuite/tests/linear/should_fail/Linear11.stderr b/testsuite/tests/linear/should_fail/Linear11.stderr
index 2ab0f3f162..7a2ceda350 100644
--- a/testsuite/tests/linear/should_fail/Linear11.stderr
+++ b/testsuite/tests/linear/should_fail/Linear11.stderr
@@ -1,12 +1,12 @@
 
 Linear11.hs:9:23: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘a’
     • In an equation for ‘incorrectUnrestricted’:
           incorrectUnrestricted a = Unrestricted a
 
 Linear11.hs:14:43: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘a’
     • In the pattern: NotUnrestricted a
       In an equation for ‘incorrectUnrestrictedDup’:
diff --git a/testsuite/tests/linear/should_fail/Linear13.stderr b/testsuite/tests/linear/should_fail/Linear13.stderr
index 62c0097b68..f4c0d79429 100644
--- a/testsuite/tests/linear/should_fail/Linear13.stderr
+++ b/testsuite/tests/linear/should_fail/Linear13.stderr
@@ -1,12 +1,12 @@
 
 Linear13.hs:6:14: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘a’
     • In an equation for ‘incorrectLet’:
           incorrectLet a = let x = a in ()
 
 Linear13.hs:9:27: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘x’
     • In an equation for ‘incorrectLetWithSignature’:
           incorrectLetWithSignature x
@@ -16,13 +16,13 @@ Linear13.hs:9:27: error: [GHC-18872]
               in ()
 
 Linear13.hs:12:20: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘x’
     • In an equation for ‘incorrectLazyMatch’:
           incorrectLazyMatch x = let (a, b) = x in b
 
 Linear13.hs:15:24: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘x’
     • In an equation for ‘incorrectCasePromotion’:
           incorrectCasePromotion x = case x of (a, b) -> b
diff --git a/testsuite/tests/linear/should_fail/Linear17.stderr b/testsuite/tests/linear/should_fail/Linear17.stderr
index 1329db16e3..41f4d209fa 100644
--- a/testsuite/tests/linear/should_fail/Linear17.stderr
+++ b/testsuite/tests/linear/should_fail/Linear17.stderr
@@ -1,6 +1,6 @@
 
 Linear17.hs:17:3: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘x’
     • In a stmt of a 'do' block: x <- ()
       In the expression:
@@ -17,7 +17,7 @@ Linear17.hs:17:3: error: [GHC-18872]
                  ....
 
 Linear17.hs:25:6: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘z’
     • In the pattern: (y, z)
       In a stmt of a 'do' block: (y, z) <- ((), x)
@@ -28,7 +28,7 @@ Linear17.hs:25:6: error: [GHC-18872]
            ()
 
 Linear17.hs:30:3: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘x’
     • In a stmt of a 'do' block: x <- ()
       In the expression:
diff --git a/testsuite/tests/linear/should_fail/Linear2.stderr b/testsuite/tests/linear/should_fail/Linear2.stderr
index b659915b9a..d7275d19ec 100644
--- a/testsuite/tests/linear/should_fail/Linear2.stderr
+++ b/testsuite/tests/linear/should_fail/Linear2.stderr
@@ -1,16 +1,16 @@
 
 Linear2.hs:9:15: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘x’
     • In an equation for ‘incorrectApp1’: incorrectApp1 x = dup (x, 0)
 
 Linear2.hs:12:17: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘x’
     • In an equation for ‘incorrectApp2’: incorrectApp2 f x = f x
 
 Linear2.hs:15:15: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘n’
     • In an equation for ‘incorrectIf’:
           incorrectIf x n = if x then n else 0
diff --git a/testsuite/tests/linear/should_fail/Linear5.stderr b/testsuite/tests/linear/should_fail/Linear5.stderr
index d6856c1174..b6e4b5a82c 100644
--- a/testsuite/tests/linear/should_fail/Linear5.stderr
+++ b/testsuite/tests/linear/should_fail/Linear5.stderr
@@ -1,5 +1,5 @@
 
 Linear5.hs:7:20: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘n’
     • In an equation for ‘incorrectEqn’: incorrectEqn False n = 0
diff --git a/testsuite/tests/linear/should_fail/Linear7.stderr b/testsuite/tests/linear/should_fail/Linear7.stderr
index fe7b58ac6a..6a89467b90 100644
--- a/testsuite/tests/linear/should_fail/Linear7.stderr
+++ b/testsuite/tests/linear/should_fail/Linear7.stderr
@@ -1,6 +1,6 @@
 
 Linear7.hs:7:16: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘n’
     • In an equation for ‘incorrectLCase’:
           incorrectLCase n
diff --git a/testsuite/tests/linear/should_fail/Linear9.stderr b/testsuite/tests/linear/should_fail/Linear9.stderr
index 34148b5817..87092b13b7 100644
--- a/testsuite/tests/linear/should_fail/Linear9.stderr
+++ b/testsuite/tests/linear/should_fail/Linear9.stderr
@@ -1,33 +1,33 @@
 
 Linear9.hs:9:17: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from a non-linear pattern
     • In the pattern: _
       In the pattern: (a, _)
       In an equation for ‘incorrectFst’: incorrectFst (a, _) = a
 
 Linear9.hs:12:20: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘b’
     • In the pattern: (a, b)
       In an equation for ‘incorrectFstVar’: incorrectFstVar (a, b) = a
 
 Linear9.hs:15:20: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘a’
     • In the pattern: (a, b)
       In an equation for ‘incorrectFirstDup’:
           incorrectFirstDup (a, b) = ((a, a), b)
 
 Linear9.hs:18:21: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from a non-linear pattern
     • In the pattern: _
       In the pattern: (a, _)
       In the pattern: ((a, _), _)
 
 Linear9.hs:18:24: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from a non-linear pattern
     • In the pattern: _
       In the pattern: ((a, _), _)
@@ -35,7 +35,7 @@ Linear9.hs:18:24: error: [GHC-18872]
           incorrectFstFst ((a, _), _) = a
 
 Linear9.hs:25:25: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from a non-linear pattern
     • In the pattern: _
       In the pattern: Foo a _
diff --git a/testsuite/tests/linear/should_fail/LinearAsPat.stderr b/testsuite/tests/linear/should_fail/LinearAsPat.stderr
index ef13389074..987993d897 100644
--- a/testsuite/tests/linear/should_fail/LinearAsPat.stderr
+++ b/testsuite/tests/linear/should_fail/LinearAsPat.stderr
@@ -1,5 +1,5 @@
 
 LinearAsPat.hs:6:12: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from a non-linear pattern
     • In an equation for ‘shouldFail’: shouldFail x@True = x
diff --git a/testsuite/tests/linear/should_fail/LinearBottomMult.stderr b/testsuite/tests/linear/should_fail/LinearBottomMult.stderr
index aa6dab87d9..e620843652 100644
--- a/testsuite/tests/linear/should_fail/LinearBottomMult.stderr
+++ b/testsuite/tests/linear/should_fail/LinearBottomMult.stderr
@@ -1,6 +1,6 @@
 
 LinearBottomMult.hs:13:3: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘x’
     • In an equation for ‘f’:
           f x = elim (U (\ (a :: Void) -> case a of {}))
diff --git a/testsuite/tests/linear/should_fail/LinearConfusedDollar.stderr b/testsuite/tests/linear/should_fail/LinearConfusedDollar.stderr
index 55022acd61..709b3b4c65 100644
--- a/testsuite/tests/linear/should_fail/LinearConfusedDollar.stderr
+++ b/testsuite/tests/linear/should_fail/LinearConfusedDollar.stderr
@@ -1,6 +1,6 @@
 
 LinearConfusedDollar.hs:12:7: error: [GHC-83865]
-    • Couldn't match type ‘'One’ with ‘'Many’
+    • Couldn't match type ‘One’ with ‘Many’
       Expected: a -> a
         Actual: a %1 -> a
     • In the first argument of ‘($)’, namely ‘f’
diff --git a/testsuite/tests/linear/should_fail/LinearIf.stderr b/testsuite/tests/linear/should_fail/LinearIf.stderr
index 122d1f9a8e..1291e40a78 100644
--- a/testsuite/tests/linear/should_fail/LinearIf.stderr
+++ b/testsuite/tests/linear/should_fail/LinearIf.stderr
@@ -1,15 +1,15 @@
 
 LinearIf.hs:13:3: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘b’
     • In an equation for ‘f’: f b x y = if b then x else y
 
 LinearIf.hs:13:5: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘x’
     • In an equation for ‘f’: f b x y = if b then x else y
 
 LinearIf.hs:13:7: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘y’
     • In an equation for ‘f’: f b x y = if b then x else y
diff --git a/testsuite/tests/linear/should_fail/LinearLazyPat.stderr b/testsuite/tests/linear/should_fail/LinearLazyPat.stderr
index cb923f9416..82fb02725b 100644
--- a/testsuite/tests/linear/should_fail/LinearLazyPat.stderr
+++ b/testsuite/tests/linear/should_fail/LinearLazyPat.stderr
@@ -1,6 +1,6 @@
 
 LinearLazyPat.hs:5:3: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from a non-linear pattern
     • In the pattern: ~(x, y)
       In an equation for ‘f’: f ~(x, y) = (y, x)
diff --git a/testsuite/tests/linear/should_fail/LinearLet.stderr b/testsuite/tests/linear/should_fail/LinearLet.stderr
index de1771f89f..5ee468376b 100644
--- a/testsuite/tests/linear/should_fail/LinearLet.stderr
+++ b/testsuite/tests/linear/should_fail/LinearLet.stderr
@@ -1,5 +1,5 @@
 
 LinearLet.hs:5:3: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘x’
     • In an equation for ‘f’: f x = let y = x in (y, y)
diff --git a/testsuite/tests/linear/should_fail/LinearPartialSig.stderr b/testsuite/tests/linear/should_fail/LinearPartialSig.stderr
index 175462f917..372be25feb 100644
--- a/testsuite/tests/linear/should_fail/LinearPartialSig.stderr
+++ b/testsuite/tests/linear/should_fail/LinearPartialSig.stderr
@@ -1,6 +1,6 @@
 
 LinearPartialSig.hs:5:9: error: [GHC-88464]
     • Found type wildcard ‘_’
-        standing for ‘'Many :: GHC.Types.Multiplicity’
+        standing for ‘Many :: GHC.Types.Multiplicity’
       To use the inferred type, enable PartialTypeSignatures
     • In the type signature: f :: a %_ -> a
diff --git a/testsuite/tests/linear/should_fail/LinearPatSyn.stderr b/testsuite/tests/linear/should_fail/LinearPatSyn.stderr
index bda38f7765..965cd086a2 100644
--- a/testsuite/tests/linear/should_fail/LinearPatSyn.stderr
+++ b/testsuite/tests/linear/should_fail/LinearPatSyn.stderr
@@ -1,6 +1,6 @@
 
 LinearPatSyn.hs:13:4: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from a non-linear pattern
     • In the pattern: P y x
       In an equation for ‘s’: s (P y x) = (y, x)
diff --git a/testsuite/tests/linear/should_fail/LinearPatternGuardWildcard.stderr b/testsuite/tests/linear/should_fail/LinearPatternGuardWildcard.stderr
index 05aea0087b..a282502d3c 100644
--- a/testsuite/tests/linear/should_fail/LinearPatternGuardWildcard.stderr
+++ b/testsuite/tests/linear/should_fail/LinearPatternGuardWildcard.stderr
@@ -1,5 +1,5 @@
 
 LinearPatternGuardWildcard.hs:7:15: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘x’
     • In an equation for ‘unsafeConsume’: unsafeConsume x | _ <- x = ()
diff --git a/testsuite/tests/linear/should_fail/LinearRecordUpdate.stderr b/testsuite/tests/linear/should_fail/LinearRecordUpdate.stderr
index faf82f690e..aedea4cdf1 100644
--- a/testsuite/tests/linear/should_fail/LinearRecordUpdate.stderr
+++ b/testsuite/tests/linear/should_fail/LinearRecordUpdate.stderr
@@ -1,5 +1,5 @@
 
 LinearRecordUpdate.hs:8:12: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘r’
     • In an equation for ‘shouldFail’: shouldFail r = r {y = False}
diff --git a/testsuite/tests/linear/should_fail/LinearRole.stderr b/testsuite/tests/linear/should_fail/LinearRole.stderr
index edeb98d84d..61af066460 100644
--- a/testsuite/tests/linear/should_fail/LinearRole.stderr
+++ b/testsuite/tests/linear/should_fail/LinearRole.stderr
@@ -1,6 +1,6 @@
 
 LinearRole.hs:12:7: error: [GHC-18872]
-    • Couldn't match type ‘'One’ with ‘'Many’
+    • Couldn't match type ‘One’ with ‘Many’
         arising from a use of ‘coerce’
     • In the expression: coerce x
       In an equation for ‘f’: f x = coerce x
diff --git a/testsuite/tests/linear/should_fail/LinearSeq.stderr b/testsuite/tests/linear/should_fail/LinearSeq.stderr
index 2ed15de260..2b47ecc915 100644
--- a/testsuite/tests/linear/should_fail/LinearSeq.stderr
+++ b/testsuite/tests/linear/should_fail/LinearSeq.stderr
@@ -1,5 +1,5 @@
 
 LinearSeq.hs:6:5: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘x’
     • In an equation for ‘bad’: bad x = seq x ()
diff --git a/testsuite/tests/linear/should_fail/LinearSequenceExpr.stderr b/testsuite/tests/linear/should_fail/LinearSequenceExpr.stderr
index 9c04ee212a..b6cb36f8b7 100644
--- a/testsuite/tests/linear/should_fail/LinearSequenceExpr.stderr
+++ b/testsuite/tests/linear/should_fail/LinearSequenceExpr.stderr
@@ -1,10 +1,10 @@
 
 LinearSequenceExpr.hs:7:3: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘x’
     • In an equation for ‘f’: f x y = [x .. y]
 
 LinearSequenceExpr.hs:7:5: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘y’
     • In an equation for ‘f’: f x y = [x .. y]
diff --git a/testsuite/tests/linear/should_fail/LinearTHFail.stderr b/testsuite/tests/linear/should_fail/LinearTHFail.stderr
index 90ddb47e38..7570fcb546 100644
--- a/testsuite/tests/linear/should_fail/LinearTHFail.stderr
+++ b/testsuite/tests/linear/should_fail/LinearTHFail.stderr
@@ -1,6 +1,6 @@
 
 LinearTHFail.hs:8:3: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘x’
     • In an equation for ‘f’:
           f x
@@ -8,6 +8,6 @@ LinearTHFail.hs:8:3: error: [GHC-18872]
               pending(rn) [<spn, x>]
 
 LinearTHFail.hs:11:3: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘x’
     • In an equation for ‘g’: g x = [|| Just $$x ||]
diff --git a/testsuite/tests/linear/should_fail/LinearVar.stderr b/testsuite/tests/linear/should_fail/LinearVar.stderr
index e327454936..bb01d563f3 100644
--- a/testsuite/tests/linear/should_fail/LinearVar.stderr
+++ b/testsuite/tests/linear/should_fail/LinearVar.stderr
@@ -1,6 +1,6 @@
 
 LinearVar.hs:5:5: error: [GHC-25897]
-    • Couldn't match type ‘m’ with ‘'Many’
+    • Couldn't match type ‘m’ with ‘Many’
       Expected: a %m -> b
         Actual: a -> b
       ‘m’ is a rigid type variable bound by
diff --git a/testsuite/tests/linear/should_fail/LinearViewPattern.stderr b/testsuite/tests/linear/should_fail/LinearViewPattern.stderr
index d923a5eefd..cbd3cd9595 100644
--- a/testsuite/tests/linear/should_fail/LinearViewPattern.stderr
+++ b/testsuite/tests/linear/should_fail/LinearViewPattern.stderr
@@ -1,6 +1,6 @@
 
 LinearViewPattern.hs:11:4: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from a non-linear pattern
     • In the pattern: not -> True
       In an equation for ‘f’: f (not -> True) = True
diff --git a/testsuite/tests/linear/should_fail/T19120.stderr b/testsuite/tests/linear/should_fail/T19120.stderr
index 8ab12c00b1..e66d3de2cb 100644
--- a/testsuite/tests/linear/should_fail/T19120.stderr
+++ b/testsuite/tests/linear/should_fail/T19120.stderr
@@ -1,5 +1,5 @@
 
 T19120.hs:9:3: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from multiplicity of ‘x’
     • In an equation for ‘z’: z x | notL x = True
diff --git a/testsuite/tests/linear/should_fail/T19361.stderr b/testsuite/tests/linear/should_fail/T19361.stderr
index 31770a96e5..cf697071fe 100644
--- a/testsuite/tests/linear/should_fail/T19361.stderr
+++ b/testsuite/tests/linear/should_fail/T19361.stderr
@@ -1,6 +1,6 @@
 
 T19361.hs:6:3: error: [GHC-25897]
-    • Couldn't match type ‘m’ with ‘'Many’
+    • Couldn't match type ‘m’ with ‘Many’
         arising from multiplicity of ‘x’
       ‘m’ is a rigid type variable bound by
         the type signature for:
diff --git a/testsuite/tests/linear/should_fail/T20083.stderr b/testsuite/tests/linear/should_fail/T20083.stderr
index 32968a4e7d..e923aaf2fe 100644
--- a/testsuite/tests/linear/should_fail/T20083.stderr
+++ b/testsuite/tests/linear/should_fail/T20083.stderr
@@ -1,6 +1,6 @@
 
 T20083.hs:6:6: error: [GHC-25897]
-    • Couldn't match type ‘m’ with ‘'Many’
+    • Couldn't match type ‘m’ with ‘Many’
         arising from multiplicity of ‘x’
       ‘m’ is a rigid type variable bound by
         the type signature for:
@@ -12,7 +12,7 @@ T20083.hs:6:6: error: [GHC-25897]
         ap :: (a -> b) -> a %m -> b (bound at T20083.hs:6:1)
 
 T20083.hs:9:5: error: [GHC-18872]
-    • Couldn't match type ‘'Many’ with ‘'One’
+    • Couldn't match type ‘Many’ with ‘One’
         arising from a non-linear pattern
     • In the pattern: _
       In an equation for ‘ap2’: ap2 _ = ()
diff --git a/testsuite/tests/linear/should_fail/TypeClass.stderr b/testsuite/tests/linear/should_fail/TypeClass.stderr
index ae7419f970..e0aef606ae 100644
--- a/testsuite/tests/linear/should_fail/TypeClass.stderr
+++ b/testsuite/tests/linear/should_fail/TypeClass.stderr
@@ -1,5 +1,5 @@
 
 TypeClass.hs:45:7: error: [GHC-39999]
-    • No instance for ‘Iden (FUN 'One)’ arising from a use of ‘iden’
+    • No instance for ‘Iden (FUN One)’ arising from a use of ‘iden’
     • In the expression: iden
       In an equation for ‘foo’: foo = iden