update patches

Author: infinity0

strict-containers/patches/HashMap.patch

@@ -7,25 +7,11 @@ element into (or replace an existing one in) an Array.
 
 For more discussion see https://github.com/haskell-unordered-containers/unordered-containers/issues/311
 
---- a/src/Data/Strict/HashMap/Autogen/Strict.hs
-+++ b/src/Data/Strict/HashMap/Autogen/Strict.hs
-@@ -99,13 +99,9 @@
-     , fromList
-     , fromListWith
-     , fromListWithKey
--
--      -- ** HashSets
--    , HS.keysSet
-     ) where
- 
- import Data.Strict.HashMap.Autogen.Internal.Strict as HM
--import qualified Data.HashSet.Internal as HS
- import Prelude ()
- 
- -- $strictness
+diff --git a/src/Data/Strict/HashMap/Autogen/Internal.hs b/src/Data/Strict/HashMap/Autogen/Internal.hs
+index 1cb01da..dfcae84 100644
 --- a/src/Data/Strict/HashMap/Autogen/Internal.hs
 +++ b/src/Data/Strict/HashMap/Autogen/Internal.hs
-@@ -194,7 +194,7 @@
+@@ -179,7 +179,7 @@ import qualified Language.Haskell.TH.Syntax  as TH
  hash :: H.Hashable a => a -> Hash
  hash = fromIntegral . H.hash
 
@@ -34,21 +20,23 @@ For more discussion see https://github.com/haskell-unordered-containers/unordere
    deriving (Eq)
 
  instance (NFData k, NFData v) => NFData (Leaf k v) where
+diff --git a/src/Data/Strict/HashMap/Autogen/Internal/Array.hs b/src/Data/Strict/HashMap/Autogen/Internal/Array.hs
+index 7c89f50..e789d17 100644
 --- a/src/Data/Strict/HashMap/Autogen/Internal/Array.hs
 +++ b/src/Data/Strict/HashMap/Autogen/Internal/Array.hs
-@@ -254,26 +254,30 @@
+@@ -197,15 +197,19 @@ liftRnfArray rnf0 ary0 = go ary0 n0 0
  -- state thread, with each element containing the specified initial
  -- value.
  new :: Int -> a -> ST s (MArray s a)
