Bump Cabal and containers submodules
authorBen Gamari <ben@smart-cactus.org>
Tue, 21 Feb 2017 21:13:36 +0000 (16:13 -0500)
committerBen Gamari <ben@smart-cactus.org>
Wed, 22 Feb 2017 00:41:55 +0000 (19:41 -0500)
libraries/Cabal
libraries/containers
testsuite/tests/backpack/should_run/bkprun05.stderr
testsuite/tests/cabal/cabal08/all.T
testsuite/tests/driver/T10970.stdout
testsuite/tests/ghci.debugger/scripts/print026.stdout
testsuite/tests/package/package01e.stderr
testsuite/tests/partial-sigs/should_fail/T10999.stderr
testsuite/tests/th/T10796b.stderr

index 19c278f..e4c36b9 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 19c278feb732f5797256ff28eb671440f5511c6c
+Subproject commit e4c36b9dd51820f2380ce7a66f980c4e7b2e96fc
index aa982fb..1a84cc6 160000 (submodule)
@@ -1 +1 @@
-Subproject commit aa982fb83f2561d3b27b89b46d36ffca21e072cc
+Subproject commit 1a84cc6b920a05533f5789d41a5d5d888351cb31
index d9042b0..854de8b 100644 (file)
@@ -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
index 3aaf185..914196b 100644 (file)
@@ -4,6 +4,6 @@ else:
    cleanup = 'CLEANUP=0'
 
 test('cabal08',
-     normal,
+     expect_broken(13313),
      run_command,
      ['$MAKE -s --no-print-directory cabal08 ' + cleanup])
index decc3df..9ed900f 100644 (file)
@@ -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"
index f34ee1d..cfde9a7 100644 (file)
@@ -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.
index 582cf1a..0b534b9 100644 (file)
@@ -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’
index eff1f75..2491a8c 100644 (file)
@@ -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"))