Narrow scope of special-case for unqualified printing of names in core libraries

Commit 547c597112954353cef7157cb0a389bc4f6303eb modifies the
pretty-printer to render names from a set of core packages (`base`,
`ghc-prim`, `template-haskell`) as unqualified. The idea here was that
many of these names typically are not in scope but are well-known by the
user and therefore qualification merely introduces noise.

This, however, is a very large hammer and potentially breaks any
consumer who relies on parsing GHC output (hence #11208). This commit
partially reverts this change, now only printing `Constraint` (which
appears quite often in errors) as unqualified.

Fixes #11208.

Updates tests in `array` submodule.

Test Plan: validate

Reviewers: hvr, thomie, austin

Subscribers: thomie

Differential Revision: https://phabricator.haskell.org/D1619

GHC Trac Issues: #11208

1 files changed, 25 insertions, 12 deletions

diff --git a/testsuite/tests/numeric/should_compile/T7116.stdout b/testsuite/tests/numeric/should_compile/T7116.stdout
index c9d744d6be..f64b8414b3 100644
--- a/testsuite/tests/numeric/should_compile/T7116.stdout
+++ b/testsuite/tests/numeric/should_compile/T7116.stdout
@@ -3,31 +3,32 @@
 Result size of Tidy Core = {terms: 32, types: 17, coercions: 0}
 
 -- RHS size: {terms: 2, types: 0, coercions: 0}
-T7116.$trModule2 :: TrName
+T7116.$trModule2 :: GHC.Types.TrName
 [GblId,
  Caf=NoCafRefs,
  Str=DmdType m1,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 30 20}]
-T7116.$trModule2 = TrNameS "main"#
+T7116.$trModule2 = GHC.Types.TrNameS "main"#
 
 -- RHS size: {terms: 2, types: 0, coercions: 0}
-T7116.$trModule1 :: TrName
+T7116.$trModule1 :: GHC.Types.TrName
 [GblId,
  Caf=NoCafRefs,
  Str=DmdType m1,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 40 20}]
-T7116.$trModule1 = TrNameS "T7116"#
+T7116.$trModule1 = GHC.Types.TrNameS "T7116"#
 
 -- RHS size: {terms: 3, types: 0, coercions: 0}
-T7116.$trModule :: Module
+T7116.$trModule :: GHC.Types.Module
 [GblId[ReflectionId],
  Caf=NoCafRefs,
  Str=DmdType m,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}]
-T7116.$trModule = Module T7116.$trModule2 T7116.$trModule1
+T7116.$trModule =
+  GHC.Types.Module T7116.$trModule2 T7116.$trModule1
 
 -- RHS size: {terms: 8, types: 3, coercions: 0}
 dr :: Double -> Double
@@ -39,10 +40,14 @@ dr :: Double -> Double
          WorkFree=True, Expandable=True,
          Guidance=ALWAYS_IF(arity=1,unsat_ok=True,boring_ok=False)
          Tmpl= \ (x [Occ=Once!] :: Double) ->
-                 case x of _ [Occ=Dead] { D# x1 -> D# (+## x1 x1) }}]
+                 case x of _ [Occ=Dead] { GHC.Types.D# x1 ->
+                 GHC.Types.D# (GHC.Prim.+## x1 x1)
+                 }}]
 dr =
   \ (x :: Double) ->
-    case x of _ [Occ=Dead] { D# x1 -> D# (+## x1 x1) }
+    case x of _ [Occ=Dead] { GHC.Types.D# x1 ->
+    GHC.Types.D# (GHC.Prim.+## x1 x1)
+    }
 
 -- RHS size: {terms: 1, types: 0, coercions: 0}
 dl :: Double -> Double
@@ -54,7 +59,9 @@ dl :: Double -> Double
          WorkFree=True, Expandable=True,
          Guidance=ALWAYS_IF(arity=1,unsat_ok=True,boring_ok=False)
          Tmpl= \ (x [Occ=Once!] :: Double) ->
-                 case x of _ [Occ=Dead] { D# y -> D# (+## y y) }}]
+                 case x of _ [Occ=Dead] { GHC.Types.D# y ->
+                 GHC.Types.D# (GHC.Prim.+## y y)
+                 }}]
 dl = dr
 
 -- RHS size: {terms: 8, types: 3, coercions: 0}
@@ -67,10 +74,14 @@ fr :: Float -> Float
          WorkFree=True, Expandable=True,
          Guidance=ALWAYS_IF(arity=1,unsat_ok=True,boring_ok=False)
          Tmpl= \ (x [Occ=Once!] :: Float) ->
-                 case x of _ [Occ=Dead] { F# x1 -> F# (plusFloat# x1 x1) }}]
+                 case x of _ [Occ=Dead] { GHC.Types.F# x1 ->
+                 GHC.Types.F# (GHC.Prim.plusFloat# x1 x1)
+                 }}]
 fr =
   \ (x :: Float) ->
-    case x of _ [Occ=Dead] { F# x1 -> F# (plusFloat# x1 x1) }
+    case x of _ [Occ=Dead] { GHC.Types.F# x1 ->
+    GHC.Types.F# (GHC.Prim.plusFloat# x1 x1)
+    }
 
 -- RHS size: {terms: 1, types: 0, coercions: 0}
 fl :: Float -> Float
@@ -82,7 +93,9 @@ fl :: Float -> Float
          WorkFree=True, Expandable=True,
          Guidance=ALWAYS_IF(arity=1,unsat_ok=True,boring_ok=False)
          Tmpl= \ (x [Occ=Once!] :: Float) ->
-                 case x of _ [Occ=Dead] { F# y -> F# (plusFloat# y y) }}]
+                 case x of _ [Occ=Dead] { GHC.Types.F# y ->
+                 GHC.Types.F# (GHC.Prim.plusFloat# y y)
+                 }}]
 fl = fr