[commit: ghc] master: ghc: Update containers submodule (882978d)

git at git.haskell.org git at git.haskell.org
Mon May 19 05:10:27 UTC 2014


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/882978dd56513faab1c76ad5b8271a7623fd5f56/ghc

>---------------------------------------------------------------

commit 882978dd56513faab1c76ad5b8271a7623fd5f56
Author: Austin Seipp <austin at well-typed.com>
Date:   Sun May 18 16:58:46 2014 -0500

    ghc: Update containers submodule
    
    Also update a few tests, since containers now has IsList instances.
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>


>---------------------------------------------------------------

882978dd56513faab1c76ad5b8271a7623fd5f56
 libraries/containers                                              | 2 +-
 .../tests/overloadedlists/should_run/overloadedlistsrun02.hs      | 5 -----
 .../tests/overloadedlists/should_run/overloadedlistsrun04.hs      | 8 --------
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/libraries/containers b/libraries/containers
index e787f05..e84c5d2 160000
--- a/libraries/containers
+++ b/libraries/containers
@@ -1 +1 @@
-Subproject commit e787f05e7ef7b07363bd04962af8b1ec65693888
+Subproject commit e84c5d2145415cb0beacce0909a551ae5e28d396
diff --git a/testsuite/tests/overloadedlists/should_run/overloadedlistsrun02.hs b/testsuite/tests/overloadedlists/should_run/overloadedlistsrun02.hs
index 8567db3..a6b9bb8 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 478d8d2..1111f93 100644
--- a/testsuite/tests/overloadedlists/should_run/overloadedlistsrun04.hs
+++ b/testsuite/tests/overloadedlists/should_run/overloadedlistsrun04.hs
@@ -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
-          
-



More information about the ghc-commits mailing list