[commit: ghc] wip/T14880-2-step2-c123: Fix some test wibbles (834dcd2)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/T14880-2-step2-c123
Link       : http://ghc.haskell.org/trac/ghc/changeset/834dcd2bf6513e697bf65379bdab7ea1a116fdbd/ghc

>---------------------------------------------------------------

commit 834dcd2bf6513e697bf65379bdab7ea1a116fdbd
Author: Tobias Dammers <tdammers at gmail.com>
Date:   Fri Oct 12 11:22:40 2018 +0200

    Fix some test wibbles


>---------------------------------------------------------------

834dcd2bf6513e697bf65379bdab7ea1a116fdbd
 testsuite/tests/partial-sigs/should_compile/T12844.stderr  | 2 +-
 testsuite/tests/partial-sigs/should_compile/T15039a.stderr | 2 +-
 testsuite/tests/partial-sigs/should_compile/T15039b.stderr | 2 +-
 testsuite/tests/partial-sigs/should_compile/T15039c.stderr | 2 +-
 testsuite/tests/partial-sigs/should_compile/T15039d.stderr | 2 +-
 testsuite/tests/partial-sigs/should_run/T15415.stderr      | 8 ++++----
 testsuite/tests/polykinds/T14265.stderr                    | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/testsuite/tests/partial-sigs/should_compile/T12844.stderr b/testsuite/tests/partial-sigs/should_compile/T12844.stderr
index 7049818..0e01cd3 100644
--- a/testsuite/tests/partial-sigs/should_compile/T12844.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/T12844.stderr
@@ -2,7 +2,7 @@
 T12844.hs:12:9: warning: [-Wpartial-type-signatures (in -Wdefault)]
     • Found type wildcard ‘_’
         standing for ‘(Foo rngs, Head rngs ~ '(r, r'))’
-      Where: ‘rngs’, ‘r’, ‘k’, ‘r'’, ‘k1’
+      Where: ‘rngs’, ‘k’, ‘r’, ‘k1’, ‘r'’
                are rigid type variables bound by
                the inferred type of
                  bar :: (Foo rngs, Head rngs ~ '(r, r')) => FooData rngs
diff --git a/testsuite/tests/partial-sigs/should_compile/T15039a.stderr b/testsuite/tests/partial-sigs/should_compile/T15039a.stderr
index d9c8e10..1563a2e 100644
--- a/testsuite/tests/partial-sigs/should_compile/T15039a.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/T15039a.stderr
@@ -25,7 +25,7 @@ T15039a.hs:22:14: warning: [-Wpartial-type-signatures (in -Wdefault)]
 
 T15039a.hs:25:14: warning: [-Wpartial-type-signatures (in -Wdefault)]
     • Found type wildcard ‘_’ standing for ‘Dict (a ~~ b)’
-      Where: ‘a’, ‘b’, ‘k’ are rigid type variables bound by
+      Where: ‘a’, ‘k’, ‘b’ are rigid type variables bound by
                the type signature for:
                  ex3 :: forall k a (b :: k). Dict (a ~~ b) -> ()
                at T15039a.hs:24:1-43
diff --git a/testsuite/tests/partial-sigs/should_compile/T15039b.stderr b/testsuite/tests/partial-sigs/should_compile/T15039b.stderr
index 5726c7f..21ec20a 100644
--- a/testsuite/tests/partial-sigs/should_compile/T15039b.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/T15039b.stderr
@@ -26,7 +26,7 @@ T15039b.hs:22:14: warning: [-Wpartial-type-signatures (in -Wdefault)]
 T15039b.hs:25:14: warning: [-Wpartial-type-signatures (in -Wdefault)]
     • Found type wildcard ‘_’
         standing for ‘Dict ((a :: *) ~~ (b :: k))’
-      Where: ‘a’, ‘b’, ‘k’ are rigid type variables bound by
+      Where: ‘a’, ‘k’, ‘b’ are rigid type variables bound by
                the type signature for:
                  ex3 :: forall k a (b :: k). Dict ((a :: *) ~~ (b :: k)) -> ()
                at T15039b.hs:24:1-43
