Change representation of field selector occurences

- Change the names of the fields in in `data FieldOcc`
- Renames `HsRecFld` to `HsRecSel`
- Replace `AmbiguousFieldOcc p` in `HsRecSel` with `FieldOcc p`
- Contains a haddock submodule update

The primary motivation of this change is to remove
`AmbiguousFieldOcc`. This is one of a suite of changes improving how
record syntax (most notably record update syntax) is represented in
the AST.

20 files changed, 141 insertions, 102 deletions

diff --git a/testsuite/tests/backpack/should_compile/T13323.bkp b/testsuite/tests/backpack/should_compile/T13323.bkp
index 70a1ccf89c..a66eb39ef9 100644
--- a/testsuite/tests/backpack/should_compile/T13323.bkp
+++ b/testsuite/tests/backpack/should_compile/T13323.bkp
@@ -5,8 +5,6 @@ unit p where
         data B = B { foo :: Bool }
     module P where
         import A
-        x :: A -> Int
-        x = foo
 unit q where
     module A where
         data A = A { foo :: Int }
diff --git a/testsuite/tests/backpack/should_compile/T13323.stderr b/testsuite/tests/backpack/should_compile/T13323.stderr
index 7e637d9dd4..eb49bcbfab 100644
--- a/testsuite/tests/backpack/should_compile/T13323.stderr
+++ b/testsuite/tests/backpack/should_compile/T13323.stderr
@@ -1,11 +1,6 @@
 [1 of 3] Processing p
   [1 of 2] Compiling A[sig]           ( p/A.hsig, nothing )
   [2 of 2] Compiling P                ( p/P.hs, nothing )
-
-T13323.bkp:9:13: warning: [-Wambiguous-fields (in -Wdefault)]
-    The field ‘foo’ belonging to type A is ambiguous.
-    This will not be supported by -XDuplicateRecordFields in future releases of GHC.
-    You can use a qualified import or explicit case analysis to resolve the ambiguity.
 [2 of 3] Processing q
   Instantiating q
   [1 of 1] Compiling A                ( q/A.hs, T13323.out/q/A.o )
@@ -15,10 +10,5 @@ T13323.bkp:9:13: warning: [-Wambiguous-fields (in -Wdefault)]
     Instantiating p[A=q:A]
     [1 of 2] Compiling A[sig]           ( p/A.hsig, T13323.out/p/p-HVmFlcYSefiK5n1aDP1v7x/A.o )
     [2 of 2] Compiling P                ( p/P.hs, T13323.out/p/p-HVmFlcYSefiK5n1aDP1v7x/P.o )
-
-T13323.bkp:9:13: warning: [-Wambiguous-fields (in -Wdefault)]
-    The field ‘foo’ belonging to type A is ambiguous.
-    This will not be supported by -XDuplicateRecordFields in future releases of GHC.
-    You can use a qualified import or explicit case analysis to resolve the ambiguity.
   [1 of 2] Compiling R                ( r/R.hs, T13323.out/r/R.o )
   [2 of 2] Instantiating p
diff --git a/testsuite/tests/overloadedrecflds/should_fail/DRFUnused.stderr b/testsuite/tests/overloadedrecflds/should_fail/DRFUnused.stderr
index 7e75f5c8c7..2043591329 100644
--- a/testsuite/tests/overloadedrecflds/should_fail/DRFUnused.stderr
+++ b/testsuite/tests/overloadedrecflds/should_fail/DRFUnused.stderr
@@ -1,8 +1,7 @@
 
-DRFUnused.hs:10:16: error: [-Wunused-top-binds (in -Wextra, -Wunused-binds), -Werror=unused-top-binds]
-    Defined but not used: ‘foo’
-
-DRFUnused.hs:18:5: warning: [-Wambiguous-fields (in -Wdefault)]
-    The field ‘foo’ belonging to type U is ambiguous.
-    This will not be supported by -XDuplicateRecordFields in future releases of GHC.
-    You can use explicit case analysis to resolve the ambiguity.
+DRFUnused.hs:18:5:
+    Ambiguous occurrence ‘foo’
+    It could refer to
+       either the field ‘foo’, defined at DRFUnused.hs:12:16
+           or the field ‘foo’, defined at DRFUnused.hs:11:16
+           or the field ‘foo’, defined at DRFUnused.hs:10:16
diff --git a/testsuite/tests/overloadedrecflds/should_fail/T11167_ambiguous_fixity.stderr b/testsuite/tests/overloadedrecflds/should_fail/T11167_ambiguous_fixity.stderr
index 2a107d6570..7dd2913739 100644
--- a/testsuite/tests/overloadedrecflds/should_fail/T11167_ambiguous_fixity.stderr
+++ b/testsuite/tests/overloadedrecflds/should_fail/T11167_ambiguous_fixity.stderr
@@ -2,15 +2,15 @@
 [2 of 3] Compiling T11167_ambiguous_fixity_B ( T11167_ambiguous_fixity_B.hs, T11167_ambiguous_fixity_B.o )
 [3 of 3] Compiling T11167_ambiguous_fixity ( T11167_ambiguous_fixity.hs, T11167_ambiguous_fixity.o )
 
-T11167_ambiguous_fixity.hs:6:7: error:
-    Ambiguous fixity for record field ‘foo’
-    Conflicts: 
-      infixr 3
-        imported from ‘T11167_ambiguous_fixity_A’ at T11167_ambiguous_fixity.hs:3:1-32
-        (and originally defined at T11167_ambiguous_fixity_A.hs:4:16-18)
-      infixr 3
-        imported from ‘T11167_ambiguous_fixity_A’ at T11167_ambiguous_fixity.hs:3:1-32
-        (and originally defined at T11167_ambiguous_fixity_A.hs:3:16-18)
-      infixl 5
-        imported from ‘T11167_ambiguous_fixity_B’ at T11167_ambiguous_fixity.hs:4:1-32
-        (and originally defined at T11167_ambiguous_fixity_B.hs:2:16-18)
+ T11167_ambiguous_fixity.hs:6:16:
+    Ambiguous occurrence ‘foo’
+    It could refer to
+       either the field ‘foo’,
+              imported from ‘T11167_ambiguous_fixity_A’ at T11167_ambiguous_fixity.hs:3:1-32
+              (and originally defined at T11167_ambiguous_fixity_A.hs:4:16-18)
+           or the field ‘foo’,
+              imported from ‘T11167_ambiguous_fixity_A’ at T11167_ambiguous_fixity.hs:3:1-32
+              (and originally defined at T11167_ambiguous_fixity_A.hs:3:16-18)
+           or the field ‘foo’,
+              imported from ‘T11167_ambiguous_fixity_B’ at T11167_ambiguous_fixity.hs:4:1-32
+              (and originally defined at T11167_ambiguous_fixity_B.hs:2:16-18)
diff --git a/testsuite/tests/overloadedrecflds/should_fail/T13132_duplicaterecflds.stderr b/testsuite/tests/overloadedrecflds/should_fail/T13132_duplicaterecflds.stderr
index 391ccde4c1..d43b70ce3f 100644
--- a/testsuite/tests/overloadedrecflds/should_fail/T13132_duplicaterecflds.stderr
+++ b/testsuite/tests/overloadedrecflds/should_fail/T13132_duplicaterecflds.stderr
@@ -1,6 +1,22 @@
 
-T13132_duplicaterecflds.hs:9:11: error:
+ T13132_duplicaterecflds.hs:7:16:
+    Ambiguous occurrence ‘runContT’
+    It could refer to
+       either the field ‘runContT’,
+              defined at T13132_duplicaterecflds.hs:5:33
+           or the field ‘runContT’,
+              defined at T13132_duplicaterecflds.hs:4:31
+
+T13132_duplicaterecflds.hs:9:11:
     The operator ‘runContT’ [infixl 9] of a section
         must have lower precedence than that of the operand,
           namely ‘y’ [infixl 9]
         in the section: ‘`runContT` x `y` x’
+
+ T13132_duplicaterecflds.hs:9:12:
+    Ambiguous occurrence ‘runContT’
+    It could refer to
+       either the field ‘runContT’,
+              defined at T13132_duplicaterecflds.hs:5:33
+           or the field ‘runContT’,
+              defined at T13132_duplicaterecflds.hs:4:31
diff --git a/testsuite/tests/overloadedrecflds/should_fail/all.T b/testsuite/tests/overloadedrecflds/should_fail/all.T
index 169d47813a..396ea516e8 100644
--- a/testsuite/tests/overloadedrecflds/should_fail/all.T
+++ b/testsuite/tests/overloadedrecflds/should_fail/all.T
@@ -47,3 +47,4 @@ test('NFSExport', normal, compile_fail, [''])
 test('T18999_NoDisambiguateRecordFields', normal, compile_fail, [''])
 test('DRFUnused', normal, compile_fail, [''])
 test('T19287', normal, compile_fail, [''])
