From c35ad6e0b3c62976e6251f1e9c47fe83ff15f4ce Mon Sep 17 00:00:00 2001 From: Ben Gamari <ben@smart-cactus.org> Date: Mon, 18 Jun 2018 11:58:43 -0400 Subject: [PATCH] containers: Bump to 0.6.0.1 Bumps containers submodule, among others. --- compiler/ghc.cabal.in | 2 +- ghc/ghc-bin.cabal.in | 2 +- libraries/Cabal | 2 +- libraries/containers | 2 +- libraries/ghci/ghci.cabal.in | 2 +- libraries/haskeline | 2 +- libraries/hpc | 2 +- libraries/libiserv/libiserv.cabal | 2 +- libraries/parallel | 2 +- testsuite/tests/backpack/should_run/bkprun05.bkp | 6 ++---- testsuite/tests/backpack/should_run/bkprun05.stderr | 4 ++-- testsuite/tests/backpack/should_run/bkprun06.bkp | 6 ++---- testsuite/tests/driver/T10970.stdout | 2 +- testsuite/tests/package/all.T | 6 +++--- utils/hpc/hpc-bin.cabal | 2 +- utils/hsc2hs | 2 +- utils/iserv/iserv.cabal | 2 +- 17 files changed, 22 insertions(+), 26 deletions(-) diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index 8f21f02123f5..01628dcad1e9 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 6c12941630b7..d3cc40235d01 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 index b8c4ce3dacec..8fbacca029f3 160000 --- a/libraries/Cabal +++ b/libraries/Cabal @@ -1 +1 @@ -Subproject commit b8c4ce3dacece1b1ac68360b48a3129d9ca440c1 +Subproject commit 8fbacca029f3ad764576aefb610a0408c4b6aaad diff --git a/libraries/containers b/libraries/containers index a57e7dd0c0aa..e5b3bbaeb79c 160000 --- a/libraries/containers +++ b/libraries/containers @@ -1 +1 @@ -Subproject commit a57e7dd0c0aa6a719a73085ae30edef8206ccea0 +Subproject commit e5b3bbaeb79cbf3a2c99bd14257d4199cc651b73 diff --git a/libraries/ghci/ghci.cabal.in b/libraries/ghci/ghci.cabal.in index 47f65afe147c..32ce79c013c8 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 index 4168a4adb7a8..19b0be5687e9 160000 --- a/libraries/haskeline +++ b/libraries/haskeline @@ -1 +1 @@ -Subproject commit 4168a4adb7a8a572995d4b5deee33fbe34d0f1aa +Subproject commit 19b0be5687e933494c462a72cd7348c397aa3406 diff --git a/libraries/hpc b/libraries/hpc index 91f520cb9725..85e04edd6e29 160000 --- a/libraries/hpc +++ b/libraries/hpc @@ -1 +1 @@ -Subproject commit 91f520cb9725d812fa93b57bca1d8dbd72c88dd5 +Subproject commit 85e04edd6e29de549301cf10d2c725cbf29b2098 diff --git a/libraries/libiserv/libiserv.cabal b/libraries/libiserv/libiserv.cabal index 8cf7c41c72f8..183e7774d2bd 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 index d08911d1748b..41279a764acd 160000 --- a/libraries/parallel +++ b/libraries/parallel @@ -1 +1 @@ -Subproject commit d08911d1748b0c6bd0dbde282acc164c94bb0d83 +Subproject commit 41279a764acd0758f15801c10650d73343637451 diff --git a/testsuite/tests/backpack/should_run/bkprun05.bkp b/testsuite/tests/backpack/should_run/bkprun05.bkp index 25c951e3ffd4..de2374f5693a 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 2c24fdaa4b39..12d7d92d2d55 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 596fa897bc80..121c59236bcf 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 3a25dc5f15bb..bf26c89bd81c 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 670550e41d5b..869abb1a7aa3 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 e83a45d1f28d..a1368cf8d0e7 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 index b8588039f381..6b6938db11a3 160000 --- a/utils/hsc2hs +++ b/utils/hsc2hs @@ -1 +1 @@ -Subproject commit b8588039f3810e2d0f52e9afdb15998992ee38b1 +Subproject commit 6b6938db11a33904bb6ba90d70d89df4b72a7f90 diff --git a/utils/iserv/iserv.cabal b/utils/iserv/iserv.cabal index 405b26f0d8ca..684da9410b66 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.* -- GitLab