From 8ccbc2e5252abd4fa67d155d4fff489ee9929906 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Tue, 21 Feb 2017 16:13:36 -0500
Subject: [PATCH] Bump Cabal and containers submodules
---
libraries/Cabal | 2 +-
libraries/containers | 2 +-
testsuite/tests/backpack/should_run/bkprun05.stderr | 2 +-
testsuite/tests/cabal/cabal08/all.T | 2 +-
testsuite/tests/driver/T10970.stdout | 2 +-
testsuite/tests/ghci.debugger/scripts/print026.stdout | 11 +++++++----
testsuite/tests/package/package01e.stderr | 4 ++--
.../tests/partial-sigs/should_fail/T10999.stderr | 3 +--
testsuite/tests/th/T10796b.stderr | 2 +-
9 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/libraries/Cabal b/libraries/Cabal
index 19c278feb732..e4c36b9dd518 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 19c278feb732f5797256ff28eb671440f5511c6c
+Subproject commit e4c36b9dd51820f2380ce7a66f980c4e7b2e96fc
diff --git a/libraries/containers b/libraries/containers
index aa982fb83f25..1a84cc6b920a 160000
--- a/libraries/containers
+++ b/libraries/containers
@@ -1 +1 @@
-Subproject commit aa982fb83f2561d3b27b89b46d36ffca21e072cc
+Subproject commit 1a84cc6b920a05533f5789d41a5d5d888351cb31
diff --git a/testsuite/tests/backpack/should_run/bkprun05.stderr b/testsuite/tests/backpack/should_run/bkprun05.stderr
index d9042b073d25..854de8b6c509 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-9GMmly0OuEYHDXryaGD7sX:App
+ undefined, called at bkprun05.bkp:138:30 in app+app-89WS9ScvjQd9lPG2oW0wWM:App
diff --git a/testsuite/tests/cabal/cabal08/all.T b/testsuite/tests/cabal/cabal08/all.T
index 3aaf18582883..914196bba0b5 100644
--- a/testsuite/tests/cabal/cabal08/all.T
+++ b/testsuite/tests/cabal/cabal08/all.T
@@ -4,6 +4,6 @@ else:
cleanup = 'CLEANUP=0'
test('cabal08',
- normal,
+ expect_broken(13313),
run_command,
['$MAKE -s --no-print-directory cabal08 ' + cleanup])
diff --git a/testsuite/tests/driver/T10970.stdout b/testsuite/tests/driver/T10970.stdout
index fd35dddeb2f8..96362170dd35 100644
--- a/testsuite/tests/driver/T10970.stdout
+++ b/testsuite/tests/driver/T10970.stdout
@@ -1,2 +1,2 @@
-0.5.7.1
+0.5.10.2
OK
diff --git a/testsuite/tests/ghci.debugger/scripts/print026.stdout b/testsuite/tests/ghci.debugger/scripts/print026.stdout
index decc3dfb6dc2..9ed900fbb667 100644
--- a/testsuite/tests/ghci.debugger/scripts/print026.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print026.stdout
@@ -1,6 +1,9 @@
fromList "abc"
-l = Data.Sequence.Seq (Data.Sequence.Deep
- 3 (Data.Sequence.One (Data.Sequence.Elem 'a')) Data.Sequence.Empty
- (Data.Sequence.Two
- (Data.Sequence.Elem 'b') (Data.Sequence.Elem 'c')))
+l = Data.Sequence.Internal.Seq (Data.Sequence.Internal.Deep
+ 3
+ (Data.Sequence.Internal.Two
+ (Data.Sequence.Internal.Elem 'a')
+ (Data.Sequence.Internal.Elem 'b'))
+ Data.Sequence.Internal.EmptyT
+ (Data.Sequence.Internal.One (Data.Sequence.Internal.Elem 'c')))
l = fromList "abc"
diff --git a/testsuite/tests/package/package01e.stderr b/testsuite/tests/package/package01e.stderr
index f34ee1dd8f13..cfde9a7b280b 100644
--- a/testsuite/tests/package/package01e.stderr
+++ b/testsuite/tests/package/package01e.stderr
@@ -1,10 +1,10 @@
package01e.hs:2:1: error:
Could not find module ‘Data.Map’
- It is a member of the hidden package ‘containers-0.5.7.1’.
+ It is a member of the hidden package ‘containers-0.5.10.2’.
Use -v to see a list of the files searched for.
package01e.hs:3:1: error:
Could not find module ‘Data.IntMap’
- It is a member of the hidden package ‘containers-0.5.7.1’.
+ It is a member of the hidden package ‘containers-0.5.10.2’.
Use -v to see a list of the files searched for.
diff --git a/testsuite/tests/partial-sigs/should_fail/T10999.stderr b/testsuite/tests/partial-sigs/should_fail/T10999.stderr
index 582cf1a70ef9..0b534b9480e0 100644
--- a/testsuite/tests/partial-sigs/should_fail/T10999.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/T10999.stderr
@@ -21,8 +21,7 @@ T10999.hs:8:28: error:
Relevant bindings include g :: [b0] (bound at T10999.hs:8:1)
Probable fix: use a type annotation to specify what ‘b0’ should be.
These potential instances exist:
- instance Ord a => Ord (Set.Set a)
- -- Defined in ‘containers-0.5.7.1:Data.Set.Base’
+ instance Ord a => Ord (Set.Set a) -- Defined in ‘Data.Set.Internal’
instance Ord Ordering -- Defined in ‘GHC.Classes’
instance Ord Integer
-- Defined in ‘integer-gmp-1.0.0.1:GHC.Integer.Type’
diff --git a/testsuite/tests/th/T10796b.stderr b/testsuite/tests/th/T10796b.stderr
index eff1f75f7cf1..2491a8c259f1 100644
--- a/testsuite/tests/th/T10796b.stderr
+++ b/testsuite/tests/th/T10796b.stderr
@@ -1,5 +1,5 @@
T10796b.hs:8:17: error:
- • Can't construct a pattern from name Data.Set.Base.fromList
+ • Can't construct a pattern from name Data.Set.Internal.fromList
• In the untyped splice:
$(dataToPatQ (const Nothing) (fromList "test"))
--
GitLab