diff options
author | Michael Karg <mgoremeier@gmail.com> | 2014-10-18 15:50:48 +0200 |
---|---|---|
committer | Herbert Valerio Riedel <hvr@gnu.org> | 2014-10-18 16:23:20 +0200 |
commit | 7369d2595a8cceebe457a44c8400828f4df87ea0 (patch) | |
tree | ec48da655bf65389768d6fee4ae6ca325f3a4fdb /testsuite/tests/safeHaskell/ghci | |
parent | 612f3d120c65a461a4ad7f212d67bdae005f4975 (diff) | |
download | haskell-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/safeHaskell/ghci')
-rw-r--r-- | testsuite/tests/safeHaskell/ghci/all.T | 1 | ||||
-rw-r--r-- | testsuite/tests/safeHaskell/ghci/p15.script | 23 | ||||
-rw-r--r-- | testsuite/tests/safeHaskell/ghci/p15.stderr | 20 | ||||
-rw-r--r-- | testsuite/tests/safeHaskell/ghci/p15.stdout | 2 |
4 files changed, 0 insertions, 46 deletions
diff --git a/testsuite/tests/safeHaskell/ghci/all.T b/testsuite/tests/safeHaskell/ghci/all.T index 2dca62efd6..c0ca23ac26 100644 --- a/testsuite/tests/safeHaskell/ghci/all.T +++ b/testsuite/tests/safeHaskell/ghci/all.T @@ -19,7 +19,6 @@ test('p12', normalise_errmsg_fun(normaliseBytestringPackage), ghci_script, ['p12.script']) test('p13', normal, ghci_script, ['p13.script']) test('p14', normal, ghci_script, ['p14.script']) -test('p15', normal, ghci_script, ['p15.script']) test('p16', normal, ghci_script, ['p16.script']) test('p17', normalise_errmsg_fun(normaliseBytestringPackage), ghci_script, ['p17.script']) diff --git a/testsuite/tests/safeHaskell/ghci/p15.script b/testsuite/tests/safeHaskell/ghci/p15.script deleted file mode 100644 index 81f2033ea6..0000000000 --- a/testsuite/tests/safeHaskell/ghci/p15.script +++ /dev/null @@ -1,23 +0,0 @@ --- Test restricted functionality: Data.Typeable -:unset +s -:set -XSafe -:set -XDeriveDataTypeable -:set -XStandaloneDeriving - -:m + Data.OldTypeable - -data H = H {h :: String} deriving (Typeable, Show) - -data G = G [Int] deriving (Show) - -instance Typeable G where { typeOf _ = typeOf (undefined :: H) } - -let x = H "Hello" -let y = G [0] - -x -y - -let (Just y_as_H) = (cast y) :: Maybe H -y_as_H - diff --git a/testsuite/tests/safeHaskell/ghci/p15.stderr b/testsuite/tests/safeHaskell/ghci/p15.stderr deleted file mode 100644 index 55b5d4beae..0000000000 --- a/testsuite/tests/safeHaskell/ghci/p15.stderr +++ /dev/null @@ -1,20 +0,0 @@ - -Top level: Warning: - Module ‘Data.OldTypeable’ is deprecated: Use Data.Typeable instead - -<interactive>:10:36: Warning: - In the use of type constructor or class ‘Typeable’ - (imported from Data.OldTypeable, but defined in Data.OldTypeable.Internal): - Deprecated: "Use Data.Typeable.Internal instead" - -<interactive>:14:10: - Typeable instances can only be derived in Safe Haskell. - Replace the following instance: - instance [safe] Typeable G - -<interactive>:22:22: - No instance for (Typeable G) arising from a use of ‘cast’ - In the expression: (cast y) :: Maybe H - In a pattern binding: (Just y_as_H) = (cast y) :: Maybe H - -<interactive>:23:1: Not in scope: ‘y_as_H’ diff --git a/testsuite/tests/safeHaskell/ghci/p15.stdout b/testsuite/tests/safeHaskell/ghci/p15.stdout deleted file mode 100644 index 40b3f68882..0000000000 --- a/testsuite/tests/safeHaskell/ghci/p15.stdout +++ /dev/null @@ -1,2 +0,0 @@ -H {h = "Hello"} -G [0] |