Diagnostic codes: acccept test changes

The testsuite output now contains diagnostic codes, so many tests need
to be updated at once.
We decided it was best to keep the diagnostic codes in the testsuite
output, so that contributors don't inadvertently make changes to the
diagnostic codes.

11 files changed, 38 insertions, 37 deletions

diff --git a/testsuite/tests/annotations/should_fail/T10826.stderr b/testsuite/tests/annotations/should_fail/T10826.stderr
index 15ba942e81..9ff8144b18 100644
--- a/testsuite/tests/annotations/should_fail/T10826.stderr
+++ b/testsuite/tests/annotations/should_fail/T10826.stderr
@@ -1,5 +1,5 @@
 
-T10826.hs:7:1: error:
+T10826.hs:7:1: error: [GHC-68934]
     • Annotations are not compatible with Safe Haskell.
       See https://gitlab.haskell.org/ghc/ghc/issues/10826
     • In the annotation:
diff --git a/testsuite/tests/annotations/should_fail/T19374b.stderr b/testsuite/tests/annotations/should_fail/T19374b.stderr
index 0d44c4c2e3..863b772313 100644
--- a/testsuite/tests/annotations/should_fail/T19374b.stderr
+++ b/testsuite/tests/annotations/should_fail/T19374b.stderr
@@ -1,2 +1,3 @@
 
-T19374b.hs:5:10: error: parse error on input ‘T19347b.%%’
+T19374b.hs:5:10: error: [GHC-58481]
+    parse error on input ‘T19347b.%%’
diff --git a/testsuite/tests/annotations/should_fail/T19374c.stderr b/testsuite/tests/annotations/should_fail/T19374c.stderr
index 55700d006a..575d098056 100644
--- a/testsuite/tests/annotations/should_fail/T19374c.stderr
+++ b/testsuite/tests/annotations/should_fail/T19374c.stderr
@@ -1,2 +1,3 @@
 
-T19374c.hs:5:15: error: parse error on input ‘T19347c.%%%’
+T19374c.hs:5:15: error: [GHC-58481]
+    parse error on input ‘T19347c.%%%’
diff --git a/testsuite/tests/annotations/should_fail/annfail01.stderr b/testsuite/tests/annotations/should_fail/annfail01.stderr
index 0aa033fe43..30874553fa 100644
--- a/testsuite/tests/annotations/should_fail/annfail01.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail01.stderr
@@ -1,9 +1,9 @@
 
