summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--compiler/ghc.cabal.in2
-rw-r--r--ghc/ghc-bin.cabal.in2
m---------libraries/Cabal0
m---------libraries/containers0
-rw-r--r--libraries/ghci/ghci.cabal.in2
m---------libraries/haskeline0
m---------libraries/hpc0
-rw-r--r--libraries/libiserv/libiserv.cabal2
m---------libraries/parallel0
-rw-r--r--testsuite/tests/backpack/should_run/bkprun05.bkp6
-rw-r--r--testsuite/tests/backpack/should_run/bkprun05.stderr4
-rw-r--r--testsuite/tests/backpack/should_run/bkprun06.bkp6
-rw-r--r--testsuite/tests/driver/T10970.stdout2
-rw-r--r--testsuite/tests/package/all.T6
-rw-r--r--utils/hpc/hpc-bin.cabal2
m---------utils/hsc2hs0
-rw-r--r--utils/iserv/iserv.cabal2
17 files changed, 16 insertions, 20 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index 8f21f02123..01628dcad1 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -56,7 +56,7 @@ Library
bytestring >= 0.9 && < 0.11,
binary == 0.8.*,
time >= 1.4 && < 1.9,
- containers >= 0.5 && < 0.6,
+ containers >= 0.5 && < 0.7,
array >= 0.1 && < 0.6,
filepath >= 1 && < 1.5,
template-haskell == 2.14.*,
diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in
index 6c12941630..d3cc40235d 100644
--- a/ghc/ghc-bin.cabal.in
+++ b/ghc/ghc-bin.cabal.in
@@ -52,7 +52,7 @@ Executable ghc
if flag(ghci)
-- NB: this is never built by the bootstrapping GHC+libraries
Build-depends:
- containers == 0.5.*,
+ containers >= 0.5 && < 0.7,
deepseq == 1.4.*,
ghci == @ProjectVersionMunged@,
haskeline == 0.7.*,
diff --git a/libraries/Cabal b/libraries/Cabal
-Subproject b8c4ce3dacece1b1ac68360b48a3129d9ca440c
+Subproject 8fbacca029f3ad764576aefb610a0408c4b6aaa
diff --git a/libraries/containers b/libraries/containers
-Subproject a57e7dd0c0aa6a719a73085ae30edef8206ccea
+Subproject e5b3bbaeb79cbf3a2c99bd14257d4199cc651b7
diff --git a/libraries/ghci/ghci.cabal.in b/libraries/ghci/ghci.cabal.in
index 47f65afe14..32ce79c013 100644
--- a/libraries/ghci/ghci.cabal.in
+++ b/libraries/ghci/ghci.cabal.in
@@ -72,7 +72,7 @@ library
base >= 4.8 && < 4.13,
binary == 0.8.*,
bytestring == 0.10.*,
- containers == 0.5.*,
+ containers >= 0.5 && < 0.7,
deepseq == 1.4.*,
filepath == 1.4.*,
ghc-boot == @ProjectVersionMunged@,
diff --git a/libraries/haskeline b/libraries/haskeline
-Subproject 4168a4adb7a8a572995d4b5deee33fbe34d0f1a
+Subproject 19b0be5687e933494c462a72cd7348c397aa340
diff --git a/libraries/hpc b/libraries/hpc
-Subproject 91f520cb9725d812fa93b57bca1d8dbd72c88dd
+Subproject 85e04edd6e29de549301cf10d2c725cbf29b209
diff --git a/libraries/libiserv/libiserv.cabal b/libraries/libiserv/libiserv.cabal
index 8cf7c41c72..183e7774d2 100644
--- a/libraries/libiserv/libiserv.cabal
+++ b/libraries/libiserv/libiserv.cabal
@@ -23,7 +23,7 @@ Library
Build-Depends: base >= 4 && < 5,
binary >= 0.7 && < 0.9,
bytestring >= 0.10 && < 0.11,
- containers >= 0.5 && < 0.6,
+ containers >= 0.5 && < 0.7,
deepseq >= 1.4 && < 1.5,
ghci == 8.6.*
if flag(network)
diff --git a/libraries/parallel b/libraries/parallel
-Subproject d08911d1748b0c6bd0dbde282acc164c94bb0d8
+Subproject 41279a764acd0758f15801c10650d7334363745
diff --git a/testsuite/tests/backpack/should_run/bkprun05.bkp b/testsuite/tests/backpack/should_run/bkprun05.bkp
index 25c951e3ff..de2374f569 100644
--- a/testsuite/tests/backpack/should_run/bkprun05.bkp
+++ b/testsuite/tests/backpack/should_run/bkprun05.bkp
@@ -53,8 +53,8 @@ unit app where
union :: Ord k => Map k a -> Map k a -> Map k a
unionWith :: Ord k => (a -> a -> a) -> Map k a -> Map k a -> Map k a
unionWithKey :: Ord k => (k -> a -> a -> a) -> Map k a -> Map k a -> Map k a
- unions :: Ord k => [Map k a] -> Map k a
- unionsWith :: Ord k => (a -> a -> a) -> [Map k a] -> Map k a
+ unions :: (Foldable f, Ord k) => f (Map k a) -> Map k a
+ unionsWith :: (Foldable f, Ord k) => (a -> a -> a) -> f (Map k a) -> Map k a
difference :: Ord k => Map k a -> Map k b -> Map k a
differenceWith :: Ord k => (a -> b -> Maybe a) -> Map k a -> Map k b -> Map k a
differenceWithKey :: Ord k => (k -> a -> b -> Maybe a) -> Map k a -> Map k b -> Map k a
@@ -127,8 +127,6 @@ unit app where
maxView :: Map k a -> Maybe (a, Map k a)
minViewWithKey :: Map k a -> Maybe ((k, a), Map k a)
maxViewWithKey :: Map k a -> Maybe ((k, a), Map k a)
- showTree :: (Show k, Show a) => Map k a -> String
- showTreeWith :: (k -> a -> String) -> Bool -> Bool -> Map k a -> String
valid :: Ord k => Map k a -> Bool
module App where
import Map
diff --git a/testsuite/tests/backpack/should_run/bkprun05.stderr b/testsuite/tests/backpack/should_run/bkprun05.stderr
index 2c24fdaa4b..12d7d92d2d 100644
--- a/testsuite/tests/backpack/should_run/bkprun05.stderr
+++ b/testsuite/tests/backpack/should_run/bkprun05.stderr
@@ -1,4 +1,4 @@
bkprun05: Prelude.undefined
CallStack (from HasCallStack):
- error, called at libraries/base/GHC/Err.hs:79:14 in base:GHC.Err
- undefined, called at bkprun05.bkp:138:30 in app+app-0UPCJKIsbig160BXB4AqAb:App
+ error, called at libraries/base/GHC/Err.hs:78:14 in base:GHC.Err
+ undefined, called at bkprun05.bkp:136:30 in app+app-18HBpsO5TPxCVSTvBQxSrq:App
diff --git a/testsuite/tests/backpack/should_run/bkprun06.bkp b/testsuite/tests/backpack/should_run/bkprun06.bkp
index 596fa897bc..121c59236b 100644
--- a/testsuite/tests/backpack/should_run/bkprun06.bkp
+++ b/testsuite/tests/backpack/should_run/bkprun06.bkp
@@ -53,8 +53,8 @@ unit sigs where
union :: Ord k => Map k a -> Map k a -> Map k a
unionWith :: Ord k => (a -> a -> a) -> Map k a -> Map k a -> Map k a
unionWithKey :: Ord k => (k -> a -> a -> a) -> Map k a -> Map k a -> Map k a
- unions :: Ord k => [Map k a] -> Map k a
- unionsWith :: Ord k => (a -> a -> a) -> [Map k a] -> Map k a
+ unions :: (Foldable f, Ord k) => f (Map k a) -> Map k a
+ unionsWith :: (Foldable f, Ord k) => (a -> a -> a) -> f (Map k a) -> Map k a
difference :: Ord k => Map k a -> Map k b -> Map k a
differenceWith :: Ord k => (a -> b -> Maybe a) -> Map k a -> Map k b -> Map k a
differenceWithKey :: Ord k => (k -> a -> b -> Maybe a) -> Map k a -> Map k b -> Map k a
@@ -127,8 +127,6 @@ unit sigs where
maxView :: Map k a -> Maybe (a, Map k a)
minViewWithKey :: Map k a -> Maybe ((k, a), Map k a)
maxViewWithKey :: Map k a -> Maybe ((k, a), Map k a)
- showTree :: (Show k, Show a) => Map k a -> String
- showTreeWith :: (k -> a -> String) -> Bool -> Bool -> Map k a -> String
valid :: Ord k => Map k a -> Bool
signature MapAsSet where
diff --git a/testsuite/tests/driver/T10970.stdout b/testsuite/tests/driver/T10970.stdout
index 3a25dc5f15..bf26c89bd8 100644
--- a/testsuite/tests/driver/T10970.stdout
+++ b/testsuite/tests/driver/T10970.stdout
@@ -1,2 +1,2 @@
-0.5.11.0
+0.6.0.1
OK
diff --git a/testsuite/tests/package/all.T b/testsuite/tests/package/all.T
index 670550e41d..869abb1a7a 100644
--- a/testsuite/tests/package/all.T
+++ b/testsuite/tests/package/all.T
@@ -6,7 +6,7 @@ inc_ghc = '-package ghc '
hide_ghc = '-hide-package ghc '
test('package01', normal, compile, [hide_all + incr_containers])
-test('package01e', normal, compile_fail, [hide_all + incr_containers])
+test('package01e', normalise_version('containers'), compile_fail, [hide_all + incr_containers])
test('package02', normal, compile, [hide_all + inc_containers + incr_containers])
test('package03', normal, compile, [hide_all + incr_containers + inc_containers])
test('package04', normal, compile, [incr_containers])
@@ -18,5 +18,5 @@ test('package08e', normalise_version('ghc'), compile_fail, [incr_ghc + hide_ghc]
test('package09e', normal, compile_fail, ['-package "containers (Data.Map as M, Data.Set as M)"'])
test('package10', normal, compile, ['-hide-all-packages -package "ghc (UniqFM as Prelude)" '])
-test('T4806', normal, compile_fail, ['-ignore-package containers'])
-test('T4806a', normal, compile_fail, ['-ignore-package deepseq']) \ No newline at end of file
+test('T4806', normalise_version('containers'), compile_fail, ['-ignore-package containers'])
+test('T4806a', normalise_version('containers'), compile_fail, ['-ignore-package deepseq'])
diff --git a/utils/hpc/hpc-bin.cabal b/utils/hpc/hpc-bin.cabal
index e83a45d1f2..a1368cf8d0 100644
--- a/utils/hpc/hpc-bin.cabal
+++ b/utils/hpc/hpc-bin.cabal
@@ -31,7 +31,7 @@ Executable hpc
Build-Depends: base >= 4 && < 5,
directory >= 1 && < 1.4,
filepath >= 1 && < 1.5,
- containers >= 0.1 && < 0.6,
+ containers >= 0.1 && < 0.7,
array >= 0.1 && < 0.6,
hpc
diff --git a/utils/hsc2hs b/utils/hsc2hs
-Subproject b8588039f3810e2d0f52e9afdb15998992ee38b
+Subproject 6b6938db11a33904bb6ba90d70d89df4b72a7f9
diff --git a/utils/iserv/iserv.cabal b/utils/iserv/iserv.cabal
index 405b26f0d8..684da9410b 100644
--- a/utils/iserv/iserv.cabal
+++ b/utils/iserv/iserv.cabal
@@ -33,7 +33,7 @@ Executable iserv
base >= 4 && < 5,
binary >= 0.7 && < 0.9,
bytestring >= 0.10 && < 0.11,
- containers >= 0.5 && < 0.6,
+ containers >= 0.5 && < 0.7,
deepseq >= 1.4 && < 1.5,
ghci == 8.6.*,
libiserv == 8.6.*
View Lorry Controller Status