Drop UNPACK pragma for Int fields

For a long time pointer-sized strict fields are unboxed automatically

Author: Shimuuar

vector/src/Data/Vector/Fusion/Bundle/Size.hs

@@ -20,8 +20,8 @@ module Data.Vector.Fusion.Bundle.Size (
 import Data.Vector.Fusion.Util ( delay_inline )
 
 -- | Size hint
-data Size = Exact {-# UNPACK #-} !Int -- ^ Exact size
-          | Max   {-# UNPACK #-} !Int -- ^ Upper bound on the size
+data Size = Exact !Int -- ^ Exact size
+          | Max   !Int -- ^ Upper bound on the size
           | Unknown                   -- ^ Unknown size
         deriving( Eq, Show )
 

vector/src/Data/Vector/Mutable/Unsafe.hs

@@ -32,8 +32,8 @@ type role MVector nominal representational
 
 -- | Mutable boxed vectors keyed on the monad they live in ('IO' or @'ST' s@).
 data MVector s a = MVector
-  { unsafeOffset :: {-# UNPACK #-} !Int -- ^ Offset in underlying array
-  , unsafeSize   :: {-# UNPACK #-} !Int -- ^ Size of slice
+  { unsafeOffset :: !Int -- ^ Offset in underlying array
+  , unsafeSize   :: !Int -- ^ Size of slice
   , unsafeMutableArray  :: {-# UNPACK #-} !(MutableArray s a)
     -- ^ Underlying mutable array
   }

vector/src/Data/Vector/Primitive/Mutable/Unsafe.hs

@@ -44,9 +44,9 @@ type role MVector nominal nominal
 
 -- | Mutable vectors of primitive types.
 data MVector s a = MVector
-  { unsafeOffset :: {-# UNPACK #-} !Int
+  { unsafeOffset :: !Int
     -- ^ Offset into the `unsafeMutableByteArray` in number of elements, not bytes
-  , unsafeSize :: {-# UNPACK #-} !Int
+  , unsafeSize :: !Int
     -- ^ Size of the mutable vector in number of elements, not bytes
   , unsafeMutableByteArray :: {-# UNPACK #-} !(MutableByteArray s)
     -- ^ Underlying mutable byte array

vector/src/Data/Vector/Primitive/Unsafe.hs

@@ -49,9 +49,9 @@ type role Vector nominal
 
 -- | Unboxed vectors of primitive types.
 data Vector a = Vector
-  { unsafeOffset :: {-# UNPACK #-} !Int
+  { unsafeOffset :: !Int
     -- ^ Offset into `unsafeByteArray` in number of elements, not bytes
-  , unsafeSize :: {-# UNPACK #-} !Int
+  , unsafeSize :: !Int
     -- ^ Number of elements in number of elements, not bytes
   , unsafeByteArray :: {-# UNPACK #-} !ByteArray
     -- ^ Underlying byte array

vector/src/Data/Vector/Storable/Mutable/Unsafe.hs

@@ -59,7 +59,7 @@ type role MVector nominal nominal
 
 -- | Mutable 'Storable'-based vectors.
 data MVector s a = MVector
-  { unsafeSize :: {-# UNPACK #-} !Int
+  { unsafeSize :: !Int
     -- ^ Number of elements in a mutable vector
   , unsafeForeignPtr :: {-# UNPACK #-} !(ForeignPtr a)
     -- ^ Underlying buffer as a `ForeignPtr`, which is allowed to be mutated

vector/src/Data/Vector/Storable/Unsafe.hs

@@ -64,7 +64,7 @@ unsafeCoerceVector = unsafeCoerce
 
 -- | 'Storable'-based vectors.
 data Vector a = Vector
-  { unsafeSize :: {-# UNPACK #-} !Int
+  { unsafeSize :: !Int
     -- ^ Number of elements in a vector
   , unsafeForeignPtr :: {-# UNPACK #-} !(ForeignPtr a)
     -- ^ Underlying buffer as a `ForeignPtr`, which mustn't be mutated

vector/src/Data/Vector/Unboxed/Unsafe.hs

@@ -1113,10 +1113,10 @@ instance Unbox (f (g a)) => Unbox (Compose f g a)
 -- ------
 
 data instance MVector s (a, b)
-    = MV_2 {-# UNPACK #-} !Int !(MVector s a)
+    = MV_2 !Int !(MVector s a)
                                !(MVector s b)
 data instance Vector (a, b)
-    = V_2 {-# UNPACK #-} !Int !(Vector a)
+    = V_2 !Int !(Vector a)
                               !(Vector b)
 instance (Unbox a, Unbox b) => Unbox (a, b)
 instance (Unbox a, Unbox b) => M.MVector MVector (a, b) where
@@ -1220,11 +1220,11 @@ instance (Unbox a, Unbox b) => G.Vector Vector (a, b) where
         . G.elemseq (undefined :: Vector b) b
 
 data instance MVector s (a, b, c)
-    = MV_3 {-# UNPACK #-} !Int !(MVector s a)
+    = MV_3 !Int !(MVector s a)
                                !(MVector s b)
                                !(MVector s c)
 data instance Vector (a, b, c)
-    = V_3 {-# UNPACK #-} !Int !(Vector a)
+    = V_3 !Int !(Vector a)
                               !(Vector b)
                               !(Vector c)
 instance (Unbox a, Unbox b, Unbox c) => Unbox (a, b, c)
@@ -1351,12 +1351,12 @@ instance (Unbox a,
         . G.elemseq (undefined :: Vector c) c
 
 data instance MVector s (a, b, c, d)
-    = MV_4 {-# UNPACK #-} !Int !(MVector s a)
+    = MV_4 !Int !(MVector s a)
                                !(MVector s b)
                                !(MVector s c)
                                !(MVector s d)
 data instance Vector (a, b, c, d)
-    = V_4 {-# UNPACK #-} !Int !(Vector a)
+    = V_4 !Int !(Vector a)
                               !(Vector b)
                               !(Vector c)
                               !(Vector d)
@@ -1513,13 +1513,13 @@ instance (Unbox a,
         . G.elemseq (undefined :: Vector d) d
 
 data instance MVector s (a, b, c, d, e)
-    = MV_5 {-# UNPACK #-} !Int !(MVector s a)
+    = MV_5 !Int !(MVector s a)
                                !(MVector s b)
                                !(MVector s c)
                                !(MVector s d)
                                !(MVector s e)
 data instance Vector (a, b, c, d, e)
-    = V_5 {-# UNPACK #-} !Int !(Vector a)
+    = V_5 !Int !(Vector a)
                               !(Vector b)
                               !(Vector c)
                               !(Vector d)
@@ -1708,14 +1708,14 @@ instance (Unbox a,
         . G.elemseq (undefined :: Vector e) e
 
 data instance MVector s (a, b, c, d, e, f)
-    = MV_6 {-# UNPACK #-} !Int !(MVector s a)
+    = MV_6 !Int !(MVector s a)
                                !(MVector s b)
                                !(MVector s c)
                                !(MVector s d)
                                !(MVector s e)
                                !(MVector s f)
 data instance Vector (a, b, c, d, e, f)
-    = V_6 {-# UNPACK #-} !Int !(Vector a)
+    = V_6 !Int !(Vector a)
                               !(Vector b)
                               !(Vector c)
                               !(Vector d)

vector/src/Data/Vector/Unsafe.hs

@@ -51,8 +51,8 @@ import qualified GHC.Exts as Exts (IsList(..))
 
 -- | Lazy boxed vectors, supporting efficient slicing.
 data Vector a = Vector
-  { unsafeOffset :: {-# UNPACK #-} !Int -- ^ Offset in underlying array
-  , unsafeSize   :: {-# UNPACK #-} !Int -- ^ Size of slice
+  { unsafeOffset :: !Int -- ^ Offset in underlying array
+  , unsafeSize   :: !Int -- ^ Size of slice
   , unsafeArray  :: {-# UNPACK #-} !(Array a)
     -- ^ Underlying immutable array
   }