Skip to content

Commit 40e0173

Browse files
committed
Drop liftRnfV function
We can use method from NFData1
1 parent 3f33542 commit 40e0173

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

vector/src/Data/Vector.hs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -216,16 +216,13 @@ data Vector a = Vector {-# UNPACK #-} !Int
216216
{-# UNPACK #-} !Int
217217
{-# UNPACK #-} !(Array a)
218218

219-
liftRnfV :: (a -> ()) -> Vector a -> ()
220-
liftRnfV elemRnf = foldl' (\_ -> elemRnf) ()
221-
222219
instance NFData a => NFData (Vector a) where
223-
rnf = liftRnfV rnf
220+
rnf = liftRnf rnf
224221
{-# INLINEABLE rnf #-}
225222

226223
-- | @since 0.12.1.0
227224
instance NFData1 Vector where
228-
liftRnf = liftRnfV
225+
liftRnf elemRnf = foldl' (\_ -> elemRnf) ()
229226
{-# INLINEABLE liftRnf #-}
230227

231228
instance Show a => Show (Vector a) where

vector/src/Data/Vector/Strict.hs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -227,16 +227,13 @@ newtype Vector a = Vector (V.Vector a)
227227
-- parameters (e.g. Eq, Ord) and not OK to derive ones where new
228228
-- vector is created (e.g. Read, Functor)
229229

230-
liftRnfV :: (a -> ()) -> Vector a -> ()
231-
liftRnfV elemRnf = foldl' (\_ -> elemRnf) ()
232-
233230
instance NFData a => NFData (Vector a) where
234-
rnf = liftRnfV rnf
231+
rnf = liftRnf rnf
235232
{-# INLINEABLE rnf #-}
236233

237234
-- | @since 0.13.2.0
238235
instance NFData1 Vector where
239-
liftRnf = liftRnfV
236+
liftRnf elemRnf = foldl' (\_ -> elemRnf) ()
240237
{-# INLINEABLE liftRnf #-}
241238

242239
instance Show a => Show (Vector a) where
@@ -2562,7 +2559,7 @@ toLazy (Vector v) = v
25622559
-- | /O(n)/ Convert lazy array to strict array. This function reduces
25632560
-- each element of vector to WHNF.
25642561
fromLazy :: V.Vector a -> Vector a
2565-
fromLazy vec = liftRnfV (`seq` ()) v `seq` v where v = Vector vec
2562+
fromLazy vec = liftRnf (`seq` ()) v `seq` v where v = Vector vec
25662563

25672564

25682565
-- Conversions - Arrays
@@ -2573,7 +2570,7 @@ fromLazy vec = liftRnfV (`seq` ()) v `seq` v where v = Vector vec
25732570
-- @since 0.13.2.0
25742571
fromArray :: Array a -> Vector a
25752572
{-# INLINE fromArray #-}
2576-
fromArray arr = liftRnfV (`seq` ()) vec `seq` vec
2573+
fromArray arr = liftRnf (`seq` ()) vec `seq` vec
25772574
where
25782575
vec = Vector $ V.fromArray arr
25792576

@@ -2611,7 +2608,7 @@ unsafeFromArraySlice ::
26112608
-> Int -- ^ Length
26122609
-> Vector a
26132610
{-# INLINE unsafeFromArraySlice #-}
2614-
unsafeFromArraySlice arr offset len = liftRnfV (`seq` ()) vec `seq` vec
2611+
unsafeFromArraySlice arr offset len = liftRnf (`seq` ()) vec `seq` vec
26152612
where vec = Vector (V.unsafeFromArraySlice arr offset len)
26162613

26172614

0 commit comments

Comments
 (0)