Skip to content

Commit 8be9ee5

Browse files
committed
build: bump deepseq minimum version and remove workaround
1 parent 29f0d8d commit 8be9ee5

2 files changed

Lines changed: 1 addition & 10 deletions

File tree

ShellCheck.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ library
5252
base >= 4.8.0.0 && < 5,
5353
bytestring >= 0.10.6 && < 0.13,
5454
containers >= 0.5.6 && < 0.9,
55-
deepseq >= 1.4.1 && < 1.6,
55+
deepseq >= 1.4.2 && < 1.6,
5656
Diff >= 0.4.0 && < 1.1,
5757
fgl (>= 5.7.0 && < 5.8.1.0) || (>= 5.8.1.1 && < 5.9),
5858
filepath >= 1.4.0 && < 1.6,

src/ShellCheck/CFGAnalysis.hs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
{-# LANGUAGE TemplateHaskell #-}
2121
{-# LANGUAGE RankNTypes #-}
2222
{-# LANGUAGE DeriveAnyClass, DeriveGeneric #-}
23-
{-# LANGUAGE CPP #-}
2423

2524
{-
2625
Data Flow Analysis on a Control Flow Graph.
@@ -449,14 +448,6 @@ data StackEntry s = StackEntry {
449448
}
450449
deriving (Eq, Generic, NFData)
451450

452-
#if MIN_VERSION_deepseq(1,4,2)
453-
-- Our deepseq already has a STRef instance
454-
#else
455-
-- Older deepseq (for GHC < 8) lacks this instance
456-
instance NFData (STRef s a) where
457-
rnf = (`seq` ())
458-
#endif
459-
460451
-- Overwrite a base state with the contents of a diff state
461452
-- This is unrelated to join/merge.
462453
patchState :: InternalState -> InternalState -> InternalState

0 commit comments

Comments
 (0)