Merge pull request #11 from jdegoes/ready/update-deps

update dependencies for the identity and prelude changes.

Author: paf31

bower.json

@@ -24,21 +24,22 @@
     "tests"
   ],
   "dependencies": {
-    "purescript-transformers":  "~0.2.1",
-    "purescript-foldable-traversable": "~0.1.3",
-    "purescript-tuples":        "~0.2.1",
+    "purescript-transformers":  "~0.3.0",
+    "purescript-foldable-traversable": "~0.1.4",
+    "purescript-tuples":        "~0.2.2",
+    "purescript-identity":      "~0.1.0",
     "purescript-profunctor":    "~0.0.1",
-    "purescript-distributive":  "~0.1.1",
+    "purescript-distributive":  "~0.2.0",
     "purescript-contravariant": "~0.0.1",
-    "purescript-const":         "~0.1.0",
-    "purescript-maps":          "~0.1.1",
+    "purescript-const":         "~0.1.1",
+    "purescript-maps":          "~0.1.3",
     "purescript-sets":          "~0.1.0",
     "purescript-arrows":        "~0.1.1",
-    "purescript-enums":         "~0.2.3",
-    "purescript-bifunctors":    "~0.0.4"
+    "purescript-enums":         "~0.2.4",
+    "purescript-bifunctors":    "~0.0.6"
   },
   "devDependencies": {
     "purescript-easy-ffi": "~1.0.1",
-    "purescript-quickcheck": "~0.2.2"
+    "purescript-strongcheck": "~0.4.14"
   }
 }

src/Control/Lens.purs

@@ -50,7 +50,7 @@ module Control.Lens
   , under
   , withIso
   -- Lens