+test('overloadedrecfldswasrunnowfail06', normal, compile_fail, [''])
diff --git a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail02.stderr b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail02.stderr
index 9c2057e17d..7591e8be6c 100644
--- a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail02.stderr
+++ b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail02.stderr
@@ -1,6 +1,6 @@
 
 overloadedrecfldsfail02.hs:8:18: error:
     Ambiguous occurrence ‘x’
-    It could refer to either the field ‘x’,
-                             defined at overloadedrecfldsfail02.hs:6:16
-                          or the field ‘x’, defined at overloadedrecfldsfail02.hs:5:16
+    It could refer to
+       either the field ‘x’, defined at overloadedrecfldsfail02.hs:6:16
+           or the field ‘x’, defined at overloadedrecfldsfail02.hs:5:16
diff --git a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail04.stderr b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail04.stderr
index 0c58ad7164..6f5e7588f1 100644
--- a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail04.stderr
+++ b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail04.stderr
@@ -1,11 +1,12 @@
 [1 of 2] Compiling OverloadedRecFldsFail04_A ( OverloadedRecFldsFail04_A.hs, OverloadedRecFldsFail04_A.o )
 [2 of 2] Compiling Main             ( overloadedrecfldsfail04.hs, overloadedrecfldsfail04.o )
 
-overloadedrecfldsfail04.hs:9:6: error:
+ overloadedrecfldsfail04.hs:9:6:
     Ambiguous occurrence ‘I.x’
-    It could refer to either the field ‘x’,
-                             imported from ‘OverloadedRecFldsFail04_A’ at overloadedrecfldsfail04.hs:6:1-37
-                             (and originally defined at OverloadedRecFldsFail04_A.hs:6:16)
-                          or the field ‘x’,
-                             imported from ‘OverloadedRecFldsFail04_A’ at overloadedrecfldsfail04.hs:6:1-37
-                             (and originally defined at OverloadedRecFldsFail04_A.hs:5:16)
+    It could refer to
+       either the field ‘x’,
+              imported from ‘OverloadedRecFldsFail04_A’ at overloadedrecfldsfail04.hs:6:1-37
+              (and originally defined at OverloadedRecFldsFail04_A.hs:6:16)
+           or the field ‘x’,
+              imported from ‘OverloadedRecFldsFail04_A’ at overloadedrecfldsfail04.hs:6:1-37
+              (and originally defined at OverloadedRecFldsFail04_A.hs:5:16)
diff --git a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail11.stderr b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail11.stderr
index a5cc4e8197..687af43de1 100644
--- a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail11.stderr
+++ b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail11.stderr
@@ -1,12 +1,12 @@
 [1 of 2] Compiling OverloadedRecFldsFail11_A ( OverloadedRecFldsFail11_A.hs, OverloadedRecFldsFail11_A.o )
 [2 of 2] Compiling Main             ( overloadedrecfldsfail11.hs, overloadedrecfldsfail11.o )
 
-overloadedrecfldsfail11.hs:5:15: error: [-Wambiguous-fields (in -Wdefault), -Werror=ambiguous-fields]
-    The field ‘foo’ belonging to type S is ambiguous.
-    This will not be supported by -XDuplicateRecordFields in future releases of GHC.
-    You can use a qualified import or explicit case analysis to resolve the ambiguity.
-
-overloadedrecfldsfail11.hs:5:15: error: [-Wdeprecations (in -Wdefault), -Werror=deprecations]
-    In the use of ‘foo’ (imported from OverloadedRecFldsFail11_A):
-    "Warning on a record field"
-
+overloadedrecfldsfail11.hs:5:15:
+    Ambiguous occurrence ‘foo’
+    It could refer to
+       either the field ‘foo’,
+              imported from ‘OverloadedRecFldsFail11_A’ at overloadedrecfldsfail11.hs:3:1-32
+              (and originally defined at OverloadedRecFldsFail11_A.hs:6:16-18)
+           or the field ‘foo’,
+              imported from ‘OverloadedRecFldsFail11_A’ at overloadedrecfldsfail11.hs:3:1-32
+              (and originally defined at OverloadedRecFldsFail11_A.hs:5:16-18)
diff --git a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail12.stderr b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail12.stderr
index be3d3d6f8d..b51fb80cca 100644
--- a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail12.stderr
+++ b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail12.stderr
@@ -1,24 +1,18 @@
 [1 of 2] Compiling OverloadedRecFldsFail12_A ( OverloadedRecFldsFail12_A.hs, OverloadedRecFldsFail12_A.o )
 [2 of 2] Compiling Main             ( overloadedrecfldsfail12.hs, overloadedrecfldsfail12.o )
 
