summaryrefslogtreecommitdiff
path: root/testsuite/tests/overloadedlists
diff options
context:
space:
mode:
authorAustin Seipp <austin@well-typed.com>2014-05-18 16:58:46 -0500
committerAustin Seipp <austin@well-typed.com>2014-05-18 21:11:13 -0500
commit882978dd56513faab1c76ad5b8271a7623fd5f56 (patch)
tree90c237aabc8f84dd0d8188441c83b768866b2138 /testsuite/tests/overloadedlists
parentbc7d49a658a516679cc264502e72560c1d2c2314 (diff)
downloadhaskell-882978dd56513faab1c76ad5b8271a7623fd5f56.tar.gz
ghc: Update containers submodule
Also update a few tests, since containers now has IsList instances. Signed-off-by: Austin Seipp <austin@well-typed.com>
Diffstat (limited to 'testsuite/tests/overloadedlists')
-rw-r--r--testsuite/tests/overloadedlists/should_run/overloadedlistsrun02.hs5
-rw-r--r--testsuite/tests/overloadedlists/should_run/overloadedlistsrun04.hs16
2 files changed, 4 insertions, 17 deletions
diff --git a/testsuite/tests/overloadedlists/should_run/overloadedlistsrun02.hs b/testsuite/tests/overloadedlists/should_run/overloadedlistsrun02.hs
index 8567db3566..a6b9bb8ede 100644
--- a/testsuite/tests/overloadedlists/should_run/overloadedlistsrun02.hs
+++ b/testsuite/tests/overloadedlists/should_run/overloadedlistsrun02.hs
@@ -6,8 +6,3 @@ import GHC.Exts
main = do print ([] :: (S.Set Int))
print (['a','b','c'] :: (S.Set Char))
print (['a','c'..'g'] :: (S.Set Char))
-
-instance Ord a => IsList (S.Set a) where
- type (Item (S.Set a)) = a
- fromList = S.fromList
- toList = S.toList
diff --git a/testsuite/tests/overloadedlists/should_run/overloadedlistsrun04.hs b/testsuite/tests/overloadedlists/should_run/overloadedlistsrun04.hs
index 478d8d2c22..1111f93427 100644
--- a/testsuite/tests/overloadedlists/should_run/overloadedlistsrun04.hs
+++ b/testsuite/tests/overloadedlists/should_run/overloadedlistsrun04.hs
@@ -3,10 +3,10 @@
import qualified Data.Set as S
import GHC.Exts
-main = do putStrLn (f [])
- putStrLn (f [1,2])
- putStrLn (f [2,0])
- putStrLn (f [3,2])
+main = do putStrLn (f [])
+ putStrLn (f [1,2])
+ putStrLn (f [2,0])
+ putStrLn (f [3,2])
putStrLn (f [2,7])
putStrLn (f [2,2])
putStrLn (f [1..7])
@@ -18,11 +18,3 @@ f [_] = "one element"
f [2,_] = "two elements, the smaller one is 2"
f [_,2] = "two elements, the bigger one is 2"
f _ = "else"
-
-
-instance Ord a => IsList (S.Set a) where
- type (Item (S.Set a)) = a
- fromList = S.fromList
- toList = S.toList
-
-