-  , (#~), (<#>), (??)
+  , (#~), (??)
   , lens
   -- Prism
   , clonePrism
@@ -241,10 +241,8 @@ module Control.Lens
 
   -- Lens
   infixl 1 #~
-  infixl 1 <#>
   infixl 1 ??
   (#~)  = Lens.(#~)
-  (<#>) = Lens.(<#>)
   (??)  = Lens.(??)
   lens  = Lens.lens
 

src/Control/Lens/At.purs

@@ -10,9 +10,8 @@ module Control.Lens.At
   ) where
 
   import Control.Lens.Setter ((.~))
-  import Control.Lens.Lens ((<#>))
   import Control.Lens.Type (LensP(), TraversalP())
-  import Control.Monad.Identity (Identity(..))
+  import Data.Identity (Identity(..))
 
   import Data.Array (delete, elemIndex, snoc, updateAt)
   import Data.Maybe (maybe, Maybe(..))

src/Control/Lens/Getter.purs

@@ -11,7 +11,7 @@ module Control.Lens.Getter
 
   import Control.Lens.Internal.Indexed (Conjoined)
   import Control.Lens.Type (IndexPreservingGetter(), Optical())
-  import Control.Monad.Identity (Identity())
+  import Data.Identity (Identity())
   import Control.Monad.Reader.Class (reader, MonadReader)
   import Control.Monad.State.Class (gets, MonadState)
 

src/Control/Lens/Internal/Indexed.purs

@@ -3,7 +3,7 @@ module Control.Lens.Internal.Indexed where
   import Control.Arrow.ArrowApply (ArrowApply)
   import Control.Arrow.ArrowChoice (ArrowChoice)
   import Control.Arrow.ArrowLoop (ArrowLoop)
-  import Control.Monad.Identity (runIdentity, Identity(..))
+  import Data.Identity (runIdentity, Identity(..))
   import Control.Comonad (Comonad)
 
   import Data.Distributive (Distributive)
@@ -46,14 +46,3 @@ module Control.Lens.Internal.Indexed where
   --          -> f t
   -- indexing f pafb s =
   --   snd $ runIndexing (f (\a -> Indexing (\n -> Tuple (n + 1) (indexed pafb n a))) s) 0
-
-  -- Orphan instances should be moved where they belong.
-
-  instance traversableIdentity :: Traversable Identity where
-    traverse a2mb (Identity a) = Identity <$> a2mb a
-    sequence (Identity ma) = Identity <$> ma
-
-  instance foldableIdentity :: Foldable Identity where
-    foldr f z   = runIdentity >>> flip f z
-    foldl f z   = runIdentity >>> f z
-    foldMap a2m = runIdentity >>> a2m

src/Control/Lens/Internal/Setter.purs

@@ -1,6 +1,6 @@
 module Control.Lens.Internal.Setter where
 
-  import Control.Monad.Identity (runIdentity, Identity(..))
+  import Data.Identity (runIdentity, Identity(..))
 
   import Data.Distributive (Distributive)
   import Data.Foldable (foldl, foldr, foldMap, Foldable)
@@ -15,15 +15,4 @@ module Control.Lens.Internal.Setter where
   instance settableIdentity :: Settable Identity where
     untainted (Identity x) = x
     untaintedDot = rmap runIdentity
-    taintedDot = rmap Identity
-
-  -- Move these orphan instances to the appropriate places.
-
-  instance foldableIdentity :: Foldable Identity where
-    foldr f z (Identity x) = x `f` z
-    foldl f z (Identity x) = z `f` x
-    foldMap f (Identity x) = f x
-
-  instance traversableIdentity :: Traversable Identity where
-    traverse a2mb (Identity x) = Identity <$> a2mb x
-    sequence (Identity mx) = Identity <$> mx
+    taintedDot = rmap Identity

src/Control/Lens/Iso.purs

@@ -15,7 +15,7 @@ module Control.Lens.Iso
   import Control.Lens.Internal.Iso (Exchange(..))
   import Control.Lens.Prism (APrismP())
   import Control.Lens.Type (Iso(), IsoP())
-  import Control.Monad.Identity (runIdentity, Identity(..))
+  import Data.Identity (runIdentity, Identity(..))
 
   import Data.Enum (fromEnum, toEnum, Enum)
   import Data.Maybe (maybe, Maybe(..))

src/Control/Lens/Lens.purs

@@ -1,6 +1,5 @@
 module Control.Lens.Lens
   ( (#~)
-  , (<#>)
   , (??)
   , lens
   ) where
@@ -9,7 +8,6 @@ module Control.Lens.Lens
   import Control.Monad.State (execState, State())
 
   infixl 1 #~
-  infixl 1 <#>
   infixl 1 ??
 
   lens :: forall s t a b. (s -> a) -> (s -> b -> t) -> Lens s t a b
@@ -18,8 +16,5 @@ module Control.Lens.Lens
   (#~) :: forall a s. s -> State s a -> s
   (#~) s sa = execState sa s
 
-  (<#>) :: forall f a b. (Functor f) => f a -> (a -> b) -> f b
-  (<#>) x f = f <$> x
-
   (??) :: forall f a b. (Functor f) => f (a -> b) -> a -> f b
   (??) ff x = (\f -> f x) <$> ff

src/Control/Lens/Prism.purs

@@ -18,7 +18,7 @@ module Control.Lens.Prism
 
   import Control.Lens.Internal.Prism (Market(..))
   import Control.Lens.Type (Lens(), Prism(), PrismP())
-  import Control.Monad.Identity (runIdentity, Identity(..))
+  import Data.Identity (runIdentity, Identity(..))
   import Control.MonadPlus (guard)
 
   import Data.Profunctor (dimap, lmap, Profunctor)

src/Control/Lens/README.md

@@ -195,8 +195,6 @@
 
     (#~) :: forall a s. s -> State s a -> s
 
-    (<#>) :: forall f a b. (Functor f) => f a -> (a -> b) -> f b
-
     (??) :: forall f a b. (Functor f) => f (a -> b) -> a -> f b
 
     lens :: forall s t a b. (s -> a) -> (s -> b -> t) -> Lens s t a b

src/Control/Lens/Review.purs

@@ -16,7 +16,7 @@ module Control.Lens.Review
   import Control.Lens.Getter (to, view, Getting())
   import Control.Lens.Internal.Setter (Settable)
   import Control.Lens.Type (Getter(), Optic(), OpticP())
-  import Control.Monad.Identity (runIdentity, Identity(..))
+  import Data.Identity (runIdentity, Identity(..))
   import Control.Monad.Reader.Class (reader, MonadReader)
   import Control.Monad.State.Class (gets, MonadState)
 

src/Control/Lens/Setter.purs

@@ -40,7 +40,7 @@ module Control.Lens.Setter
 
   import Control.Lens.Internal.Setter (taintedDot, untaintedDot, Settable)
   import Control.Lens.Type (Optical(), Setter())
-  import Control.Monad.Identity (runIdentity, Identity(..))
+  import Data.Identity (runIdentity, Identity(..))
   import Control.Monad.State.Class (modify, MonadState)
 
   import Data.Contravariant ((>$<), Contravariant)

src/Control/Lens/Tuple.purs

@@ -4,7 +4,7 @@ module Control.Lens.Tuple
   , _2
   ) where
 
-  -- import Control.Monad.Identity (Identity(..))
+  -- import Data.Identity (Identity(..))
   import Control.Lens.Type (Lens())
 
   import Data.Tuple (Tuple(..))

src/Data/Profunctor/Rep.purs

@@ -1,6 +1,6 @@
 module Data.Profunctor.Rep where
 
-  import Control.Monad.Identity (runIdentity, Identity(..))
+  import Data.Identity (runIdentity, Identity(..))
 
   import Data.Profunctor