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

Add patches to deal with addition of Data.Functor.unzip

parent 3d61ce1e
No related branches found
No related tags found
1 merge request!317Add some patches
diff --git a/src/ClassyPrelude.hs b/src/ClassyPrelude.hs
index 139f9bc..ae14fb2 100644
--- a/src/ClassyPrelude.hs
+++ b/src/ClassyPrelude.hs
@@ -153,7 +153,7 @@ module ClassyPrelude
import qualified Prelude
import Control.Applicative ((<**>),liftA,liftA2,liftA3,Alternative (..), optional)
-import Data.Functor
+import Data.Functor hiding (unzip)
import Control.Exception (assert)
import Control.DeepSeq (deepseq, ($!!), force, NFData (..))
import Control.Monad (when, unless, void, liftM, ap, forever, join, replicateM_, guard, MonadPlus (..), (=<<), (>=>), (<=<), liftM2, liftM3, liftM4, liftM5)
diff --git a/library/StrictList/Prelude.hs b/library/StrictList/Prelude.hs
index 7f6d8cb..d2198b7 100644
--- a/library/StrictList/Prelude.hs
+++ b/library/StrictList/Prelude.hs
@@ -26,7 +26,7 @@ import Data.Either as Exports
import Data.Fixed as Exports
import Data.Foldable as Exports hiding (toList)
import Data.Function as Exports hiding (id, (.))
-import Data.Functor as Exports
+import Data.Functor as Exports hiding (unzip)
import Data.Functor.Alt as Exports hiding (many, optional, some, ($>))
import Data.Functor.Bind as Exports hiding (($>))
import Data.Functor.Extend as Exports
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