diff options
author | Ben Gamari <ben@smart-cactus.org> | 2017-02-22 11:35:30 -0500 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2017-02-22 11:48:25 -0500 |
commit | c347a121b07d22fb91172337407986b6541e319d (patch) | |
tree | 8c5c99e4ab1772084dcdd7633022392eb4e1a5b7 | |
parent | c8d995db5d743358b0583fe97f8113bf9047641e (diff) | |
download | haskell-c347a121b07d22fb91172337407986b6541e319d.tar.gz |
Revert recent submodule bumps
They broke everything and the solution will be non-trivial.
This reverts commit 8ccbc2e5252abd4fa67d155d4fff489ee9929906.
This reverts commit c8d995db5d743358b0583fe97f8113bf9047641e.
This reverts commit 7153370288e6075c4f8c996ff02227e48805da06.
-rw-r--r-- | compiler/ghc.cabal.in | 2 | ||||
-rw-r--r-- | ghc/ghc-bin.cabal.in | 2 | ||||
m--------- | libraries/containers | 0 | ||||
m--------- | libraries/hpc | 0 | ||||
m--------- | libraries/time | 0 | ||||
m--------- | libraries/unix | 0 | ||||
-rw-r--r-- | testsuite/tests/backpack/should_run/bkprun05.stderr | 2 | ||||
-rw-r--r-- | testsuite/tests/cabal/cabal08/all.T | 2 | ||||
-rw-r--r-- | testsuite/tests/driver/T10970.stdout | 2 | ||||
-rw-r--r-- | testsuite/tests/ghci.debugger/scripts/print026.stdout | 11 | ||||
-rw-r--r-- | testsuite/tests/package/package01e.stderr | 4 | ||||
-rw-r--r-- | testsuite/tests/partial-sigs/should_fail/T10999.stderr | 3 | ||||
-rw-r--r-- | testsuite/tests/th/T10796b.stderr | 2 |
13 files changed, 14 insertions, 16 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index b8b7106346..f3d6711f89 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -55,7 +55,7 @@ Library process >= 1 && < 1.5, bytestring >= 0.9 && < 0.11, binary == 0.8.*, - time >= 1.4 && < 1.9, + time >= 1.4 && < 1.8, containers >= 0.5 && < 0.6, array >= 0.1 && < 0.6, filepath >= 1 && < 1.5, diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in index 0f50453c3d..9c9ca0e246 100644 --- a/ghc/ghc-bin.cabal.in +++ b/ghc/ghc-bin.cabal.in @@ -52,7 +52,7 @@ Executable ghc deepseq == 1.4.*, ghci == @ProjectVersionMunged@, haskeline == 0.7.*, - time == 1.8.*, + time == 1.7.*, transformers == 0.5.* CPP-Options: -DGHCI GHC-Options: -fno-warn-name-shadowing diff --git a/libraries/containers b/libraries/containers -Subproject 1a84cc6b920a05533f5789d41a5d5d888351cb3 +Subproject aa982fb83f2561d3b27b89b46d36ffca21e072c diff --git a/libraries/hpc b/libraries/hpc -Subproject c23cad32f408559ba95b880c04dc1a2c60ec3d0 +Subproject 92673292ab7ce7878e982d0a02df3e548ef15b5 diff --git a/libraries/time b/libraries/time -Subproject 4eb06c0e5381a5b5ad2186ac6ecff434cd71137 +Subproject b6098be8a4facfa854c633f2a3a82ab8e72962e diff --git a/libraries/unix b/libraries/unix -Subproject 821cb07ecf235625b4bb06626d30e4b15f28df3 +Subproject d0b0e8cf5a7fa5b9dc500d2f623258200818cb1 diff --git a/testsuite/tests/backpack/should_run/bkprun05.stderr b/testsuite/tests/backpack/should_run/bkprun05.stderr index 854de8b6c5..d9042b073d 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-89WS9ScvjQd9lPG2oW0wWM:App + undefined, called at bkprun05.bkp:138:30 in app+app-9GMmly0OuEYHDXryaGD7sX:App diff --git a/testsuite/tests/cabal/cabal08/all.T b/testsuite/tests/cabal/cabal08/all.T index 914196bba0..3aaf185828 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', - expect_broken(13313), + normal, run_command, ['$MAKE -s --no-print-directory cabal08 ' + cleanup]) diff --git a/testsuite/tests/driver/T10970.stdout b/testsuite/tests/driver/T10970.stdout index 96362170dd..fd35dddeb2 100644 --- a/testsuite/tests/driver/T10970.stdout +++ b/testsuite/tests/driver/T10970.stdout @@ -1,2 +1,2 @@ -0.5.10.2 +0.5.7.1 OK diff --git a/testsuite/tests/ghci.debugger/scripts/print026.stdout b/testsuite/tests/ghci.debugger/scripts/print026.stdout index 9ed900fbb6..decc3dfb6d 100644 --- a/testsuite/tests/ghci.debugger/scripts/print026.stdout +++ b/testsuite/tests/ghci.debugger/scripts/print026.stdout @@ -1,9 +1,6 @@ fromList "abc" -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 = 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 = fromList "abc" diff --git a/testsuite/tests/package/package01e.stderr b/testsuite/tests/package/package01e.stderr index cfde9a7b28..f34ee1dd8f 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.10.2’. + It is a member of the hidden package ‘containers-0.5.7.1’. 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.10.2’. + It is a member of the hidden package ‘containers-0.5.7.1’. 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 0b534b9480..582cf1a70e 100644 --- a/testsuite/tests/partial-sigs/should_fail/T10999.stderr +++ b/testsuite/tests/partial-sigs/should_fail/T10999.stderr @@ -21,7 +21,8 @@ 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 ‘Data.Set.Internal’ + instance Ord a => Ord (Set.Set a) + -- Defined in ‘containers-0.5.7.1:Data.Set.Base’ 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 2491a8c259..eff1f75f7c 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.Internal.fromList + • Can't construct a pattern from name Data.Set.Base.fromList • In the untyped splice: $(dataToPatQ (const Nothing) (fromList "test")) |