Skip to content

Commit a2fc7c6

Browse files
LaurentRDCLaurentRDC
committed
Cleanup based on minimum version of GHC (8.10) and associated libraries (e.g. exceptions >= 0.10, bytestring >= 0.10)
1 parent aef4a6c commit a2fc7c6

50 files changed

Lines changed: 107 additions & 281 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎packages/distributed-process-async/distributed-process-async.cabal‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ source-repository head
2323

2424
library
2525
build-depends:
26-
base >= 4.4 && < 5,
26+
base >= 4.14 && < 5,
2727
data-accessor >= 0.2.2.3,
2828
distributed-process >= 0.6.1 && < 0.8,
29-
exceptions >= 0.8.2.1 && < 1.0,
30-
binary >= 0.6.3.0 && < 0.9,
31-
deepseq >= 1.3.0.1 && < 1.6,
29+
exceptions >= 0.10 && < 1.0,
30+
binary >= 0.8 && < 0.9,
31+
deepseq >= 1.4 && < 1.6,
3232
mtl,
33-
containers >= 0.4 && < 0.8,
33+
containers >= 0.6 && < 0.8,
3434
hashable >= 1.2.0.5 && < 1.6,
3535
unordered-containers >= 0.2.3.0 && < 0.3,
3636
fingertree < 0.2,
3737
stm >= 2.4 && < 2.6,
38-
time >= 1.8.0.2,
38+
time >= 1.9,
3939
transformers
4040
default-extensions: CPP
4141
InstanceSigs
@@ -51,17 +51,17 @@ test-suite AsyncTests
5151
type: exitcode-stdio-1.0
5252
x-uses-tf: true
5353
build-depends:
54-
base >= 4.4 && < 5,
54+
base >= 4.14 && < 5,
5555
ansi-terminal >= 0.5 && < 0.9,
5656
distributed-process,
5757
distributed-process-async,
5858
distributed-process-systest >= 0.2.0,
59-
exceptions >= 0.8.2.1 && < 1.0,
59+
exceptions >= 0.10 && < 1.0,
6060
network >= 2.5 && < 3.3,
6161
network-transport >= 0.4 && < 0.6,
6262
network-transport-tcp >= 0.6 && < 0.9,
63-
binary >= 0.6.3.0 && < 0.9,
64-
deepseq >= 1.3.0.1 && < 1.6,
63+
binary >= 0.8 && < 0.9,
64+
deepseq >= 1.4 && < 1.6,
6565
-- HUnit >= 1.2 && < 2,
6666
stm >= 2.3 && < 2.6,
6767
test-framework >= 0.6 && < 0.9,

‎packages/distributed-process-client-server/distributed-process-client-server.cabal‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,17 @@ library
2828
distributed-process >= 0.6.6 && < 0.8,
2929
distributed-process-extras >= 0.3.1 && < 0.4,
3030
distributed-process-async >= 0.2.4 && < 0.3,
31-
binary >= 0.6.3.0 && < 0.9,
32-
deepseq >= 1.3.0.1 && < 1.6,
31+
binary >= 0.8 && < 0.9,
32+
deepseq >= 1.4 && < 1.6,
3333
mtl,
34-
containers >= 0.4 && < 0.8,
34+
containers >= 0.6 && < 0.8,
3535
hashable >= 1.2.0.5 && < 1.6,
3636
unordered-containers >= 0.2.3.0 && < 0.3,
3737
fingertree < 0.2,
3838
stm >= 2.4 && < 2.6,
3939
time > 1.4 && < 1.15,
4040
transformers,
41-
exceptions >= 0.5 && < 0.11
42-
if impl(ghc <= 7.5)
43-
Build-Depends: template-haskell == 2.7.0.0,
44-
derive == 2.5.5,
45-
uniplate == 1.6.12,
46-
ghc-prim
41+
exceptions >= 0.10 && < 0.11
4742
hs-source-dirs: src
4843
ghc-options: -Wall
4944
exposed-modules:
@@ -63,7 +58,7 @@ test-suite ManagedProcessTests
6358
type: exitcode-stdio-1.0
6459
x-uses-tf: true
6560
build-depends:
66-
base >= 4.4 && < 5,
61+
base >= 4.14 && < 5,
6762
ansi-terminal >= 0.5 && < 0.9,
6863
containers,
6964
distributed-process,
@@ -75,7 +70,7 @@ test-suite ManagedProcessTests
7570
mtl,
7671
fingertree,
7772
network-transport-tcp >= 0.6 && < 0.9,
78-
binary >= 0.6.3.0 && < 0.9,
73+
binary >= 0.8 && < 0.9,
7974
deepseq,
8075
network >= 2.3 && < 3.3,
8176
HUnit >= 1.2 && < 2,
@@ -100,7 +95,7 @@ test-suite PrioritisedProcessTests
10095
type: exitcode-stdio-1.0
10196
x-uses-tf: true
10297
build-depends:
103-
base >= 4.4 && < 5,
98+
base >= 4.14 && < 5,
10499
ansi-terminal,
105100
containers,
106101
distributed-process,

