diff --git a/libraries/Cabal b/libraries/Cabal index 19c278feb732f5797256ff28eb671440f5511c6c..e4c36b9dd51820f2380ce7a66f980c4e7b2e96fc 160000 --- a/libraries/Cabal +++ b/libraries/Cabal @@ -1 +1 @@ -Subproject commit 19c278feb732f5797256ff28eb671440f5511c6c +Subproject commit e4c36b9dd51820f2380ce7a66f980c4e7b2e96fc diff --git a/libraries/containers b/libraries/containers index aa982fb83f2561d3b27b89b46d36ffca21e072cc..1a84cc6b920a05533f5789d41a5d5d888351cb31 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 d9042b073d25550d094a79c910733dbdb2f40351..854de8b6c50907df646203c3254a639afae01248 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 3aaf185828836f00d0938c6509121dcfa7a09823..914196bba0b566c13555d91be84f2f04a75bccfb 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 fd35dddeb2f82c2879dd5bc8f4fddbd7f9d42c6c..96362170dd351421ba2279a29d3923e44c1c8d78 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 decc3dfb6dc2efaa68a91538e48daad34d261ec7..9ed900fbb667163051735f3923eec26f8c65479c 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 f34ee1dd8f13726ae8f3f8501249c72e5652b02a..cfde9a7b280b6271f6ab681508d893eb0f837400 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 582cf1a70ef95f7e4028e0f480cb025306640efa..0b534b9480e0714dd0f1b8372779dcedf68fc5e9 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 eff1f75f7cf120e345a6c2de90c103bd6d4a40e6..2491a8c259f1006c02ed1ba7d661e7e7de602287 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"))