Skip to content

Commit 503cbf0

Browse files
committed
Fix NFData instances
1 parent a5843b4 commit 503cbf0

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

Codec/Archive/Tar/Types.hs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,14 @@ data Format =
196196
| GnuFormat
197197
deriving (Eq, Ord, Show)
198198

199-
instance NFData (GenEntry tarPath linkTarget) where
200-
rnf (Entry _ c _ _ _ _) = rnf c
199+
instance (NFData tarPath, NFData linkTarget) => NFData (GenEntry tarPath linkTarget) where
200+
rnf (Entry p c _ _ _ _) = rnf p `seq` rnf c
201201

202-
instance NFData (GenEntryContent linkTarget) where
202+
instance NFData linkTarget => NFData (GenEntryContent linkTarget) where
203203
rnf x = case x of
204204
NormalFile c _ -> rnf c
205+
SymbolicLink lnk -> rnf lnk
206+
HardLink lnk -> rnf lnk
205207
OtherEntryType _ c _ -> rnf c
206208
_ -> seq x ()
207209

@@ -666,7 +668,7 @@ instance Monoid (GenEntries tarPath linkTarget e) where
666668
mempty = Done
667669
mappend = (Sem.<>)
668670

669-
instance NFData e => NFData (GenEntries tarPath linkTarget e) where
671+
instance (NFData tarPath, NFData linkTarget, NFData e) => NFData (GenEntries tarPath linkTarget e) where
670672
rnf (Next e es) = rnf e `seq` rnf es
671673
rnf Done = ()
672674
rnf (Fail e) = rnf e

0 commit comments

Comments
 (0)