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/unsafeLibs | |
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/unsafeLibs')
8 files changed, 0 insertions, 106 deletions
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/BadImport02.hs b/testsuite/tests/safeHaskell/unsafeLibs/BadImport02.hs deleted file mode 100644 index 80eba6288f..0000000000 --- a/testsuite/tests/safeHaskell/unsafeLibs/BadImport02.hs +++ /dev/null @@ -1,27 +0,0 @@ -{-# LANGUAGE StandaloneDeriving, DeriveDataTypeable #-} - --- | Here we used typeable to produce an illegal value -module Main where - -import Data.OldTypeable - -import BadImport02_A - -deriving instance Typeable Nat - -data NInt = NInt Int deriving Show - -instance Typeable NInt where - typeOf _ = typeOf (undefined::Nat) - -main = do - let a = succ' $ zero - Just n@(NInt z) = (cast a) :: Maybe NInt - n' = NInt (-z) - Just m = (cast n') :: Maybe Nat - - putStrLn $ showNat a - putStrLn $ show n - putStrLn $ showNat m - return () - diff --git a/testsuite/tests/safeHaskell/unsafeLibs/BadImport02.stderr b/testsuite/tests/safeHaskell/unsafeLibs/BadImport02.stderr deleted file mode 100644 index e69de29bb2..0000000000 --- a/testsuite/tests/safeHaskell/unsafeLibs/BadImport02.stderr +++ /dev/null diff --git a/testsuite/tests/safeHaskell/unsafeLibs/BadImport02.stdout b/testsuite/tests/safeHaskell/unsafeLibs/BadImport02.stdout deleted file mode 100644 index c0f565d07c..0000000000 --- a/testsuite/tests/safeHaskell/unsafeLibs/BadImport02.stdout +++ /dev/null @@ -1,3 +0,0 @@ -Nat 1 -NInt 1 -Nat -1 diff --git a/testsuite/tests/safeHaskell/unsafeLibs/BadImport02_A.hs b/testsuite/tests/safeHaskell/unsafeLibs/BadImport02_A.hs deleted file mode 100644 index 2ca43343eb..0000000000 --- a/testsuite/tests/safeHaskell/unsafeLibs/BadImport02_A.hs +++ /dev/null @@ -1,16 +0,0 @@ -{-# LANGUAGE Trustworthy #-} -module BadImport02_A ( - Nat, zero, succ', showNat - ) where - -data Nat = NatC Int - -zero :: Nat -zero = NatC 0 - -succ' :: Nat -> Nat -succ' (NatC n) = NatC $ n + 1 - -showNat :: Nat -> String -showNat (NatC n) = "Nat " ++ show n - diff --git a/testsuite/tests/safeHaskell/unsafeLibs/BadImport03.hs b/testsuite/tests/safeHaskell/unsafeLibs/BadImport03.hs deleted file mode 100644 index 9c06d34bab..0000000000 --- a/testsuite/tests/safeHaskell/unsafeLibs/BadImport03.hs +++ /dev/null @@ -1,29 +0,0 @@ -{-# LANGUAGE Safe #-} -{-# LANGUAGE StandaloneDeriving, DeriveDataTypeable #-} - --- | Here we used typeable to produce an illegal value --- Now using SAFE though so will fail -module Main where - -import Data.OldTypeable - -import BadImport03_A - -deriving instance Typeable Nat - -data NInt = NInt Int deriving Show - -instance Typeable NInt where - typeOf _ = typeOf (undefined::Nat) - -main = do - let a = succ' $ zero - Just n@(NInt z) = (cast a) :: Maybe NInt - n' = NInt (-z) - Just m = (cast n') :: Maybe Nat - - putStrLn $ showNat a - putStrLn $ show n - putStrLn $ showNat m - return () - diff --git a/testsuite/tests/safeHaskell/unsafeLibs/BadImport03.stderr b/testsuite/tests/safeHaskell/unsafeLibs/BadImport03.stderr deleted file mode 100644 index d32e33f78f..0000000000 --- a/testsuite/tests/safeHaskell/unsafeLibs/BadImport03.stderr +++ /dev/null @@ -1,7 +0,0 @@ -[1 of 2] Compiling BadImport03_A ( BadImport03_A.hs, BadImport03_A.o ) -[2 of 2] Compiling Main ( BadImport03.hs, BadImport03.o ) - -BadImport03.hs:16:10: - Typeable instances can only be derived in Safe Haskell. - Replace the following instance: - instance [safe] Typeable NInt diff --git a/testsuite/tests/safeHaskell/unsafeLibs/BadImport03_A.hs b/testsuite/tests/safeHaskell/unsafeLibs/BadImport03_A.hs deleted file mode 100644 index 1ae36bf97d..0000000000 --- a/testsuite/tests/safeHaskell/unsafeLibs/BadImport03_A.hs +++ /dev/null @@ -1,16 +0,0 @@ -{-# LANGUAGE Trustworthy #-} -module BadImport03_A ( - Nat, zero, succ', showNat - ) where - -data Nat = NatC Int - -zero :: Nat -zero = NatC 0 - -succ' :: Nat -> Nat -succ' (NatC n) = NatC $ n + 1 - -showNat :: Nat -> String -showNat (NatC n) = "Nat " ++ show n - diff --git a/testsuite/tests/safeHaskell/unsafeLibs/all.T b/testsuite/tests/safeHaskell/unsafeLibs/all.T index 605f7de3c5..4ed5aab700 100644 --- a/testsuite/tests/safeHaskell/unsafeLibs/all.T +++ b/testsuite/tests/safeHaskell/unsafeLibs/all.T @@ -19,14 +19,6 @@ test('Dep10', normal, compile_fail, ['']) # check unsafe modules are marked unsafe test('BadImport01', normal, compile_fail, ['']) -test('BadImport02', - extra_clean(['BadImport02_A.o', 'BadImport02_A.hi']), - multimod_compile_and_run, - ['BadImport02', '']) -test('BadImport03', - extra_clean(['BadImport03_A.o', 'BadImport03_A.hi']), - multimod_compile_fail, - ['BadImport03', '']) test('BadImport05', normal, compile_fail, ['']) test('BadImport06', normal, compile_fail, ['']) test('BadImport07', normal, compile_fail, ['']) |