Revert "containers: Bump to 0.6.0.1"

This reverts commit 50e7bff7514ebbd74976c1a9fa0db7a8275178ae.

Reverts submodule changes.

Sigh, the haskeline commit isn't quite upstream yet.

5 files changed, 14 insertions, 10 deletions

diff --git a/testsuite/tests/backpack/should_run/bkprun05.bkp b/testsuite/tests/backpack/should_run/bkprun05.bkp
index de2374f569..25c951e3ff 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 :: (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
+        unions :: Ord k => [Map k a] -> Map k a
+        unionsWith :: Ord k => (a -> a -> a) -> [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,6 +127,8 @@ 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 12d7d92d2d..2c24fdaa4b 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:78:14 in base:GHC.Err
-  undefined, called at bkprun05.bkp:136:30 in app+app-18HBpsO5TPxCVSTvBQxSrq:App
+  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
diff --git a/testsuite/tests/backpack/should_run/bkprun06.bkp b/testsuite/tests/backpack/should_run/bkprun06.bkp
index 121c59236b..596fa897bc 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 :: (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
+        unions :: Ord k => [Map k a] -> Map k a
+        unionsWith :: Ord k => (a -> a -> a) -> [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,6 +127,8 @@ 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 bf26c89bd8..3a25dc5f15 100644
--- a/testsuite/tests/driver/T10970.stdout
+++ b/testsuite/tests/driver/T10970.stdout
@@ -1,2 +1,2 @@
-0.6.0.1
+0.5.11.0
 OK
diff --git a/testsuite/tests/package/all.T b/testsuite/tests/package/all.T
index 869abb1a7a..670550e41d 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', normalise_version('containers'), compile_fail, [hide_all + incr_containers])
+test('package01e', normal, 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', normalise_version('containers'), compile_fail, ['-ignore-package containers'])
-test('T4806a', normalise_version('containers'), compile_fail, ['-ignore-package deepseq'])
+test('T4806', normal, compile_fail, ['-ignore-package containers'])
+test('T4806a', normal, compile_fail, ['-ignore-package deepseq'])
\ No newline at end of file