[commit: ghc] master: Revert recent submodule bumps (c347a12)
git at git.haskell.org
git at git.haskell.org
Wed Feb 22 17:55:58 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/c347a121b07d22fb91172337407986b6541e319d/ghc
>---------------------------------------------------------------
commit c347a121b07d22fb91172337407986b6541e319d
Author: Ben Gamari <ben at smart-cactus.org>
Date: Wed Feb 22 11:35:30 2017 -0500
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.
>---------------------------------------------------------------
c347a121b07d22fb91172337407986b6541e319d
compiler/ghc.cabal.in | 2 +-
ghc/ghc-bin.cabal.in | 2 +-
libraries/containers | 2 +-
libraries/hpc | 2 +-
libraries/time | 2 +-
libraries/unix | 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 ++--
testsuite/tests/partial-sigs/should_fail/T10999.stderr | 3 ++-
testsuite/tests/th/T10796b.stderr | 2 +-
13 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index b8b7106..f3d6711 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 0f50453..9c9ca0e 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
index 1a84cc6..aa982fb 160000
--- a/libraries/containers
+++ b/libraries/containers
@@ -1 +1 @@
-Subproject commit 1a84cc6b920a05533f5789d41a5d5d888351cb31
+Subproject commit aa982fb83f2561d3b27b89b46d36ffca21e072cc
diff --git a/libraries/hpc b/libraries/hpc
index c23cad3..9267329 160000
--- a/libraries/hpc
+++ b/libraries/hpc
@@ -1 +1 @@
-Subproject commit c23cad32f408559ba95b880c04dc1a2c60ec3d01
+Subproject commit 92673292ab7ce7878e982d0a02df3e548ef15b52
diff --git a/libraries/time b/libraries/time
index 4eb06c0..b6098be 160000
--- a/libraries/time
+++ b/libraries/time
@@ -1 +1 @@
-Subproject commit 4eb06c0e5381a5b5ad2186ac6ecff434cd711376
+Subproject commit b6098be8a4facfa854c633f2a3a82ab8e72962ef
diff --git a/libraries/unix b/libraries/unix
index 821cb07..d0b0e8c 160000
--- a/libraries/unix
+++ b/libraries/unix
@@ -1 +1 @@
-Subproject commit 821cb07ecf235625b4bb06626d30e4b15f28df30
+Subproject commit d0b0e8cf5a7fa5b9dc500d2f623258200818cb16
diff --git a/testsuite/tests/backpack/should_run/bkprun05.stderr b/testsuite/tests/backpack/should_run/bkprun05.stderr
index 854de8b..d9042b07 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 914196b..3aaf185 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 9636217..fd35ddd 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 9ed900f..decc3df 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 cfde9a7..f34ee1d 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 0b534b9..582cf1a 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 2491a8c..eff1f75 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"))
More information about the ghc-commits
mailing list