-overloadedrecfldsfail12.hs:10:11: error: [-Wdeprecations (in -Wdefault), -Werror=deprecations]
-    In the use of ‘foo’ (imported from OverloadedRecFldsFail12_A):
-    "Deprecated foo"
+ overloadedrecfldsfail12.hs:13:5:
+    Ambiguous occurrence ‘foo’
+    It could refer to
+       either the field ‘foo’,
+              imported from ‘OverloadedRecFldsFail12_A’ at overloadedrecfldsfail12.hs:4:1-32
+              (and originally defined at OverloadedRecFldsFail12_A.hs:5:16-18)
+           or the field ‘foo’, defined at overloadedrecfldsfail12.hs:6:16
 
-overloadedrecfldsfail12.hs:10:20: error: [-Wdeprecations (in -Wdefault), -Werror=deprecations]
-    In the use of ‘bar’ (imported from OverloadedRecFldsFail12_A):
-    "Deprecated bar"
-
-overloadedrecfldsfail12.hs:13:5: error: [-Wambiguous-fields (in -Wdefault), -Werror=ambiguous-fields]
-    The field ‘foo’ belonging to type T is ambiguous.
-    This will not be supported by -XDuplicateRecordFields in future releases of GHC.
-    You can use a qualified import or explicit case analysis to resolve the ambiguity.
-
-overloadedrecfldsfail12.hs:13:5: error: [-Wdeprecations (in -Wdefault), -Werror=deprecations]
-    In the use of ‘foo’ (imported from OverloadedRecFldsFail12_A):
-    "Deprecated foo"
-
-overloadedrecfldsfail12.hs:16:5: error: [-Wambiguous-fields (in -Wdefault), -Werror=ambiguous-fields]
-    The field ‘foo’ belonging to type S is ambiguous.
-    This will not be supported by -XDuplicateRecordFields in future releases of GHC.
-    You can use explicit case analysis to resolve the ambiguity.
+ overloadedrecfldsfail12.hs:16:5:
+    Ambiguous occurrence ‘foo’
+    It could refer to
+       either the field ‘foo’,
+              imported from ‘OverloadedRecFldsFail12_A’ at overloadedrecfldsfail12.hs:4:1-32
+              (and originally defined at OverloadedRecFldsFail12_A.hs:5:16-18)
+           or the field ‘foo’, defined at overloadedrecfldsfail12.hs:6:16
diff --git a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail13.stderr b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail13.stderr
index 7c61ab769e..ea8b6c4531 100644
--- a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail13.stderr
+++ b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail13.stderr
@@ -1,22 +1,24 @@
 
-overloadedrecfldsfail13.hs:10:5: error:
-    ‘x’ is not a (visible) field of type ‘U’
-    In the expression: x (MkU :: U)
-    In an equation for ‘a’: a = x (MkU :: U)
+  overloadedrecfldsfail13.hs:10:5:
+    Ambiguous occurrence ‘x’
+    It could refer to
+       either the field ‘x’, defined at overloadedrecfldsfail13.hs:7:16
+           or the field ‘x’, defined at overloadedrecfldsfail13.hs:6:16
 
-overloadedrecfldsfail13.hs:12:5: error:
+  overloadedrecfldsfail13.hs:12:5:
     Ambiguous occurrence ‘x’
-    It could refer to either the field ‘x’,
-                             defined at overloadedrecfldsfail13.hs:7:16
-                          or the field ‘x’, defined at overloadedrecfldsfail13.hs:6:16
+    It could refer to
+       either the field ‘x’, defined at overloadedrecfldsfail13.hs:7:16
+           or the field ‘x’, defined at overloadedrecfldsfail13.hs:6:16
 
