[Pkg-haskell-commits] darcs: haskell-lens: New upstream release
Raúl Benencia
rul at kalgan.cc
Mon Apr 14 22:46:08 UTC 2014
Mon Apr 14 22:29:44 UTC 2014 Ra[_<U+00FA>_]l Benencia <rul at kalgan.cc>
* New upstream release
I've temporarily disabled the tests because two of them, hlint and
doctests, are failing due encoding reasons.
M ./changelog -2 +8
M ./control -5 +31
M ./patches/add-without-th-flag.patch -45 +52
M ./patches/fix-doctest-path.hs -4 +2
M ./patches/fudge-doctest-nonascii.diff -4 +2
M ./patches/guard-ANNotations.patch -89 +93
M ./patches/no-transformers-compat.diff -8 +6
M ./patches/series -1
M ./rules -1 +1
Mon Apr 14 22:29:44 UTC 2014 Raúl Benencia <rul at kalgan.cc>
* New upstream release
I've temporarily disabled the tests because two of them, hlint and
doctests, are failing due encoding reasons.
diff -rN -u old-haskell-lens/changelog new-haskell-lens/changelog
--- old-haskell-lens/changelog 2014-04-14 22:46:08.285811411 +0000
+++ new-haskell-lens/changelog 2014-04-14 22:46:08.285811411 +0000
@@ -1,10 +1,16 @@
-haskell-lens (3.10-2) UNRELEASED; urgency=medium
+haskell-lens (4.1.2-1) UNRELEASED; urgency=medium
+ [ Colin Watson ]
* Express the list of architectures with TH build-dependencies in positive
rather than negative terms, to avoid needing to extend it for new
architectures such as arm64.
- -- Colin Watson <cjwatson at debian.org> Mon, 07 Apr 2014 17:35:42 +0100
+ [ Raúl Benencia ]
+ * New upstream release
+ * Bump standards version, no change
+ * Adapt patches to the new release
+
+ -- Raúl Benencia <rul at kalgan.cc> Mon, 14 Apr 2014 14:19:38 -0300
haskell-lens (3.10-1) unstable; urgency=low
diff -rN -u old-haskell-lens/control new-haskell-lens/control
--- old-haskell-lens/control 2014-04-14 22:46:08.285811411 +0000
+++ new-haskell-lens/control 2014-04-14 22:46:08.289811411 +0000
@@ -8,6 +8,9 @@
, cdbs
, ghc
, ghc-prof
+ , libghc-aeson-dev (>= 0.7)
+ , libghc-aeson-dev (<< 0.8)
+ , libghc-aeson-prof
, libghc-bifunctors-dev (>> 4)
, libghc-bifunctors-dev (<< 5)
, libghc-bifunctors-prof
@@ -20,27 +23,36 @@
, libghc-distributive-dev (>> 0.3)
, libghc-distributive-dev (<< 1)
, libghc-distributive-prof
+ , libghc-exceptions-dev (>= 0.1.1)
+ , libghc-exceptions-dev (<< 1)
+ , libghc-exceptions-prof
+ , libghc-free-dev (>= 4)
+ , libghc-free-dev (<< 5)
+ , libghc-free-prof
, libghc-generic-deriving-dev (>> 1.4) [any-amd64 any-i386 powerpc sparc]
, libghc-generic-deriving-dev (<< 1.7) [any-amd64 any-i386 powerpc sparc]
, libghc-generic-deriving-prof [any-amd64 any-i386 powerpc sparc]
, libghc-hashable-dev (>> 1.1.2.3)
, libghc-hashable-dev (<< 1.3)
, libghc-hashable-prof
- , libghc-monadcatchio-transformers-dev (>> 0.3)
- , libghc-monadcatchio-transformers-dev (<< 0.4)
- , libghc-monadcatchio-transformers-prof
, libghc-mtl-dev (>> 2.0.1)
, libghc-mtl-dev (<< 2.2)
, libghc-mtl-prof
, libghc-parallel-dev (>> 3.1.0.1)
, libghc-parallel-dev (<< 3.3)
, libghc-parallel-prof
+ , libghc-primitive-dev (>= 0.4.0.1)
+ , libghc-primitive-dev (<< 0.6)
+ , libghc-primitive-prof
, libghc-profunctors-dev (>= 4)
, libghc-profunctors-dev (<< 5)
, libghc-profunctors-prof
, libghc-reflection-dev (>> 1.1.6) [any-amd64 any-i386 powerpc sparc]
, libghc-reflection-dev (<< 2) [any-amd64 any-i386 powerpc sparc]
, libghc-reflection-prof [any-amd64 any-i386 powerpc sparc]
+ , libghc-scientific-dev (>= 0.2)
+ , libghc-scientific-dev (<< 0.3)
+ , libghc-scientific-prof
, libghc-semigroupoids-dev (>= 4)
, libghc-semigroupoids-dev (<< 5)
, libghc-semigroupoids-prof
@@ -54,7 +66,7 @@
, libghc-tagged-dev (<< 1)
, libghc-tagged-prof
, libghc-text-dev (>> 0.11)
- , libghc-text-dev (<< 0.12)
+ , libghc-text-dev (<< 1.2)
, libghc-text-prof
, libghc-transformers-dev (>> 0.3)
, libghc-transformers-dev (<< 0.4)
@@ -62,14 +74,22 @@
, libghc-unordered-containers-dev (>> 0.2)
, libghc-unordered-containers-dev (<< 0.3)
, libghc-unordered-containers-prof
+ , libghc-utf8-string-dev (>= 0.3.7)
+ , libghc-utf8-string-dev (<< 0.4)
+ , libghc-utf8-string-prof
, libghc-vector-dev (>> 0.9)
, libghc-vector-dev (<< 0.11)
, libghc-vector-prof
, libghc-void-dev (>> 0.5)
, libghc-void-dev (<< 1)
, libghc-void-prof
+ , libghc-zlib-dev (>= 0.5.4)
+ , libghc-zlib-dev (<< 0.6)
+ , libghc-zlib-prof
, libghc-quickcheck2-dev (>> 2.4)
, libghc-hunit-dev (>> 1.2)
+ , libghc-hlint-dev (>= 1.7)
+ , hlint
, libghc-test-framework-dev (>> 0.6)
, libghc-test-framework-quickcheck2-dev (>> 0.2)
, libghc-test-framework-hunit-dev (>> 0.2)
@@ -81,13 +101,17 @@
, libghc-comonad-doc
, libghc-contravariant-doc
, libghc-distributive-doc
+ , libghc-exceptions-doc
+ , libghc-free-doc
, libghc-generic-deriving-doc
, libghc-hashable-doc
, libghc-monadcatchio-transformers-doc
, libghc-mtl-doc
, libghc-parallel-doc
+ , libghc-primitive-doc
, libghc-profunctors-doc
, libghc-reflection-doc
+ , libghc-scientific-doc
, libghc-semigroupoids-doc
, libghc-semigroups-doc
, libghc-split-doc
@@ -95,9 +119,11 @@
, libghc-text-doc
, libghc-transformers-doc
, libghc-unordered-containers-doc
+ , libghc-utf8-string-doc
, libghc-vector-doc
, libghc-void-doc
-Standards-Version: 3.9.4
+ , libghc-zlib-doc
+Standards-Version: 3.9.5
Homepage: http://github.com/ekmett/lens/
Package: libghc-lens-dev
diff -rN -u old-haskell-lens/patches/add-without-th-flag.patch new-haskell-lens/patches/add-without-th-flag.patch
--- old-haskell-lens/patches/add-without-th-flag.patch 2014-04-14 22:46:08.285811411 +0000
+++ new-haskell-lens/patches/add-without-th-flag.patch 2014-04-14 22:46:08.289811411 +0000
@@ -1,16 +1,11 @@
From 42c73dc2026eb8aeeb1cf60ca4102357f3718a06 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey at kitenet.net>
Date: Tue, 15 Oct 2013 09:56:50 -0400
+Last-Update: 2014-04-14
Subject: [PATCH 2/3] add without-th flag
-
----
- lens.cabal | 28 +++++++++++++++++++++-------
- src/Control/Lens/Internal/Exception.hs | 6 ++++++
- 2 files changed, 27 insertions(+), 7 deletions(-)
-
--- a/lens.cabal
+++ b/lens.cabal
-@@ -133,6 +133,11 @@
+@@ -180,6 +180,11 @@
default: False
manual: True
@@ -19,33 +14,37 @@
+ default: False
+ manual: True
+
- -- You can disable the doctests test suite with -f-test-doctests
- flag test-doctests
- default: True
-@@ -173,14 +178,12 @@
- containers >= 0.4.0 && < 0.6,
- distributive >= 0.3 && < 1,
- filepath >= 1.2.0.0 && < 1.4,
-- generic-deriving >= 1.4 && < 1.7,
- ghc-prim,
- hashable >= 1.1.2.3 && < 1.3,
- MonadCatchIO-transformers >= 0.3 && < 0.4,
- mtl >= 2.0.1 && < 2.2,
+ library
+ build-depends:
+ aeson >= 0.7 && < 0.8,
+@@ -200,7 +205,6 @@
parallel >= 3.1.0.1 && < 3.3,
+ primitive >= 0.4.0.1 && < 0.6,
profunctors >= 4 && < 5,
- reflection >= 1.1.6 && < 2,
+ scientific >= 0.2 && < 0.3,
semigroupoids >= 4 && < 5,
semigroups >= 0.8.4 && < 1,
- split >= 0.2 && < 0.3,
-@@ -235,7 +238,6 @@
+@@ -246,10 +250,8 @@
+ Control.Lens.Internal.Level
+ Control.Lens.Internal.Magma
+ Control.Lens.Internal.Prism
+- Control.Lens.Internal.Reflection
+ Control.Lens.Internal.Review
+ Control.Lens.Internal.Setter
+- Control.Lens.Internal.TH
+ Control.Lens.Internal.Zoom
+ Control.Lens.Iso
+ Control.Lens.Lens
+@@ -261,7 +263,6 @@
+ Control.Lens.Reified
Control.Lens.Review
Control.Lens.Setter
- Control.Lens.Simple
- Control.Lens.TH
Control.Lens.Traversal
Control.Lens.Tuple
Control.Lens.Type
-@@ -266,14 +268,23 @@
+@@ -294,19 +295,28 @@
Data.Typeable.Lens
Data.Vector.Lens
Data.Vector.Generic.Lens
@@ -57,45 +56,52 @@
- Language.Haskell.TH.Lens
Numeric.Lens
++ cpp-options: -traditional
++
+ if flag(without-th)
+ cpp-options: -DDISABLE_TEMPLATE_HASKELL
+ else
+ build-depends:
-+ generic-deriving >= 1.4 && < 1.6,
+ reflection >= 1.1.6 && < 2
+ exposed-modules:
++ Control.Lens.Internal.Reflection
++ Control.Lens.Internal.TH
+ Control.Lens.TH
-+ Language.Haskell.TH.Lens
+ Generics.Deriving.Lens
+ GHC.Generics.Lens
++ Language.Haskell.TH.Lens
+ System.IO.Error.Lens
-+
+ other-modules:
+ Control.Lens.Internal.TupleIxedTH
+
+- cpp-options: -traditional
+-
if flag(safe)
cpp-options: -DSAFE=1
-@@ -306,6 +317,9 @@
- build-depends: base, lens
+@@ -340,6 +350,9 @@
ghc-options: -Wall -threaded
hs-source-dirs: tests
-+
+
+ if flag(without-th)
+ buildable: False
-
++
if flag(dump-splices)
ghc-options: -ddump-splices
+
--- a/src/Control/Lens/Internal/Exception.hs
+++ b/src/Control/Lens/Internal/Exception.hs
-@@ -34,7 +34,9 @@
- import Data.IORef
- import Data.Monoid
- import Data.Proxy
+@@ -39,7 +39,9 @@
+ import Control.Exception as Exception
+ import Control.Lens.Fold
+ import Control.Lens.Getter
+#ifndef DISABLE_TEMPLATE_HASKELL
- import Data.Reflection
+ import Control.Lens.Internal.Reflection
+#endif
- import Data.Typeable
- import System.IO.Unsafe
-
-@@ -128,6 +130,7 @@
+ import Control.Monad.Catch as Catch
+ import Data.Monoid
+ import Data.Proxy
+@@ -140,6 +142,7 @@
handler_ l = handler l . const
{-# INLINE handler_ #-}
@@ -103,20 +109,21 @@
instance Handleable SomeException IO Exception.Handler where
handler = handlerIO
-@@ -139,6 +142,7 @@
+@@ -151,7 +154,7 @@
- handlerCatchIO :: forall m a r. Getting (First a) SomeException a -> (a -> m r) -> CatchIO.Handler m r
- handlerCatchIO l f = reify (preview l) $ \ (_ :: Proxy s) -> CatchIO.Handler (\(Handling a :: Handling a s m) -> f a)
+ handlerCatchIO :: forall m a r. (Typeable a, Typeable1 m) => Getting (First a) SomeException a -> (a -> m r) -> Catch.Handler m r
+ handlerCatchIO l f = reifyTypeable (preview l) $ \ (_ :: Proxy s) -> Catch.Handler (\(Handling a :: Handling a s m) -> f a)
+-
+#endif
-
------------------------------------------------------------------------------
-- Helpers
-@@ -172,8 +176,10 @@
+ ------------------------------------------------------------------------------
+@@ -197,8 +200,10 @@
showsPrec d _ = showParen (d > 10) $ showString "Handling ..."
{-# INLINE showsPrec #-}
+#ifndef DISABLE_TEMPLATE_HASKELL
- instance Reifies s (SomeException -> Maybe a) => Exception (Handling a s m) where
+ instance (Reifies s (SomeException -> Maybe a), Typeable a, Typeable1 m, Typeable s) => Exception (Handling a s m) where
toException _ = SomeException HandlingException
{-# INLINE toException #-}
fromException = fmap Handling . reflect (Proxy :: Proxy s)
diff -rN -u old-haskell-lens/patches/fix-doctest-path.hs new-haskell-lens/patches/fix-doctest-path.hs
--- old-haskell-lens/patches/fix-doctest-path.hs 2014-04-14 22:46:08.277811411 +0000
+++ new-haskell-lens/patches/fix-doctest-path.hs 2014-04-14 22:46:08.289811411 +0000
@@ -1,7 +1,5 @@
-Index: haskell-lens-3.9.0.2/tests/doctests.hsc
-===================================================================
---- haskell-lens-3.9.0.2.orig/tests/doctests.hsc 2013-06-15 13:40:30.329035355 +0200
-+++ haskell-lens-3.9.0.2/tests/doctests.hsc 2013-06-15 13:40:30.325035355 +0200
+--- a/tests/doctests.hsc
++++ b/tests/doctests.hsc
@@ -54,9 +54,9 @@
main :: IO ()
main = withUnicode $ getSources >>= \sources -> doctest $
diff -rN -u old-haskell-lens/patches/fudge-doctest-nonascii.diff new-haskell-lens/patches/fudge-doctest-nonascii.diff
--- old-haskell-lens/patches/fudge-doctest-nonascii.diff 2014-04-14 22:46:08.277811411 +0000
+++ new-haskell-lens/patches/fudge-doctest-nonascii.diff 2014-04-14 22:46:08.289811411 +0000
@@ -1,7 +1,5 @@
-Index: lens-3.9.0.2/src/Data/Complex/Lens.hs
-===================================================================
---- lens-3.9.0.2.orig/src/Data/Complex/Lens.hs 2013-03-27 14:48:23.000000000 +0000
-+++ lens-3.9.0.2/src/Data/Complex/Lens.hs 2013-04-02 01:54:13.162989222 +0000
+--- a/src/Data/Complex/Lens.hs
++++ b/src/Data/Complex/Lens.hs
@@ -30,7 +30,7 @@
-- $setup
diff -rN -u old-haskell-lens/patches/guard-ANNotations.patch new-haskell-lens/patches/guard-ANNotations.patch
--- old-haskell-lens/patches/guard-ANNotations.patch 2014-04-14 22:46:08.277811411 +0000
+++ new-haskell-lens/patches/guard-ANNotations.patch 2014-04-14 22:46:08.289811411 +0000
@@ -1,157 +1,151 @@
From 7eae0e500fb5762a2f09939a43fcbb8f6e4ef8af Mon Sep 17 00:00:00 2001
From: Joey Hess <joey at kitenet.net>
Date: Tue, 15 Oct 2013 10:03:28 -0400
+Last-Update: 2014-04-14
Subject: [PATCH 3/3] guard ANNotations
-
----
- src/Control/Exception/Lens.hs | 2 ++
- src/Control/Lens.hs | 2 ++
- src/Control/Lens/Equality.hs | 3 +++
- src/Control/Lens/Fold.hs | 2 ++
- src/Control/Lens/Internal.hs | 3 +++
- src/Control/Lens/Internal/Zipper.hs | 2 ++
- src/Control/Lens/Iso.hs | 2 ++
- src/Control/Lens/Lens.hs | 2 ++
- src/Control/Lens/Operators.hs | 3 +++
- src/Control/Lens/Plated.hs | 2 ++
- src/Control/Lens/Prism.hs | 2 ++
- src/Control/Lens/Setter.hs | 2 ++
- src/Control/Lens/TH.hs | 2 ++
- src/Data/Data/Lens.hs | 2 ++
- 14 files changed, 31 insertions(+)
-
---- a/src/Control/Exception/Lens.hs
-+++ b/src/Control/Exception/Lens.hs
-@@ -112,7 +112,9 @@
- , Maybe(..), Either(..), Functor(..), String, IO
- )
-
-+#ifndef DISABLE_TEMPLATE_HASKELL
- {-# ANN module "HLint: ignore Use Control.Exception.catch" #-}
-+#endif
-
- -- $setup
- -- >>> :set -XNoOverloadedStrings
--- a/src/Control/Lens.hs
+++ b/src/Control/Lens.hs
-@@ -99,4 +99,6 @@
- import Control.Lens.Zipper
+@@ -95,6 +95,8 @@
+ import Control.Lens.Wrapped
import Control.Lens.Zoom
+#ifndef DISABLE_TEMPLATE_HASKELL
+ #ifdef HLINT
{-# ANN module "HLint: ignore Use import/export shortcut" #-}
+ #endif
+#endif
--- a/src/Control/Lens/Equality.hs
+++ b/src/Control/Lens/Equality.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- {-# LANGUAGE GADTs #-}
- {-# LANGUAGE Rank2Types #-}
- {-# LANGUAGE TypeFamilies #-}
-@@ -28,8 +29,10 @@
- import Control.Lens.Internal.Setter
+@@ -31,10 +31,12 @@
import Control.Lens.Type
+ import Data.Functor.Identity
+#ifndef DISABLE_TEMPLATE_HASKELL
+ #ifdef HLINT
{-# ANN module "HLint: ignore Use id" #-}
{-# ANN module "HLint: ignore Eta reduce" #-}
+ #endif
+#endif
-- $setup
-- >>> import Control.Lens
+@@ -86,4 +88,4 @@
+ -- type of a used argument and avoid @ScopedTypeVariables@ or other ugliness.
+ simple :: Equality' a a
+ simple = id
+-{-# INLINE simple #-}
+\ No newline at end of file
++{-# INLINE simple #-}
--- a/src/Control/Lens/Fold.hs
+++ b/src/Control/Lens/Fold.hs
-@@ -163,9 +163,11 @@
+@@ -178,11 +178,13 @@
-- >>> let g :: Expr -> Expr; g = Debug.SimpleReflect.Vars.g
-- >>> let timingOut :: NFData a => a -> IO a; timingOut = fmap (fromMaybe (error "timeout")) . timeout (5*10^6) . evaluate . force
+#ifndef DISABLE_TEMPLATE_HASKELL
+ #ifdef HLINT
{-# ANN module "HLint: ignore Eta reduce" #-}
{-# ANN module "HLint: ignore Use camelCase" #-}
{-# ANN module "HLint: ignore Use curry" #-}
+ #endif
+#endif
infixl 8 ^.., ^?, ^?!, ^@.., ^@?, ^@?!
---- a/src/Control/Lens/Internal.hs
-+++ b/src/Control/Lens/Internal.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- -----------------------------------------------------------------------------
- -- |
- -- Module : Control.Lens.Internal
-@@ -43,4 +44,6 @@
- import Control.Lens.Internal.Setter
- import Control.Lens.Internal.Zoom
+--- a/src/Control/Exception/Lens.hs
++++ b/src/Control/Exception/Lens.hs
+@@ -119,9 +119,11 @@
+ , Maybe(..), Either(..), String
+ )
+#ifndef DISABLE_TEMPLATE_HASKELL
- {-# ANN module "HLint: ignore Use import/export shortcut" #-}
+ #ifdef HLINT
+ {-# ANN module "HLint: ignore Use Control.Exception.catch" #-}
+ #endif
+#endif
---- a/src/Control/Lens/Internal/Zipper.hs
-+++ b/src/Control/Lens/Internal/Zipper.hs
-@@ -53,7 +53,9 @@
- -- >>> import Control.Lens
- -- >>> import Data.Char
+
+ -- $setup
+ -- >>> :set -XNoOverloadedStrings
+--- a/src/Control/Lens/Cons.hs
++++ b/src/Control/Lens/Cons.hs
+@@ -55,7 +55,9 @@
+ import qualified Data.Vector.Unboxed as Unbox
+ import Data.Word
+#ifndef DISABLE_TEMPLATE_HASKELL
- {-# ANN module "HLint: ignore Use foldl" #-}
+ {-# ANN module "HLint: ignore Eta reduce" #-}
++#endif
+
+ -- $setup
+ -- >>> :set -XNoOverloadedStrings
+--- a/src/Control/Lens/Internal/Fold.hs
++++ b/src/Control/Lens/Internal/Fold.hs
+@@ -37,7 +37,9 @@
+ import Data.Semigroup hiding (Min, getMin, Max, getMax)
+ import Data.Reflection
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ {-# ANN module "HLint: ignore Avoid lambda" #-}
+#endif
------------------------------------------------------------------------------
- -- * Jacket
+ -- Folding
+--- a/src/Control/Lens/Internal.hs
++++ b/src/Control/Lens/Internal.hs
+@@ -44,6 +44,8 @@
+ import Control.Lens.Internal.Setter
+ import Control.Lens.Internal.Zoom
+
++#ifndef DISABLE_TEMPLATE_HASKELL
+ #ifdef HLINT
+ {-# ANN module "HLint: ignore Use import/export shortcut" #-}
+ #endif
++#endif
--- a/src/Control/Lens/Iso.hs
+++ b/src/Control/Lens/Iso.hs
-@@ -82,7 +82,9 @@
+@@ -88,9 +88,11 @@
import Data.Profunctor
import Data.Profunctor.Unsafe
+#ifndef DISABLE_TEMPLATE_HASKELL
+ #ifdef HLINT
{-# ANN module "HLint: ignore Use on" #-}
+ #endif
+#endif
-- $setup
-- >>> :set -XNoOverloadedStrings
--- a/src/Control/Lens/Lens.hs
+++ b/src/Control/Lens/Lens.hs
-@@ -126,7 +126,9 @@
+@@ -136,9 +136,11 @@
import Data.Profunctor.Unsafe
import Data.Void
+#ifndef DISABLE_TEMPLATE_HASKELL
+ #ifdef HLINT
{-# ANN module "HLint: ignore Use ***" #-}
+ #endif
+#endif
-- $setup
-- >>> :set -XNoOverloadedStrings
---- a/src/Control/Lens/Operators.hs
-+++ b/src/Control/Lens/Operators.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- -----------------------------------------------------------------------------
- -- |
- -- Module : Control.Lens.Operators
-@@ -108,4 +109,6 @@
- import Control.Lens.Setter
- import Control.Lens.Zipper
-
-+#ifndef DISABLE_TEMPLATE_HASKELL
- {-# ANN module "HLint: ignore Use import/export shortcut" #-}
-+#endif
--- a/src/Control/Lens/Plated.hs
+++ b/src/Control/Lens/Plated.hs
-@@ -95,7 +95,9 @@
- import Data.Monoid
- import Data.Tree
+@@ -106,9 +106,11 @@
+ import Data.Monoid
+ import Data.Tree
+#ifndef DISABLE_TEMPLATE_HASKELL
+ #ifdef HLINT
{-# ANN module "HLint: ignore Reduce duplication" #-}
+ #endif
+#endif
-- | A 'Plated' type is one where we know how to extract its immediate self-similar children.
--
--- a/src/Control/Lens/Prism.hs
+++ b/src/Control/Lens/Prism.hs
-@@ -53,7 +53,9 @@
+@@ -59,7 +59,9 @@
import Data.Profunctor.Unsafe
#endif
@@ -163,38 +157,48 @@
-- >>> :set -XNoOverloadedStrings
--- a/src/Control/Lens/Setter.hs
+++ b/src/Control/Lens/Setter.hs
-@@ -87,7 +87,9 @@
+@@ -91,9 +91,11 @@
import Data.Profunctor.Rep
import Data.Profunctor.Unsafe
+#ifndef DISABLE_TEMPLATE_HASKELL
+ #ifdef HLINT
{-# ANN module "HLint: ignore Avoid lambda" #-}
+ #endif
+#endif
-- $setup
-- >>> import Control.Lens
---- a/src/Control/Lens/TH.hs
-+++ b/src/Control/Lens/TH.hs
-@@ -87,7 +87,9 @@
- import Language.Haskell.TH.Syntax
- import Language.Haskell.TH.Lens
+--- a/src/Control/Monad/Primitive/Lens.hs
++++ b/src/Control/Monad/Primitive/Lens.hs
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ {-# LANGUAGE MagicHash #-}
+ {-# LANGUAGE UnboxedTuples #-}
+ {-# LANGUAGE TypeFamilies #-}
+@@ -20,7 +21,9 @@
+ import Control.Monad.Primitive (PrimMonad(..))
+ import GHC.Prim (State#)
+#ifndef DISABLE_TEMPLATE_HASKELL
- {-# ANN module "HLint: ignore Use foldl" #-}
+ {-# ANN module "HLint: ignore Unused LANGUAGE pragma" #-}
+#endif
- -- | Flags for 'Lens' construction
- data LensFlag
+ prim :: (PrimMonad m) => Iso' (m a) (State# (PrimState m) -> (# State# (PrimState m), a #))
+ prim = iso internal primitive
--- a/src/Data/Data/Lens.hs
+++ b/src/Data/Data/Lens.hs
-@@ -65,9 +65,11 @@
+@@ -65,12 +65,14 @@
+ import Data.Monoid
import GHC.Exts (realWorld#)
- #endif
+#ifndef DISABLE_TEMPLATE_HASKELL
+ #ifdef HLINT
{-[...incomplete...]
More information about the Pkg-haskell-commits
mailing list