‎packages/distributed-process-client-server/src/Control/Distributed/Process/ManagedProcess/Internal/Types.hs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,12 +288,10 @@ instance forall s . MonadMask (GenProcess s) where
288288
(a', _) <- lift $ restoreP $ runProcess ourSTate p2
289289
return a'
290290

291-
#if MIN_VERSION_exceptions(0,10,0)
292291
generalBracket acquire release inner = GenProcess $
293292
generalBracket (unManaged acquire)
294293
(\a e -> unManaged $ release a e)
295294
(unManaged . inner)
296-
#endif
297295

298296
-- | Run an action in the @GenProcess@ monad.
299297
runProcess :: State s -> GenProcess s a -> Process (a, State s)

‎packages/distributed-process-client-server/tests/ManagedProcessCommon.hs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ import Control.Distributed.Process.ManagedProcess
2323
import qualified Control.Distributed.Process.ManagedProcess.UnsafeClient as Unsafe
2424
import Control.Distributed.Process.Serializable()
2525

26-
#if ! MIN_VERSION_base(4,6,0)
27-
import Prelude hiding (catch)
28-
#endif
29-
3026
import TestUtils
3127

3228
type Launcher a = a -> Process (ProcessId, MVar ExitReason)

‎packages/distributed-process-client-server/tests/TestManagedProcess.hs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ import MathsDemo
2525
import Counter
2626
import qualified SafeCounter as SafeCounter
2727

28-
#if ! MIN_VERSION_base(4,6,0)
29-
import Prelude hiding (catch)
30-
#endif
31-
3228
import Test.Framework (Test, testGroup)
3329
import Test.Framework.Providers.HUnit (testCase)
3430
import TestUtils

‎packages/distributed-process-client-server/tests/TestPrioritisedProcess.hs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ import Data.List (isInfixOf)
3838
import Data.Maybe (isNothing, isJust)
3939
import Data.Typeable (Typeable)
4040

41-
#if ! MIN_VERSION_base(4,6,0)
42-
import Prelude hiding (catch)
43-
#endif
44-
4541
import Test.Framework (Test, testGroup)
4642
import Test.Framework.Providers.HUnit (testCase)
4743
import TestUtils

‎packages/distributed-process-execution/distributed-process-execution.cabal‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,22 @@ source-repository head
2525

2626
library
2727
build-depends:
28-
base >= 4.4 && < 5,
28+
base >= 4.14 && < 5,
2929
data-accessor >= 0.2.2.3,
3030
distributed-process >= 0.6.6 && < 0.8,
3131
distributed-process-extras >= 0.3.1 && < 0.4,
3232
distributed-process-supervisor >= 0.2.0 && < 0.3,
3333
distributed-process-client-server >= 0.2.0 && < 0.3,
34-
binary >= 0.6.3.0 && < 0.9,
35-
deepseq >= 1.3.0.1 && < 1.6,
34+
binary >= 0.8 && < 0.9,
35+
deepseq >= 1.4 && < 1.6,
3636
mtl,
37-
containers >= 0.4 && < 0.8,
37+
containers >= 0.6 && < 0.8,
3838
hashable >= 1.2.0.5 && < 1.6,
3939
unordered-containers >= 0.2.3.0 && < 0.3,
4040
fingertree < 0.2,
4141
stm >= 2.4 && < 2.6,
4242
time,
4343
transformers
44-
if impl(ghc <= 7.5)
45-
Build-Depends: template-haskell == 2.7.0.0,
46-
derive == 2.5.5,
47-
uniplate == 1.6.12,
48-
ghc-prim
4944
hs-source-dirs: src
5045
ghc-options: -Wall
5146
exposed-modules:
@@ -63,7 +58,7 @@ test-suite ExchangeTests
6358
type: exitcode-stdio-1.0
6459
-- x-uses-tf: true
6560
build-depends:
66-
base >= 4.4 && < 5,
61+
base >= 4.14 && < 5,
6762
ansi-terminal >= 0.5 && < 0.7,
6863
containers,
6964
hashable,
@@ -80,7 +75,7 @@ test-suite ExchangeTests
8075
deepseq,
8176
mtl,
8277
network-transport-tcp >= 0.4 && < 0.9,
83-
binary >= 0.6.3.0 && < 0.9,
78+
binary >= 0.8 && < 0.9,
8479
network >= 2.3 && < 3.3,
8580
HUnit >= 1.2 && < 2,
8681
stm,
@@ -102,7 +97,7 @@ test-suite MailboxTests
10297
type: exitcode-stdio-1.0
10398
-- x-uses-tf: true
10499
build-depends:
105-
base >= 4.4 && < 5,
100+
base >= 4.14 && < 5,
106101
ansi-terminal >= 0.5 && < 0.7,
107102
containers,
108103
hashable,
@@ -119,7 +114,7 @@ test-suite MailboxTests
119114
deepseq,
120115
mtl,
121116
network-transport-tcp >= 0.4 && < 0.9,
122-
binary >= 0.6.3.0 && < 0.9,
117+
binary >= 0.8 && < 0.9,
123118
network >= 2.3 && < 3.3,
124119
HUnit >= 1.2 && < 2,
125120
stm,

‎packages/distributed-process-execution/src/Control/Distributed/Process/Execution/Mailbox.hs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,7 @@ import Data.Typeable (Typeable)
198198

199199
import GHC.Generics
200200

201-
#if ! MIN_VERSION_base(4,6,0)
202-
import Prelude hiding (catch, drop)
203-
#else
204201
import Prelude hiding (drop)
205-
#endif
206202

207203
--------------------------------------------------------------------------------
208204
-- Types --

‎packages/distributed-process-execution/tests/MailboxTestFilters.hs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@ import Control.Distributed.Process
88
import Control.Distributed.Process.Execution.Mailbox (FilterResult(..))
99
import Control.Monad (forM)
1010

11-
#if ! MIN_VERSION_base(4,6,0)
12-
import Prelude hiding (catch, drop)
13-
#else
1411
import Prelude hiding (drop)
15-
#endif
1612
import Data.Maybe (catMaybes)
1713
import Control.Distributed.Process.Closure (remotable, mkClosure, mkStaticClosure)
1814

‎packages/distributed-process-execution/tests/TestExchange.hs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ import Control.Distributed.Process.SysTest.Utils
2020
import Control.Monad (void, forM, forever)
2121
import Control.Rematch (equalTo)
2222

23-
#if ! MIN_VERSION_base(4,6,0)
24-
import Prelude hiding (catch, drop)
25-
#else
2623
import Prelude hiding (drop)
27-
#endif
2824
import Network.Transport.TCP
2925
import qualified Network.Transport as NT
3026
import Test.Framework as TF (defaultMain, testGroup, Test)

0 commit comments

Comments
 (0)