-overloadedrecfldsfail13.hs:15:5: error:
-    ‘x’ is not a (visible) field of type ‘U’
-    In the expression: x
-    In an equation for ‘c’: c = x
+  overloadedrecfldsfail13.hs:15:5:
+    Ambiguous occurrence ‘x’
+    It could refer to
+       either the field ‘x’, defined at overloadedrecfldsfail13.hs:7:16
+           or the field ‘x’, defined at overloadedrecfldsfail13.hs:6:16
 
-overloadedrecfldsfail13.hs:18:5: error:
+  overloadedrecfldsfail13.hs:18:5:
     Ambiguous occurrence ‘x’
-    It could refer to either the field ‘x’,
-                             defined at overloadedrecfldsfail13.hs:7:16
-                          or the field ‘x’, defined at overloadedrecfldsfail13.hs:6:16
+    It could refer to
+       either the field ‘x’, defined at overloadedrecfldsfail13.hs:7:16
+           or the field ‘x’, defined at overloadedrecfldsfail13.hs:6:16
diff --git a/testsuite/tests/overloadedrecflds/should_run/overloadedrecfldsrun06.hs b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldswasrunnowfail06.hs
index 92f870833d..92f870833d 100644
--- a/testsuite/tests/overloadedrecflds/should_run/overloadedrecfldsrun06.hs
+++ b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldswasrunnowfail06.hs
diff --git a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldswasrunnowfail06.stderr b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldswasrunnowfail06.stderr
new file mode 100644
index 0000000000..de8cc1aadf
--- /dev/null
+++ b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldswasrunnowfail06.stderr
@@ -0,0 +1,40 @@
+
+ overloadedrecfldswasrunnowfail06.hs:11:11:
+    Ambiguous occurrence ‘x’
+    It could refer to
+       either the field ‘x’,
+              defined at overloadedrecfldswasrunnowfail06.hs:8:18
+           or the field ‘x’,
+              defined at overloadedrecfldswasrunnowfail06.hs:7:16
+           or the field ‘x’,
+              defined at overloadedrecfldswasrunnowfail06.hs:6:16
+
+ overloadedrecfldswasrunnowfail06.hs:13:11:
+    Ambiguous occurrence ‘x’
+    It could refer to
+       either the field ‘x’,
+              defined at overloadedrecfldswasrunnowfail06.hs:8:18
+           or the field ‘x’,
+              defined at overloadedrecfldswasrunnowfail06.hs:7:16
+           or the field ‘x’,
+              defined at overloadedrecfldswasrunnowfail06.hs:6:16
+
+ overloadedrecfldswasrunnowfail06.hs:15:13:
+    Ambiguous occurrence ‘x’
+    It could refer to
+       either the field ‘x’,
+              defined at overloadedrecfldswasrunnowfail06.hs:8:18
+           or the field ‘x’,
+              defined at overloadedrecfldswasrunnowfail06.hs:7:16
+           or the field ‘x’,
+              defined at overloadedrecfldswasrunnowfail06.hs:6:16
+
+ overloadedrecfldswasrunnowfail06.hs:21:20:
+    Ambiguous occurrence ‘x’
+    It could refer to
+       either the field ‘x’,
+              defined at overloadedrecfldswasrunnowfail06.hs:8:18
+           or the field ‘x’,
+              defined at overloadedrecfldswasrunnowfail06.hs:7:16
+           or the field ‘x’,
+              defined at overloadedrecfldswasrunnowfail06.hs:6:16
diff --git a/testsuite/tests/overloadedrecflds/should_run/all.T b/testsuite/tests/overloadedrecflds/should_run/all.T
index 4267c10d5e..8d6d9850bb 100644
--- a/testsuite/tests/overloadedrecflds/should_run/all.T
+++ b/testsuite/tests/overloadedrecflds/should_run/all.T
@@ -5,7 +5,6 @@ test('overloadedrecfldsrun02', [extra_files(['OverloadedRecFldsRun02_A.hs'])], m
 test('overloadedrecfldsrun03', normal, compile_and_run, [''])
 test('overloadedrecfldsrun04', omit_ways(prof_ways), compile_and_run, [''])
 test('overloadedrecfldsrun05', normal, compile_and_run, [''])
-test('overloadedrecfldsrun06', normal, compile_and_run, [''])
 test('overloadedrecfldsrun07', normal, compile_and_run, [''])
 test('overloadedrecflds_generics', normal, compile_and_run, [''])
 test('overloadedlabelsrun01', normal, compile_and_run, [''])
diff --git a/testsuite/tests/overloadedrecflds/should_run/overloadedrecfldsrun06.stdout b/testsuite/tests/overloadedrecflds/should_run/overloadedrecfldsrun06.stdout
deleted file mode 100644
index abc4e3b957..0000000000
--- a/testsuite/tests/overloadedrecflds/should_run/overloadedrecfldsrun06.stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-42
-True
diff --git a/testsuite/tests/rename/should_compile/T11167_ambig.stderr b/testsuite/tests/rename/should_compile/T11167_ambig.stderr
deleted file mode 100644
index 5320b42149..0000000000
--- a/testsuite/tests/rename/should_compile/T11167_ambig.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-
-T11167_ambig.hs:10:13: warning: [-Wambiguous-fields (in -Wdefault)]
-    The field ‘runContT’ belonging to type ContT r m a is ambiguous.
-    This will not be supported by -XDuplicateRecordFields in future releases of GHC.
-    You can use explicit case analysis to resolve the ambiguity.
-
-T11167_ambig.hs:17:9: warning: [-Wambiguous-fields (in -Wdefault)]
-    The field ‘runContT’ belonging to type forall a.
-                                           ContT () IO a is ambiguous.
-    This will not be supported by -XDuplicateRecordFields in future releases of GHC.
-    You can use explicit case analysis to resolve the ambiguity.
diff --git a/testsuite/tests/rename/should_compile/all.T b/testsuite/tests/rename/should_compile/all.T
index 92464ca55b..56521084d7 100644
--- a/testsuite/tests/rename/should_compile/all.T
+++ b/testsuite/tests/rename/should_compile/all.T
@@ -145,7 +145,6 @@ test('T9778', normal, compile, ['-fwarn-unticked-promoted-constructors'])
 test('T10816', normal, compile, [''])
 test('T11164', [], multimod_compile, ['T11164', '-v0'])
 test('T11167', normal, compile, [''])
-test('T11167_ambig', normal, compile, [''])
 test('T10625', normal, compile, [''])
 test('T11624', [], multimod_compile, ['T11624', ''])
 test('T11662', [], multimod_compile, ['T11662', '-v0'])
diff --git a/testsuite/tests/rename/should_compile/T11167_ambig.hs b/testsuite/tests/rename/should_fail/T11167_ambig.hs
index 74df05e5ee..74df05e5ee 100644
--- a/testsuite/tests/rename/should_compile/T11167_ambig.hs
+++ b/testsuite/tests/rename/should_fail/T11167_ambig.hs
diff --git a/testsuite/tests/rename/should_fail/T11167_ambig.stderr b/testsuite/tests/rename/should_fail/T11167_ambig.stderr
new file mode 100644
index 0000000000..bf1029b81d
--- /dev/null
+++ b/testsuite/tests/rename/should_fail/T11167_ambig.stderr
@@ -0,0 +1,12 @@
+
+ T11167_ambig.hs:10:13:
+    Ambiguous occurrence ‘runContT’
+    It could refer to
+       either the field ‘runContT’, defined at T11167_ambig.hs:7:32
+           or the field ‘runContT’, defined at T11167_ambig.hs:6:30
+
+ T11167_ambig.hs:17:9:
+    Ambiguous occurrence ‘runContT’
+    It could refer to
+       either the field ‘runContT’, defined at T11167_ambig.hs:7:32
+           or the field ‘runContT’, defined at T11167_ambig.hs:6:30
diff --git a/testsuite/tests/rename/should_fail/all.T b/testsuite/tests/rename/should_fail/all.T
index d709fd0ad0..c25a7c3d92 100644
--- a/testsuite/tests/rename/should_fail/all.T
+++ b/testsuite/tests/rename/should_fail/all.T
@@ -178,3 +178,4 @@ test('T19843j', normal, compile_fail, [''])
 test('T19843k', normal, compile_fail, [''])
 test('T19843l', normal, compile_fail, [''])
 test('T19843m', normal, compile_fail, [''])
+test('T11167_ambig', normal, compile_fail, [''])