From 30e1d1f49467b67c55a3dc2008cc1031dbce8005 Mon Sep 17 00:00:00 2001 From: Andrew McCluskey Date: Fri, 1 Feb 2019 11:51:54 +1000 Subject: [PATCH 1/2] Remove remaining imports of `bool`. Bool was removed from Lets.Data in #15. --- src/Lets/GetSetLens.hs | 2 +- src/Lets/Lens.hs | 2 +- src/Lets/OpticPolyLens.hs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Lets/GetSetLens.hs b/src/Lets/GetSetLens.hs index 0ecb04e..811f5b5 100644 --- a/src/Lets/GetSetLens.hs +++ b/src/Lets/GetSetLens.hs @@ -44,7 +44,7 @@ import Data.Map(Map) import qualified Data.Map as Map(insert, delete, lookup) import Data.Set(Set) import qualified Data.Set as Set(insert, delete, member) -import Lets.Data(Person(Person), Locality(Locality), Address(Address), bool) +import Lets.Data(Person(Person), Locality(Locality), Address(Address)) import Prelude hiding (product) -- $setup diff --git a/src/Lets/Lens.hs b/src/Lets/Lens.hs index 20d2a07..5262cae 100644 --- a/src/Lets/Lens.hs +++ b/src/Lets/Lens.hs @@ -82,7 +82,7 @@ import qualified Data.Map as Map(insert, delete, lookup) import Data.Monoid(Monoid) import qualified Data.Set as Set(Set, insert, delete, member) import Data.Traversable(Traversable(traverse)) -import Lets.Data(AlongsideLeft(AlongsideLeft, getAlongsideLeft), AlongsideRight(AlongsideRight, getAlongsideRight), Identity(Identity, getIdentity), Const(Const, getConst), Tagged(Tagged, getTagged), IntOr(IntOrIs, IntOrIsNot), IntAnd(IntAnd), Person(Person), Locality(Locality), Address(Address), bool) +import Lets.Data(AlongsideLeft(AlongsideLeft, getAlongsideLeft), AlongsideRight(AlongsideRight, getAlongsideRight), Identity(Identity, getIdentity), Const(Const, getConst), Tagged(Tagged, getTagged), IntOr(IntOrIs, IntOrIsNot), IntAnd(IntAnd), Person(Person), Locality(Locality), Address(Address)) import Lets.Choice(Choice(left, right)) import Lets.Profunctor(Profunctor(dimap)) import Prelude hiding (product) diff --git a/src/Lets/OpticPolyLens.hs b/src/Lets/OpticPolyLens.hs index 943135a..e2e483d 100644 --- a/src/Lets/OpticPolyLens.hs +++ b/src/Lets/OpticPolyLens.hs @@ -48,7 +48,7 @@ import Data.Map(Map) import qualified Data.Map as Map(insert, delete, lookup) import Data.Set(Set) import qualified Data.Set as Set(insert, delete, member) -import Lets.Data(AlongsideLeft(AlongsideLeft, getAlongsideLeft), AlongsideRight(AlongsideRight, getAlongsideRight), Identity(Identity, getIdentity), Const(Const, getConst), IntAnd(IntAnd), Person(Person), Locality(Locality), Address(Address), bool) +import Lets.Data(AlongsideLeft(AlongsideLeft, getAlongsideLeft), AlongsideRight(AlongsideRight, getAlongsideRight), Identity(Identity, getIdentity), Const(Const, getConst), IntAnd(IntAnd), Person(Person), Locality(Locality), Address(Address)) import Prelude hiding (product) -- $setup From e77b4098628299a9c39d7df8fd5b9d43c7a8fe3c Mon Sep 17 00:00:00 2001 From: Andrew McCluskey Date: Fri, 1 Feb 2019 15:46:27 +1000 Subject: [PATCH 2/2] Import bool from base in doctests. --- src/Lets/GetSetLens.hs | 1 + src/Lets/Lens.hs | 1 + src/Lets/OpticPolyLens.hs | 1 + src/Lets/StoreLens.hs | 1 + 4 files changed, 4 insertions(+) diff --git a/src/Lets/GetSetLens.hs b/src/Lets/GetSetLens.hs index 811f5b5..5d6d959 100644 --- a/src/Lets/GetSetLens.hs +++ b/src/Lets/GetSetLens.hs @@ -50,6 +50,7 @@ import Prelude hiding (product) -- $setup -- >>> import qualified Data.Map as Map(fromList) -- >>> import qualified Data.Set as Set(fromList) +-- >>> import Data.Bool(bool) -- >>> import Data.Char(ord) -- >>> import Lets.Data diff --git a/src/Lets/Lens.hs b/src/Lets/Lens.hs index 5262cae..f0a3ed4 100644 --- a/src/Lets/Lens.hs +++ b/src/Lets/Lens.hs @@ -90,6 +90,7 @@ import Prelude hiding (product) -- $setup -- >>> import qualified Data.Map as Map(fromList) -- >>> import qualified Data.Set as Set(fromList) +-- >>> import Data.Bool(bool) -- >>> import Data.Char(ord) -- >>> import Lets.Data diff --git a/src/Lets/OpticPolyLens.hs b/src/Lets/OpticPolyLens.hs index e2e483d..53b85e0 100644 --- a/src/Lets/OpticPolyLens.hs +++ b/src/Lets/OpticPolyLens.hs @@ -54,6 +54,7 @@ import Prelude hiding (product) -- $setup -- >>> import qualified Data.Map as Map(fromList) -- >>> import qualified Data.Set as Set(fromList) +-- >>> import Data.Bool(bool) -- >>> import Data.Char(ord) -- >>> import Lets.Data diff --git a/src/Lets/StoreLens.hs b/src/Lets/StoreLens.hs index df4a6d8..1929e6f 100644 --- a/src/Lets/StoreLens.hs +++ b/src/Lets/StoreLens.hs @@ -59,6 +59,7 @@ import Prelude hiding (product) -- $setup -- >>> import qualified Data.Map as Map(fromList) -- >>> import qualified Data.Set as Set(fromList) +-- >>> import Data.Bool(bool) -- >>> import Data.Char(ord) -- >>> import Lets.Data