diff --git a/testsuite/tests/partial-sigs/should_compile/T15039c.stderr b/testsuite/tests/partial-sigs/should_compile/T15039c.stderr
index 29989c2..b1f76f3 100644
--- a/testsuite/tests/partial-sigs/should_compile/T15039c.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/T15039c.stderr
@@ -25,7 +25,7 @@ T15039c.hs:22:14: warning: [-Wpartial-type-signatures (in -Wdefault)]
 
 T15039c.hs:25:14: warning: [-Wpartial-type-signatures (in -Wdefault)]
     • Found type wildcard ‘_’ standing for ‘Dict (a ~~ b)’
-      Where: ‘a’, ‘b’, ‘k’ are rigid type variables bound by
+      Where: ‘a’, ‘k’, ‘b’ are rigid type variables bound by
                the type signature for:
                  ex3 :: forall k a (b :: k). Dict (a ~~ b) -> ()
                at T15039c.hs:24:1-43
diff --git a/testsuite/tests/partial-sigs/should_compile/T15039d.stderr b/testsuite/tests/partial-sigs/should_compile/T15039d.stderr
index 7a0f4ac..d0369d6 100644
--- a/testsuite/tests/partial-sigs/should_compile/T15039d.stderr
+++ b/testsuite/tests/partial-sigs/should_compile/T15039d.stderr
@@ -27,7 +27,7 @@ T15039d.hs:22:14: warning: [-Wpartial-type-signatures (in -Wdefault)]
 T15039d.hs:25:14: warning: [-Wpartial-type-signatures (in -Wdefault)]
     • Found type wildcard ‘_’
         standing for ‘Dict ((a :: *) ~~ (b :: k))’
-      Where: ‘a’, ‘b’, ‘k’ are rigid type variables bound by
+      Where: ‘a’, ‘k’, ‘b’ are rigid type variables bound by
                the type signature for:
                  ex3 :: forall k a (b :: k). Dict ((a :: *) ~~ (b :: k)) -> ()
                at T15039d.hs:24:1-43
diff --git a/testsuite/tests/partial-sigs/should_run/T15415.stderr b/testsuite/tests/partial-sigs/should_run/T15415.stderr
index c11d54e..daa791f 100644
--- a/testsuite/tests/partial-sigs/should_run/T15415.stderr
+++ b/testsuite/tests/partial-sigs/should_run/T15415.stderr
@@ -1,8 +1,8 @@
 
 <interactive>:1:7: error:
     Found type wildcard ‘_’ standing for ‘w0 :: k0’
-    Where: ‘w0’ is an ambiguous type variable
-           ‘k0’ is an ambiguous type variable
+    Where: ‘k0’ is an ambiguous type variable
+           ‘w0’ is an ambiguous type variable
     To use the inferred type, enable PartialTypeSignatures
 
 <interactive>:1:17: error:
@@ -16,8 +16,8 @@
 
 <interactive>:1:7: warning: [-Wpartial-type-signatures (in -Wdefault)]
     Found type wildcard ‘_’ standing for ‘w0 :: k0’
-    Where: ‘w0’ is an ambiguous type variable
-           ‘k0’ is an ambiguous type variable
+    Where: ‘k0’ is an ambiguous type variable
+           ‘w0’ is an ambiguous type variable
 
 <interactive>:1:17: warning: [-Wpartial-type-signatures (in -Wdefault)]
     Found type wildcard ‘_’ standing for ‘* -> *’
diff --git a/testsuite/tests/polykinds/T14265.stderr b/testsuite/tests/polykinds/T14265.stderr
index be6868f..43366fc 100644
--- a/testsuite/tests/polykinds/T14265.stderr
+++ b/testsuite/tests/polykinds/T14265.stderr
@@ -1,7 +1,7 @@
 
 T14265.hs:7:12: error:
     • Found type wildcard ‘_’ standing for ‘w :: k’
-      Where: ‘w’, ‘k’ are rigid type variables bound by
+      Where: ‘k’, ‘w’ are rigid type variables bound by
                the inferred type of f :: proxy w -> ()
                at T14265.hs:8:1-8
       To use the inferred type, enable PartialTypeSignatures