[commit: ghc] ghc-8.0: Rename test for #11334 to 11334b, fixing conflict (f6d2748)
git at git.haskell.org
git at git.haskell.org
Thu Mar 24 00:52:29 UTC 2016
Repository : ssh://git@git.haskell.org/ghc
On branch : ghc-8.0
Link : http://ghc.haskell.org/trac/ghc/changeset/f6d27485df643b2924cc27769b985ccdf1ffc443/ghc
>---------------------------------------------------------------
commit f6d27485df643b2924cc27769b985ccdf1ffc443
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date: Fri Mar 18 21:40:04 2016 -0400
Rename test for #11334 to 11334b, fixing conflict
(cherry picked from commit f8ab575404b726b499e72343b7220e9213880dd4)
>---------------------------------------------------------------
f6d27485df643b2924cc27769b985ccdf1ffc443
testsuite/tests/dependent/should_fail/{T11334.hs => T11334b.hs} | 2 +-
.../tests/dependent/should_fail/{T11334.stderr => T11334b.stderr} | 6 +++---
testsuite/tests/dependent/should_fail/all.T | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/testsuite/tests/dependent/should_fail/T11334.hs b/testsuite/tests/dependent/should_fail/T11334b.hs
similarity index 84%
rename from testsuite/tests/dependent/should_fail/T11334.hs
rename to testsuite/tests/dependent/should_fail/T11334b.hs
index 1f9970f..c6f6d20 100644
--- a/testsuite/tests/dependent/should_fail/T11334.hs
+++ b/testsuite/tests/dependent/should_fail/T11334b.hs
@@ -1,6 +1,6 @@
{-# LANGUAGE DataKinds, NoPolyKinds #-}
-module T11334 where
+module T11334b where
import Data.Functor.Compose
import Data.Proxy
diff --git a/testsuite/tests/dependent/should_fail/T11334.stderr b/testsuite/tests/dependent/should_fail/T11334b.stderr
similarity index 92%
rename from testsuite/tests/dependent/should_fail/T11334.stderr
rename to testsuite/tests/dependent/should_fail/T11334b.stderr
index f7c87a3..8f4251b 100644
--- a/testsuite/tests/dependent/should_fail/T11334.stderr
+++ b/testsuite/tests/dependent/should_fail/T11334b.stderr
@@ -1,5 +1,5 @@
-T11334.hs:8:14: error:
+T11334b.hs:8:14: error:
• Cannot default kind variable ‘f0’
of kind: k0 -> *
Perhaps enable PolyKinds or add a kind signature
@@ -7,7 +7,7 @@ T11334.hs:8:14: error:
In the expression: Proxy :: Proxy Compose
In an equation for ‘p’: p = Proxy :: Proxy Compose
-T11334.hs:8:14: error:
+T11334b.hs:8:14: error:
• Cannot default kind variable ‘g0’
of kind: k10 -> k0
Perhaps enable PolyKinds or add a kind signature
@@ -15,7 +15,7 @@ T11334.hs:8:14: error:
In the expression: Proxy :: Proxy Compose
In an equation for ‘p’: p = Proxy :: Proxy Compose
-T11334.hs:8:14: error:
+T11334b.hs:8:14: error:
• Cannot default kind variable ‘a0’
of kind: k10
Perhaps enable PolyKinds or add a kind signature
diff --git a/testsuite/tests/dependent/should_fail/all.T b/testsuite/tests/dependent/should_fail/all.T
index b830121..a601d60 100644
--- a/testsuite/tests/dependent/should_fail/all.T
+++ b/testsuite/tests/dependent/should_fail/all.T
@@ -9,7 +9,7 @@ test('SelfDep', normal, compile_fail, [''])
test('BadTelescope4', normal, compile_fail, [''])
test('RenamingStar', normal, compile_fail, [''])
test('T11407', normal, compile_fail, [''])
-test('T11334', normal, compile_fail, [''])
+test('T11334b', normal, compile_fail, [''])
test('InferDependency', normal, compile_fail, [''])
test('KindLevelsB', normal, compile_fail, [''])
test('T11471', normal, compile_fail, [''])
More information about the ghc-commits
mailing list