-annfail01.hs:4:14:
-    No top-level binding for
-      type constructor or class ‘Foo’ in this module
-    In the annotation: {-# ANN type Foo (1 :: Int) #-}
+annfail01.hs:4:14: error: [GHC-10173]
+    • No top-level binding for
+        type constructor or class ‘Foo’ in this module
+    • In the annotation: {-# ANN type Foo (1 :: Int) #-}
 
-annfail01.hs:5:9:
-    No top-level binding for ‘f’ in this module
-    In the annotation: {-# ANN f (1 :: Int) #-}
+annfail01.hs:5:9: error: [GHC-10173]
+    • No top-level binding for ‘f’ in this module
+    • In the annotation: {-# ANN f (1 :: Int) #-}
diff --git a/testsuite/tests/annotations/should_fail/annfail02.stderr b/testsuite/tests/annotations/should_fail/annfail02.stderr
index 3c29ec743f..c8079e171d 100644
--- a/testsuite/tests/annotations/should_fail/annfail02.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail02.stderr
@@ -1,10 +1,9 @@
 
-annfail02.hs:6:9:
-    No top-level binding for
-      data constructor ‘Foo’ in this module
-    In the annotation: {-# ANN Foo (1 :: Int) #-}
+annfail02.hs:6:9: error: [GHC-10173]
+    • No top-level binding for data constructor ‘Foo’ in this module
+    • In the annotation: {-# ANN Foo (1 :: Int) #-}
 
-annfail02.hs:7:14:
-    No top-level binding for
-      type constructor or class ‘Bar’ in this module
-    In the annotation: {-# ANN type Bar (2 :: Int) #-}
+annfail02.hs:7:14: error: [GHC-10173]
+    • No top-level binding for
+        type constructor or class ‘Bar’ in this module
+    • In the annotation: {-# ANN type Bar (2 :: Int) #-}
diff --git a/testsuite/tests/annotations/should_fail/annfail05.stderr b/testsuite/tests/annotations/should_fail/annfail05.stderr
index d206bd3a44..52af5a212a 100644
--- a/testsuite/tests/annotations/should_fail/annfail05.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail05.stderr
@@ -1,5 +1,5 @@
 
-annfail05.hs:11:1: error:
+annfail05.hs:11:1: error: [GHC-39999]
     • No instance for ‘Data.Data.Data NoInstances’
         arising from an annotation
     • In the annotation: {-# ANN f NoInstances #-}
diff --git a/testsuite/tests/annotations/should_fail/annfail07.stderr b/testsuite/tests/annotations/should_fail/annfail07.stderr
index e7cd8dd000..f4f2fc4637 100644
--- a/testsuite/tests/annotations/should_fail/annfail07.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail07.stderr
@@ -1,5 +1,5 @@
 
-annfail07.hs:9:17:
-    Couldn't match expected type ‘[a0]’ with actual type ‘Bool’
-    In the first argument of ‘head’, namely ‘True’
-    In the annotation: {-# ANN f (head True) #-}
+annfail07.hs:9:17: error: [GHC-83865]
+    • Couldn't match expected type ‘[a0]’ with actual type ‘Bool’
+    • In the first argument of ‘head’, namely ‘True’
+      In the annotation: {-# ANN f (head True) #-}
diff --git a/testsuite/tests/annotations/should_fail/annfail08.stderr b/testsuite/tests/annotations/should_fail/annfail08.stderr
index f7b9613f78..35c9f269b2 100644
--- a/testsuite/tests/annotations/should_fail/annfail08.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail08.stderr
@@ -1,11 +1,11 @@
 
-annfail08.hs:9:1: error:
+annfail08.hs:9:1: error: [GHC-39999]
     • No instance for ‘Data.Data.Data (a0 -> a0)’
         arising from an annotation
         (maybe you haven't applied a function to enough arguments?)
     • In the annotation: {-# ANN f (id + 1) #-}
 
-annfail08.hs:9:15: error:
+annfail08.hs:9:15: error: [GHC-39999]
     • No instance for ‘Num (a0 -> a0)’ arising from a use of ‘+’
         (maybe you haven't applied a function to enough arguments?)
     • In the annotation: {-# ANN f (id + 1) #-}
diff --git a/testsuite/tests/annotations/should_fail/annfail10.stderr b/testsuite/tests/annotations/should_fail/annfail10.stderr
index 9a0272ccb1..7b7fd968a6 100644
--- a/testsuite/tests/annotations/should_fail/annfail10.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail10.stderr
@@ -1,5 +1,5 @@
 
-annfail10.hs:9:1: error:
+annfail10.hs:9:1: error: [GHC-39999]
     • Ambiguous type variable ‘a0’ arising from an annotation
       prevents the constraint ‘(Data.Data.Data a0)’ from being solved.
       Probable fix: use a type annotation to specify what ‘a0’ should be.
@@ -13,7 +13,7 @@ annfail10.hs:9:1: error:
         (use -fprint-potential-instances to see them all)
     • In the annotation: {-# ANN f 1 #-}
 
-annfail10.hs:9:11: error:
+annfail10.hs:9:11: error: [GHC-39999]
     • Ambiguous type variable ‘a0’ arising from the literal ‘1’
       prevents the constraint ‘(Num a0)’ from being solved.
       Probable fix: use a type annotation to specify what ‘a0’ should be.
diff --git a/testsuite/tests/annotations/should_fail/annfail11.stderr b/testsuite/tests/annotations/should_fail/annfail11.stderr
index d110fdda29..82682cc4cb 100644
--- a/testsuite/tests/annotations/should_fail/annfail11.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail11.stderr
@@ -1,11 +1,11 @@
 
-annfail11.hs:3:9: error:
-    No top-level binding for ‘length’ in this module
-    In the annotation:
-      {-# ANN length "Cannot annotate other modules yet" #-}
+annfail11.hs:3:9: error: [GHC-10173]
+    • No top-level binding for ‘length’ in this module
+    • In the annotation:
+        {-# ANN length "Cannot annotate other modules yet" #-}
 
-annfail11.hs:4:14: error:
-    No top-level binding for
-      type constructor or class ‘Integer’ in this module
-    In the annotation:
-      {-# ANN type Integer "Cannot annotate other modules yet" #-}
+annfail11.hs:4:14: error: [GHC-10173]
+    • No top-level binding for
+        type constructor or class ‘Integer’ in this module
+    • In the annotation:
+        {-# ANN type Integer "Cannot annotate other modules yet" #-}
diff --git a/testsuite/tests/annotations/should_fail/annfail13.stderr b/testsuite/tests/annotations/should_fail/annfail13.stderr
index a35e9e70f3..9887457e62 100644
--- a/testsuite/tests/annotations/should_fail/annfail13.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail13.stderr
@@ -1,2 +1,2 @@
 
-annfail13.hs:4:14: parse error on input ‘1’
+annfail13.hs:4:14: error: [GHC-58481] parse error on input ‘1’