summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Dammers <tdammers@gmail.com>2018-10-12 11:22:40 +0200
committerTobias Dammers <tdammers@gmail.com>2018-10-12 11:22:40 +0200
commit834dcd2bf6513e697bf65379bdab7ea1a116fdbd (patch)
tree8b0be03734af9b06b245c65c917435db8ee186d8
parentb7583b6650e2b6f9bb4742d182c503aad2827fc9 (diff)
downloadhaskell-wip/T14880-2-step2-c123.tar.gz
Fix some test wibbleswip/T14880-2-step2-c123
-rw-r--r--testsuite/tests/partial-sigs/should_compile/T12844.stderr2
-rw-r--r--testsuite/tests/partial-sigs/should_compile/T15039a.stderr2
-rw-r--r--testsuite/tests/partial-sigs/should_compile/T15039b.stderr2
-rw-r--r--testsuite/tests/partial-sigs/should_compile/T15039c.stderr2
-rw-r--r--testsuite/tests/partial-sigs/should_compile/T15039d.stderr2
-rw-r--r--testsuite/tests/partial-sigs/should_run/T15415.stderr8
-rw-r--r--testsuite/tests/polykinds/T14265.stderr2
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 7049818a7c..0e01cd30f3 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 d9c8e1056f..1563a2eb23 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 5726c7fa65..21ec20ae40 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 29989c2cdc..b1f76f397e 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 7a0f4acf26..d0369d6f5c 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 c11d54e322..daa791ffa4 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 be6868fdc4..43366fccb7 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