Repository : ssh://darcs.haskell.org//srv/darcs/packages/containers

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/fd97ca21716f89ff45034481c65a2c6c6938ed0f

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

commit fd97ca21716f89ff45034481c65a2c6c6938ed0f
Author: Matt West <[email protected]>
Date:   Sat Dec 24 20:52:29 2011 +0000

    Remove NFData instances from benchmarks

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

 benchmarks/IntMap.hs   |    5 -----
 benchmarks/IntSet.hs   |    5 -----
 benchmarks/Map.hs      |    4 ----
 benchmarks/Sequence.hs |    3 ---
 benchmarks/Set.hs      |    4 ----
 5 files changed, 0 insertions(+), 21 deletions(-)

diff --git a/benchmarks/IntMap.hs b/benchmarks/IntMap.hs
index 5237310..48ff4e7 100644
--- a/benchmarks/IntMap.hs
+++ b/benchmarks/IntMap.hs
@@ -11,11 +11,6 @@ import qualified Data.IntMap as M
 import Data.Maybe (fromMaybe)
 import Prelude hiding (lookup)
 
-instance (NFData a) => NFData (M.IntMap a) where
-    rnf M.Nil = ()
-    rnf (M.Tip x y) = rnf x `seq` rnf y
-    rnf (M.Bin p m l r) = rnf p `seq` rnf m `seq` rnf l `seq` rnf r
-
 main = do
     let m = M.fromAscList elems :: M.IntMap Int
     defaultMainWith
diff --git a/benchmarks/IntSet.hs b/benchmarks/IntSet.hs
index cb60626..73f20a7 100644
--- a/benchmarks/IntSet.hs
+++ b/benchmarks/IntSet.hs
@@ -10,11 +10,6 @@ import Criterion.Main
 import Data.List (foldl')
 import qualified Data.IntSet as S
 
-instance NFData S.IntSet where
-    rnf S.Nil = ()
-    rnf (S.Tip a b) = rnf a `seq` rnf b
-    rnf (S.Bin p m l r) = rnf p `seq` rnf m `seq` rnf l `seq` rnf r
-
 main = do
     let s = S.fromAscList elems :: S.IntSet
         s_even = S.fromAscList elems_even :: S.IntSet
diff --git a/benchmarks/Map.hs b/benchmarks/Map.hs
index 84ff312..2482d0d 100644
--- a/benchmarks/Map.hs
+++ b/benchmarks/Map.hs
@@ -11,10 +11,6 @@ import qualified Data.Map as M
 import Data.Maybe (fromMaybe)
 import Prelude hiding (lookup)
 
-instance (NFData k, NFData a) => NFData (M.Map k a) where
-    rnf M.Tip = ()
-    rnf (M.Bin _ k a l r) = rnf k `seq` rnf a `seq` rnf l `seq` rnf r
-
 main = do
     let m = M.fromAscList elems :: M.Map Int Int
         m_even = M.fromAscList elems_even :: M.Map Int Int
diff --git a/benchmarks/Sequence.hs b/benchmarks/Sequence.hs
index c51c056..8c18582 100644
--- a/benchmarks/Sequence.hs
+++ b/benchmarks/Sequence.hs
@@ -8,9 +8,6 @@ import qualified Data.Sequence as S
 import qualified Data.Foldable
 import System.Random
 
-instance NFData a => NFData (S.Seq a) where
-    rnf = Data.Foldable.foldr seq ()
-
 main = do
     let s10 = S.fromList [1..10] :: S.Seq Int
         s100 = S.fromList [1..100] :: S.Seq Int
diff --git a/benchmarks/Set.hs b/benchmarks/Set.hs
index 995606d..76932da 100644
--- a/benchmarks/Set.hs
+++ b/benchmarks/Set.hs
@@ -11,10 +11,6 @@ import Criterion.Main
 import Data.List (foldl')
 import qualified Data.Set as S
 
-instance NFData a => NFData (S.Set a) where
-    rnf S.Tip = ()
-    rnf (S.Bin _ a l r) = rnf a `seq` rnf l `seq` rnf r
-
 main = do
     let s = S.fromAscList elems :: S.Set Int
         s_even = S.fromAscList elems_even :: S.Set Int



_______________________________________________
Cvs-libraries mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-libraries

Reply via email to