[commit: packages/containers] develop-0.6, develop-0.6-questionable, master, zip-devel: Move utilities (BitUtils, Strict{Fold, Pair}) to Utils directory. (9cfe43a)

git at git.haskell.org git at git.haskell.org
Fri Jan 23 22:39:10 UTC 2015


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

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/9cfe43a9790f8c8511f93f380e7d7168bb1c1a88

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

commit 9cfe43a9790f8c8511f93f380e7d7168bb1c1a88
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Oct 12 11:13:13 2014 +0200

    Move utilities (BitUtils,Strict{Fold,Pair}) to Utils directory.
    
    The Data directory was becoming a little too crowded.


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

9cfe43a9790f8c8511f93f380e7d7168bb1c1a88
 Data/IntMap/Base.hs            | 6 +++---
 Data/IntMap/Strict.hs          | 6 +++---
 Data/IntSet/Base.hs            | 6 +++---
 Data/Map/Base.hs               | 4 ++--
 Data/Map/Strict.hs             | 4 ++--
 Data/Set/Base.hs               | 4 ++--
 Data/{ => Utils}/BitUtil.hs    | 4 ++--
 Data/{ => Utils}/StrictFold.hs | 2 +-
 Data/{ => Utils}/StrictPair.hs | 2 +-
 containers.cabal               | 6 +++---
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 8d04bfa..fec5abe 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -225,11 +225,11 @@ import Data.Typeable
 import Data.Word (Word)
 import Prelude hiding (lookup, map, filter, foldr, foldl, null)
 
-import Data.BitUtil
 import Data.IntSet.Base (Key)
 import qualified Data.IntSet.Base as IntSet
-import Data.StrictFold
-import Data.StrictPair
+import Data.Utils.BitUtil
+import Data.Utils.StrictFold
+import Data.Utils.StrictPair
 
 #if __GLASGOW_HASKELL__
 import Data.Data (Data(..), Constr, mkConstr, constrIndex, Fixity(Prefix),
diff --git a/Data/IntMap/Strict.hs b/Data/IntMap/Strict.hs
index f19682e..3a7dde8 100644
--- a/Data/IntMap/Strict.hs
+++ b/Data/IntMap/Strict.hs
@@ -256,10 +256,10 @@ import Data.IntMap.Base hiding
     , fromDistinctAscList
     )
 
-import Data.BitUtil
 import qualified Data.IntSet.Base as IntSet
-import Data.StrictFold
-import Data.StrictPair
+import Data.Utils.BitUtil
+import Data.Utils.StrictFold
+import Data.Utils.StrictPair
 
 -- $strictness
 --
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index c843d46..309ab42 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -191,9 +191,9 @@ import Data.Typeable
 import Data.Word (Word)
 import Prelude hiding (filter, foldr, foldl, null, map)
 
-import Data.BitUtil
-import Data.StrictFold
-import Data.StrictPair
+import Data.Utils.BitUtil
+import Data.Utils.StrictFold
+import Data.Utils.StrictPair
 
 #if __GLASGOW_HASKELL__
 import Data.Data (Data(..), Constr, mkConstr, constrIndex, Fixity(Prefix), DataType, mkDataType)
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 650e003..d1d8ffe 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -272,13 +272,13 @@ import Control.DeepSeq (NFData(rnf))
 import Data.Bits (shiftL, shiftR)
 import qualified Data.Foldable as Foldable
 import Data.Monoid (Monoid(..))
-import Data.StrictPair
 import Data.Traversable (Traversable(traverse))
 import Data.Typeable
 import Prelude hiding (lookup, map, filter, foldr, foldl, null)
 
 import qualified Data.Set.Base as Set
-import Data.StrictFold
+import Data.Utils.StrictFold
+import Data.Utils.StrictPair
 
 #if __GLASGOW_HASKELL__
 import GHC.Exts ( build )
diff --git a/Data/Map/Strict.hs b/Data/Map/Strict.hs
index 4e0d820..5f286b9 100644
--- a/Data/Map/Strict.hs
+++ b/Data/Map/Strict.hs
@@ -269,8 +269,8 @@ import Data.Map.Base hiding
     , updateMaxWithKey
     )
 import qualified Data.Set.Base as Set
-import Data.StrictFold
-import Data.StrictPair
+import Data.Utils.StrictFold
+import Data.Utils.StrictPair
 
 import Data.Bits (shiftL, shiftR)
 
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 3a2c938..6c39a8e 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -194,8 +194,8 @@ import qualified Data.Foldable as Foldable
 import Data.Typeable
 import Control.DeepSeq (NFData(rnf))
 
-import Data.StrictFold
-import Data.StrictPair
+import Data.Utils.StrictFold
+import Data.Utils.StrictPair
 
 #if __GLASGOW_HASKELL__
 import GHC.Exts ( build )
diff --git a/Data/BitUtil.hs b/Data/Utils/BitUtil.hs
similarity index 97%
rename from Data/BitUtil.hs
rename to Data/Utils/BitUtil.hs
index 848bac1..bea078e 100644
--- a/Data/BitUtil.hs
+++ b/Data/Utils/BitUtil.hs
@@ -7,7 +7,7 @@
 #endif
 -----------------------------------------------------------------------------
 -- |
--- Module      :  Data.BitUtil
+-- Module      :  Data.Utils.BitUtil
 -- Copyright   :  (c) Clark Gaebel 2012
 --                (c) Johan Tibel 2012
 -- License     :  BSD-style
@@ -16,7 +16,7 @@
 -- Portability :  portable
 -----------------------------------------------------------------------------
 
-module Data.BitUtil
+module Data.Utils.BitUtil
     ( highestBitMask
     , shiftLL
     , shiftRL
diff --git a/Data/StrictFold.hs b/Data/Utils/StrictFold.hs
similarity index 90%
rename from Data/StrictFold.hs
rename to Data/Utils/StrictFold.hs
index 9c90a66..953c9f1 100644
--- a/Data/StrictFold.hs
+++ b/Data/Utils/StrictFold.hs
@@ -2,7 +2,7 @@
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
 #endif
-module Data.StrictFold (foldlStrict) where
+module Data.Utils.StrictFold (foldlStrict) where
 
 -- | Same as regular 'Data.List.foldl'', but marked INLINE so that it is always
 -- inlined. This allows further optimization of the call to f, which can be
diff --git a/Data/StrictPair.hs b/Data/Utils/StrictPair.hs
similarity index 77%
rename from Data/StrictPair.hs
rename to Data/Utils/StrictPair.hs
index 48609b3..6ae7ded 100644
--- a/Data/StrictPair.hs
+++ b/Data/Utils/StrictPair.hs
@@ -2,7 +2,7 @@
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
 #endif
-module Data.StrictPair (StrictPair(..), toPair) where
+module Data.Utils.StrictPair (StrictPair(..), toPair) where
 
 -- | Same as regular Haskell pairs, but (x :*: _|_) = (_|_ :*: y) =
 -- _|_
diff --git a/containers.cabal b/containers.cabal
index a952a77..dcf36fd 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -52,13 +52,13 @@ Library
             Data.Sequence
             Data.Tree
     other-modules:
-        Data.BitUtil
         Data.IntMap.Base
         Data.IntSet.Base
         Data.Map.Base
         Data.Set.Base
-        Data.StrictFold
-        Data.StrictPair
+        Data.Utils.BitUtil
+        Data.Utils.StrictFold
+        Data.Utils.StrictPair
 
     include-dirs: include
 



More information about the ghc-commits mailing list