--new (I# n#) b =
+-new _n@(I# n#) b =
 +new i !b = new' i b
 +{-# INLINE new #-}
 +
 +new' :: Int -> a -> ST s (MArray s a)
-+new' (I# n#) b =
-     CHECK_GT("new",n,(0 :: Int))
++new' _n@(I# n#) b =
+     CHECK_GT("new",_n,(0 :: Int))
      ST $ \s ->
-         case newArray# n# b s of
+         case newSmallArray# n# b s of
              (# s', ary #) -> (# s', MArray ary #)
 -{-# INLINE new #-}
 +{-# INLINE new' #-}
@@ -57,6 +45,11 @@ For more discussion see https://github.com/haskell-unordered-containers/unordere
 -new_ n = new n undefinedElem
 +new_ n = new' n undefinedElem
 
+ -- | When 'Exts.shrinkSmallMutableArray#' is available, the returned array is the same as the array given, as it is shrunk in place.
+ -- Otherwise a copy is made.
+@@ -222,11 +226,11 @@ shrink mary n = cloneM mary 0 n
+ {-# INLINE shrink #-}
+ 
  singleton :: a -> Array a
 -singleton x = runST (singletonM x)
 +singleton !x = runST (singletonM x)
@@ -67,18 +60,36 @@ For more discussion see https://github.com/haskell-unordered-containers/unordere
 +singletonM !x = new 1 x >>= unsafeFreeze
  {-# INLINE singletonM #-}
 
+ snoc :: Array a -> a -> Array a
+@@ -239,7 +243,7 @@ snoc ary x = run $ do
+ {-# INLINE snoc #-}
+ 
  pair :: a -> a -> Array a
 -pair x y = run $ do
 +pair !x !y = run $ do
      ary <- new 2 x
      write ary 1 y
      return ary
-@@ -286,7 +290,7 @@
+@@ -252,7 +256,7 @@ read ary _i@(I# i#) = ST $ \ s ->
  {-# INLINE read #-}
 
  write :: MArray s a -> Int -> a -> ST s ()
 -write ary _i@(I# i#) b = ST $ \ s ->
 +write ary _i@(I# i#) !b = ST $ \ s ->
      CHECK_BOUNDS("write", lengthM ary, _i)
-         case writeArray# (unMArray ary) i# b s of
+         case writeSmallArray# (unMArray ary) i# b s of
              s' -> (# s' , () #)
+diff --git a/src/Data/Strict/HashMap/Autogen/Strict.hs b/src/Data/Strict/HashMap/Autogen/Strict.hs
+index f40bf25..c1d2d04 100644
+--- a/src/Data/Strict/HashMap/Autogen/Strict.hs
++++ b/src/Data/Strict/HashMap/Autogen/Strict.hs
+@@ -100,9 +100,6 @@ module Data.Strict.HashMap.Autogen.Strict
+     , fromList
+     , fromListWith
+     , fromListWithKey
+-
+-      -- ** HashSets
+-    , HS.keysSet
+     ) where
+ 
+ import Data.Strict.HashMap.Autogen.Internal.Strict

strict-containers/patches/IntMap.patch

@@ -1,6 +1,8 @@
+diff --git a/src/Data/Strict/IntMap/Autogen/Internal.hs b/src/Data/Strict/IntMap/Autogen/Internal.hs
+index 0d4baee..29ababb 100644
 --- a/src/Data/Strict/IntMap/Autogen/Internal.hs
 +++ b/src/Data/Strict/IntMap/Autogen/Internal.hs
-@@ -379,7 +379,7 @@
+@@ -359,7 +359,7 @@ data IntMap a = Bin {-# UNPACK #-} !Prefix
  --            the left of the Mask bit.
  -- Invariant: In (Bin prefix mask left right), left consists of the elements that
  --            don't have the mask bit set; right is all the elements that do.

strict-containers/patches/Map.patch

@@ -1,6 +1,8 @@
+diff --git a/src/Data/Strict/Map/Autogen/Internal.hs b/src/Data/Strict/Map/Autogen/Internal.hs
+index e5303ca..949b4f6 100644
 --- a/src/Data/Strict/Map/Autogen/Internal.hs
 +++ b/src/Data/Strict/Map/Autogen/Internal.hs
-@@ -479,7 +479,7 @@
+@@ -458,7 +458,7 @@ m1 \\ m2 = difference m1 m2
  -- their union @m1 <> m2@ maps @k@ to @a1@.
 
  -- See Note: Order of constructors

strict-containers/patches/Sequence.patch

@@ -12,17 +12,40 @@ in the Deep constructor.
 
 We also remove the lazy adjust function, and rename the strict adjust' to adjust.
 
+diff --git a/src/Data/Strict/Sequence/Autogen.hs b/src/Data/Strict/Sequence/Autogen.hs
+index a4582dd..8cd1431 100644
+--- a/src/Data/Strict/Sequence/Autogen.hs
++++ b/src/Data/Strict/Sequence/Autogen.hs
+@@ -46,7 +46,7 @@
+ --     * Logarithmic-time concatenation with '><'
+ --     * Logarithmic-time splitting with 'splitAt', 'take' and 'drop'
+ --     * Logarithmic-time access to any element with
+---     'lookup', '!?', 'index', 'insertAt', 'deleteAt', 'adjust'', and 'update'
++--     'lookup', '!?', 'index', 'insertAt', 'deleteAt', 'adjust', and 'update'
+ --
+ --   Note that sequences are typically /slower/ than lists when using only
+ --   operations for which they have the same big-\(O\) complexity: sequences
+@@ -204,7 +204,6 @@ module Data.Strict.Sequence.Autogen (
+     (!?),           -- :: Seq a -> Int -> Maybe a
+     index,          -- :: Seq a -> Int -> a
+     adjust,         -- :: (a -> a) -> Int -> Seq a -> Seq a
+-    adjust',        -- :: (a -> a) -> Int -> Seq a -> Seq a
+     update,         -- :: Int -> a -> Seq a -> Seq a
+     take,           -- :: Int -> Seq a -> Seq a
+     drop,           -- :: Int -> Seq a -> Seq a
+diff --git a/src/Data/Strict/Sequence/Autogen/Internal.hs b/src/Data/Strict/Sequence/Autogen/Internal.hs
+index b026684..5c02404 100644
 --- a/src/Data/Strict/Sequence/Autogen/Internal.hs
 +++ b/src/Data/Strict/Sequence/Autogen/Internal.hs
-@@ -144,7 +144,6 @@
+@@ -148,7 +148,6 @@ module Data.Strict.Sequence.Autogen.Internal (
      (!?),           -- :: Seq a -> Int -> Maybe a
      index,          -- :: Seq a -> Int -> a
      adjust,         -- :: (a -> a) -> Int -> Seq a -> Seq a
 -    adjust',        -- :: (a -> a) -> Int -> Seq a -> Seq a
      update,         -- :: Int -> a -> Seq a -> Seq a
      take,           -- :: Int -> Seq a -> Seq a
      drop,           -- :: Int -> Seq a -> Seq a
-@@ -183,11 +182,9 @@
+@@ -187,11 +186,9 @@ module Data.Strict.Sequence.Autogen.Internal (
      zipWith4,       -- :: (a -> b -> c -> d -> e) -> Seq a -> Seq b -> Seq c -> Seq d -> Seq e
      unzip,          -- :: Seq (a, b) -> (Seq a, Seq b)
      unzipWith,      -- :: (a -> (b, c)) -> Seq a -> (Seq b, Seq c)
@@ -34,7 +57,7 @@ We also remove the lazy adjust function, and rename the strict adjust' to adjust
      ) where
 
  import Prelude hiding (
-@@ -995,7 +992,7 @@
+@@ -998,7 +995,7 @@ seqDataType = mkDataType "Data.Strict.Sequence.Autogen.Seq" [emptyConstr, consCo
 
  data FingerTree a
      = EmptyT
@@ -43,7 +66,7 @@ We also remove the lazy adjust function, and rename the strict adjust' to adjust
      | Deep {-# UNPACK #-} !Int !(Digit a) (FingerTree (Node a)) !(Digit a)
  #ifdef TESTING
      deriving Show
-@@ -1184,10 +1181,10 @@
+@@ -1189,10 +1186,10 @@ pullR s pr m = case viewRTree m of
  -- Digits
 
  data Digit a
@@ -58,7 +81,7 @@ We also remove the lazy adjust function, and rename the strict adjust' to adjust
  #ifdef TESTING
      deriving Show
  #endif
-@@ -1287,8 +1284,8 @@
+@@ -1294,8 +1291,8 @@ digitToTree' !_n (One a) = Single a
  -- Nodes
 
  data Node a
@@ -69,7 +92,7 @@ We also remove the lazy adjust function, and rename the strict adjust' to adjust
  #ifdef TESTING
      deriving Show
  #endif
-@@ -2517,25 +2514,12 @@
+@@ -2511,25 +2508,12 @@ updateDigit v i (Four a b c d)
      sab     = sa + size b
      sabc    = sab + size c
 
@@ -96,19 +119,19 @@ We also remove the lazy adjust function, and rename the strict adjust' to adjust
  --  case xs !? i of
  --    Nothing -> xs
  --    Just x -> let !x' = f x
-@@ -2543,9 +2527,9 @@
+@@ -2537,9 +2521,9 @@ adjust f i (Seq xs)
  -- @
  --
  -- @since 0.5.8
 -adjust'          :: forall a . (a -> a) -> Int -> Seq a -> Seq a
 +adjust          :: forall a . (a -> a) -> Int -> Seq a -> Seq a
- #if __GLASGOW_HASKELL__ >= 708
+ #ifdef __GLASGOW_HASKELL__
 -adjust' f i xs
 +adjust f i xs
    -- See note on unsigned arithmetic in splitAt
    | fromIntegral i < (fromIntegral (length xs) :: Word) =
        coerce $ adjustTree (\ !_k (ForceBox a) -> ForceBox (f a)) i (coerce xs)
-@@ -2554,7 +2538,7 @@
+@@ -2548,7 +2532,7 @@ adjust' f i xs
  -- This is inefficient, but fixing it would take a lot of fuss and bother
  -- for little immediate gain. We can deal with that when we have another
  -- Haskell implementation to worry about.
@@ -117,22 +140,3 @@ We also remove the lazy adjust function, and rename the strict adjust' to adjust
    case xs !? i of
      Nothing -> xs
      Just x -> let !x' = f x
---- a/src/Data/Strict/Sequence/Autogen.hs
-+++ b/src/Data/Strict/Sequence/Autogen.hs
-@@ -46,7 +46,7 @@
- --     * Logarithmic-time concatenation with '><'
- --     * Logarithmic-time splitting with 'splitAt', 'take' and 'drop'
- --     * Logarithmic-time access to any element with
----     'lookup', '!?', 'index', 'insertAt', 'deleteAt', 'adjust'', and 'update'
-+--     'lookup', '!?', 'index', 'insertAt', 'deleteAt', 'adjust', and 'update'
- --
- --   Note that sequences are typically /slower/ than lists when using only
- --   operations for which they have the same big-\(O\) complexity: sequences
-@@ -204,7 +204,6 @@
-     (!?),           -- :: Seq a -> Int -> Maybe a
-     index,          -- :: Seq a -> Int -> a
-     adjust,         -- :: (a -> a) -> Int -> Seq a -> Seq a
--    adjust',        -- :: (a -> a) -> Int -> Seq a -> Seq a
-     update,         -- :: Int -> a -> Seq a -> Seq a
-     take,           -- :: Int -> Seq a -> Seq a
-     drop,           -- :: Int -> Seq a -> Seq a

strict-containers/patches/Vector.patch

@@ -16,12 +16,11 @@ type ([.. ->] a -> ..), e.g. from Data.Primitive.Array or a GHC primop.
 
 For more discussion see https://github.com/haskell/vector/issues/380
 
-We also re-format the data definitions due to https://github.com/haskell/haddock/issues/836
-vector upstream CI doesn't run haddock so they don't see this issue themselves
-
+diff --git a/src/Data/Strict/Vector/Autogen.hs b/src/Data/Strict/Vector/Autogen.hs
+index ce0814a..fe20777 100644
 --- a/src/Data/Strict/Vector/Autogen.hs
 +++ b/src/Data/Strict/Vector/Autogen.hs
-@@ -175,8 +175,8 @@
+@@ -177,8 +177,8 @@ module Data.Strict.Vector.Autogen (
 
  import Data.Strict.Vector.Autogen.Mutable  ( MVector(..) )
  import Data.Primitive.Array
@@ -32,18 +31,7 @@ vector upstream CI doesn't run haddock so they don't see this issue themselves
 
  import Control.DeepSeq ( NFData(rnf)
  #if MIN_VERSION_deepseq(1,4,3)
-@@ -232,9 +232,7 @@
- 
- 
- -- | Boxed vectors, supporting efficient slicing.
--data Vector a = Vector {-# UNPACK #-} !Int
--                       {-# UNPACK #-} !Int
--                       {-# UNPACK #-} !(Array a)
-+data Vector a = Vector {-# UNPACK #-} !Int {-# UNPACK #-} !Int {-# UNPACK #-} !(Array a)
-         deriving ( Typeable )
- 
- liftRnfV :: (a -> ()) -> Vector a -> ()
-@@ -306,6 +304,9 @@
+@@ -291,6 +289,9 @@ instance G.Vector Vector a where
    basicUnsafeCopy (MVector i n dst) (Vector j _ src)
      = copyArray dst i src j n
 
@@ -53,29 +41,20 @@ vector upstream CI doesn't run haddock so they don't see this issue themselves
  -- See http://trac.haskell.org/vector/ticket/12
  instance Eq a => Eq (Vector a) where
    {-# INLINE (==) #-}
+diff --git a/src/Data/Strict/Vector/Autogen/Mutable.hs b/src/Data/Strict/Vector/Autogen/Mutable.hs
+index 5d85f12..83af3c4 100644
 --- a/src/Data/Strict/Vector/Autogen/Mutable.hs
 +++ b/src/Data/Strict/Vector/Autogen/Mutable.hs
-@@ -62,7 +62,7 @@
+@@ -71,7 +71,7 @@ module Data.Strict.Vector.Autogen.Mutable (
  ) where
 
  import           Control.Monad (when, liftM)
 -import qualified Data.Strict.Vector.Autogen.Generic.Mutable as G
 +import qualified Data.Vector.Generic.Mutable as G
+ import           Data.Strict.Vector.Autogen.Internal.Check
  import           Data.Primitive.Array
  import           Control.Monad.Primitive
- 
-@@ -76,9 +76,7 @@
- 
- 
- -- | Mutable boxed vectors keyed on the monad they live in ('IO' or @'ST' s@).
--data MVector s a = MVector {-# UNPACK #-} !Int                -- ^ Offset in underlying array
--                           {-# UNPACK #-} !Int                -- ^ Size of slice
--                           {-# UNPACK #-} !(MutableArray s a) -- ^ Underlying array
-+data MVector s a = MVector {-# UNPACK #-} !Int {-# UNPACK #-} !Int {-# UNPACK #-} !(MutableArray s a)
-         deriving ( Typeable )
- 
- type IOVector = MVector RealWorld
-@@ -119,7 +117,7 @@
+@@ -133,7 +133,7 @@ instance G.MVector MVector a where
    basicInitialize _ = return ()
 
    {-# INLINE basicUnsafeReplicate #-}
@@ -84,7 +63,7 @@ vector upstream CI doesn't run haddock so they don't see this issue themselves
      = do
          arr <- newArray n x
          return (MVector 0 n arr)
-@@ -128,7 +126,7 @@
+@@ -142,7 +142,7 @@ instance G.MVector MVector a where
    basicUnsafeRead (MVector i _ arr) j = readArray arr (i+j)
 
    {-# INLINE basicUnsafeWrite #-}