Skip to content
Snippets Groups Projects
Commit f7dada91 authored by Teo Camarasu's avatar Teo Camarasu
Browse files

Add critbit patch for foldl' change

parent dc06dad9
No related branches found
No related tags found
1 merge request!325Add some patches to deal with foldl' being exported from Prelude
diff --git a/Data/CritBit/Set.hs b/Data/CritBit/Set.hs diff --git a/Data/CritBit/Set.hs b/Data/CritBit/Set.hs
index 0039925..4a4ffc4 100644 index 0039925..0bfc74d 100644
--- a/Data/CritBit/Set.hs --- a/Data/CritBit/Set.hs
+++ b/Data/CritBit/Set.hs +++ b/Data/CritBit/Set.hs
@@ -90,6 +90,7 @@ import Data.CritBit.Types.Internal (CritBit(..), Set(..), CritBitKey, Node(..)) @@ -90,16 +90,20 @@ import Data.CritBit.Types.Internal (CritBit(..), Set(..), CritBitKey, Node(..))
import Data.Foldable (Foldable, foldMap) import Data.Foldable (Foldable, foldMap)
import Data.Maybe (isJust) import Data.Maybe (isJust)
import Data.Monoid (Monoid(..)) import Data.Monoid (Monoid(..))
-import Prelude hiding (null, filter, map, foldl, foldr)
+import Data.Semigroup (Semigroup(..)) +import Data.Semigroup (Semigroup(..))
import Prelude hiding (null, filter, map, foldl, foldr) +import Prelude hiding (null, filter, map, foldl, foldr, foldl')
import qualified Data.CritBit.Tree as T import qualified Data.CritBit.Tree as T
import qualified Data.List as List import qualified Data.List as List
@@ -97,9 +98,12 @@ import qualified Data.List as List
instance (Show a) => Show (Set a) where instance (Show a) => Show (Set a) where
show s = "fromList " ++ show (toList s) show s = "fromList " ++ show (toList s)
...@@ -25,7 +26,7 @@ index 0039925..4a4ffc4 100644 ...@@ -25,7 +26,7 @@ index 0039925..4a4ffc4 100644
instance Foldable Set where instance Foldable Set where
diff --git a/Data/CritBit/Tree.hs b/Data/CritBit/Tree.hs diff --git a/Data/CritBit/Tree.hs b/Data/CritBit/Tree.hs
index e50738b..5eb95fa 100644 index e50738b..7c1b205 100644
--- a/Data/CritBit/Tree.hs --- a/Data/CritBit/Tree.hs
+++ b/Data/CritBit/Tree.hs +++ b/Data/CritBit/Tree.hs
@@ -153,15 +153,19 @@ import Data.CritBit.Core @@ -153,15 +153,19 @@ import Data.CritBit.Core
...@@ -34,7 +35,8 @@ index e50738b..5eb95fa 100644 ...@@ -34,7 +35,8 @@ index e50738b..5eb95fa 100644
import Data.Monoid (Monoid(..)) import Data.Monoid (Monoid(..))
+import Data.Semigroup (Semigroup(..)) +import Data.Semigroup (Semigroup(..))
import Data.Traversable (Traversable(traverse)) import Data.Traversable (Traversable(traverse))
import Prelude hiding (foldl, foldr, lookup, null, map, filter) -import Prelude hiding (foldl, foldr, lookup, null, map, filter)
+import Prelude hiding (foldl, foldr, lookup, null, map, filter, foldl')
import qualified Data.Array as A import qualified Data.Array as A
import qualified Data.Foldable as Foldable import qualified Data.Foldable as Foldable
import qualified Data.List as List import qualified Data.List as List
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment