summaryrefslogtreecommitdiff
path: root/testsuite/tests/deriving
diff options
context:
space:
mode:
authorMichael Karg <mgoremeier@gmail.com>2014-10-18 15:50:48 +0200
committerHerbert Valerio Riedel <hvr@gnu.org>2014-10-18 16:23:20 +0200
commit7369d2595a8cceebe457a44c8400828f4df87ea0 (patch)
treeec48da655bf65389768d6fee4ae6ca325f3a4fdb /testsuite/tests/deriving
parent612f3d120c65a461a4ad7f212d67bdae005f4975 (diff)
downloadhaskell-7369d2595a8cceebe457a44c8400828f4df87ea0.tar.gz
Remove obsolete Data.OldTypeable (#9639)
This finally removes the `Data.OldTypeable` module (which has been deprecated in 7.8), from `base`, compiler and testsuite. The deprecated `Typeable{1..7}` aliases in `Data.Typeable` are not removed yet in order to give existing code a bit more time to adapt. Reviewed By: hvr, dreixel Differential Revision: https://phabricator.haskell.org/D311
Diffstat (limited to 'testsuite/tests/deriving')
-rw-r--r--testsuite/tests/deriving/should_compile/all.T1
-rw-r--r--testsuite/tests/deriving/should_compile/drv021.hs16
-rw-r--r--testsuite/tests/deriving/should_compile/drv021.stderr13
-rw-r--r--testsuite/tests/deriving/should_fail/all.T1
-rw-r--r--testsuite/tests/deriving/should_fail/drvfail014.hs13
-rw-r--r--testsuite/tests/deriving/should_fail/drvfail014.stderr9
6 files changed, 0 insertions, 53 deletions
diff --git a/testsuite/tests/deriving/should_compile/all.T b/testsuite/tests/deriving/should_compile/all.T
index af05006a88..3bf871db61 100644
--- a/testsuite/tests/deriving/should_compile/all.T
+++ b/testsuite/tests/deriving/should_compile/all.T
@@ -14,7 +14,6 @@ test('drv013', normal, compile, [''])
test('drv014', normal, compile, [''])
test('drv015', normal, compile, [''])
test('drv020', normal, compile, [''])
-test('drv021', normal, compile, [''])
test('drv022', normal, compile, [''])
test('deriving-1935', normal, compile, [''])
test('T2378', normal, compile, [''])
diff --git a/testsuite/tests/deriving/should_compile/drv021.hs b/testsuite/tests/deriving/should_compile/drv021.hs
deleted file mode 100644
index 977372a516..0000000000
--- a/testsuite/tests/deriving/should_compile/drv021.hs
+++ /dev/null
@@ -1,16 +0,0 @@
-{-# OPTIONS_GHC -XDeriveDataTypeable -XStandaloneDeriving #-}
-
--- See Trac #1825
--- Test stand-alone deriving for Typeable
--- Horridly, one needs to define instance for Typeable1 etc
-
-module ShouldCompile where
-
-import Data.OldTypeable
-
-data T1 a = T1 a
-data T2 a b = T2 a b
-
-deriving instance Typeable1 T1
-deriving instance Typeable2 T2
-
diff --git a/testsuite/tests/deriving/should_compile/drv021.stderr b/testsuite/tests/deriving/should_compile/drv021.stderr
deleted file mode 100644
index e64989c194..0000000000
--- a/testsuite/tests/deriving/should_compile/drv021.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-
-drv021.hs:9:1: Warning:
- Module ‘Data.OldTypeable’ is deprecated: Use Data.Typeable instead
-
-drv021.hs:14:19: Warning:
- In the use of type constructor or class ‘Typeable1’
- (imported from Data.OldTypeable, but defined in Data.OldTypeable.Internal):
- Deprecated: "Use Data.Typeable.Internal instead"
-
-drv021.hs:15:19: Warning:
- In the use of type constructor or class ‘Typeable2’
- (imported from Data.OldTypeable, but defined in Data.OldTypeable.Internal):
- Deprecated: "Use Data.Typeable.Internal instead"
diff --git a/testsuite/tests/deriving/should_fail/all.T b/testsuite/tests/deriving/should_fail/all.T
index 99da88a55b..7700d62be1 100644
--- a/testsuite/tests/deriving/should_fail/all.T
+++ b/testsuite/tests/deriving/should_fail/all.T
@@ -11,7 +11,6 @@ test('drvfail009', normal, compile_fail, [''])
test('drvfail011', normal, compile_fail, [''])
test('drvfail012', normal, compile_fail, [''])
test('drvfail013', normal, compile_fail, [''])
-test('drvfail014', normal, compile_fail, [''])
test('drvfail015', normal, compile_fail, [''])
test('drvfail016',
extra_clean(['drvfail016.hi-boot', 'drvfail016.o-boot']),
diff --git a/testsuite/tests/deriving/should_fail/drvfail014.hs b/testsuite/tests/deriving/should_fail/drvfail014.hs
deleted file mode 100644
index 117b7d54af..0000000000
--- a/testsuite/tests/deriving/should_fail/drvfail014.hs
+++ /dev/null
@@ -1,13 +0,0 @@
-{-# OPTIONS_GHC -XDeriveDataTypeable -XStandaloneDeriving #-}
-
--- See Trac #1825
-
-module ShouldFail where
-import Data.OldTypeable
-
-data T1 a = T1 a deriving( Typeable1 )
-
-data T2 a b = T2 a b
-
-deriving instance (Typeable a, Typeable b) => Typeable (T2 a b)
- -- c.f. drv021.hs
diff --git a/testsuite/tests/deriving/should_fail/drvfail014.stderr b/testsuite/tests/deriving/should_fail/drvfail014.stderr
deleted file mode 100644
index 56a63ff3fb..0000000000
--- a/testsuite/tests/deriving/should_fail/drvfail014.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-
-drvfail014.hs:8:28:
- Use deriving( Typeable ) on a data type declaration
- In the data declaration for ‘T1’
-
-drvfail014.hs:12:1:
- Derived Typeable instance must be of form (Typeable2 T2)
- In the stand-alone deriving instance for
- ‘(Typeable a, Typeable b) => Typeable (T2 a b)’