[commit: ghc] master: Update to (unreleased) `deepseq-1.4.0.0` (609cd28)
git at git.haskell.org
git at git.haskell.org
Sat Nov 15 11:26:08 UTC 2014
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/609cd28a1a8616f4076088c87e443850d807ba7d/ghc
>---------------------------------------------------------------
commit 609cd28a1a8616f4076088c87e443850d807ba7d
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date: Sat Nov 15 12:16:38 2014 +0100
Update to (unreleased) `deepseq-1.4.0.0`
This pulls in the new `Generic`-based `-XDefaultSignature`-based default
implementation for `rnf`[1], and will be interesting to use in combination
with the soon to be merged `-XDeriveAnyClass` extension.
This requires updating several other submodules as well in order
to relax the upper bound on `deepseq` and/or in a few cases to
avoid relying on the default method implementation of `rnf`:
- `Cabal`
- `bytestring`
- `containers`
- `parallel`
- `process`
- `time`
[1]: http://permalink.gmane.org/gmane.comp.lang.haskell.libraries/23031
>---------------------------------------------------------------
609cd28a1a8616f4076088c87e443850d807ba7d
libraries/Cabal | 2 +-
libraries/bytestring | 2 +-
libraries/containers | 2 +-
libraries/deepseq | 2 +-
libraries/parallel | 2 +-
libraries/process | 2 +-
libraries/time | 2 +-
mk/validate-settings.mk | 3 +++
testsuite/tests/safeHaskell/check/Check09.stderr | 2 +-
testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr | 2 +-
testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr | 2 +-
testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr | 2 +-
testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout | 6 +++---
utils/haddock | 2 +-
14 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/libraries/Cabal b/libraries/Cabal
index 1f8a0a2..f54e7f9 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 1f8a0a20c7a010b50fbafc0effde9bcd663d8716
+Subproject commit f54e7f95412c2ee9ee76ce9517b7d8aa769bdcfa
diff --git a/libraries/bytestring b/libraries/bytestring
index 6ad8c0d..7a7602a 160000
--- a/libraries/bytestring
+++ b/libraries/bytestring
@@ -1 +1 @@
-Subproject commit 6ad8c0d27bcff28c80684a29b57d7a8dbf00caca
+Subproject commit 7a7602a142a1deae2e4f73782d88a91f39a0fa98
diff --git a/libraries/containers b/libraries/containers
index 530fc76..c802c36 160000
--- a/libraries/containers
+++ b/libraries/containers
@@ -1 +1 @@
-Subproject commit 530fc76bdd17089fcaaa655d66156abbc2092c2c
+Subproject commit c802c36dbed4b800d8c2131181f5af3db837aded
diff --git a/libraries/deepseq b/libraries/deepseq
index 3815fe8..75ce576 160000
--- a/libraries/deepseq
+++ b/libraries/deepseq
@@ -1 +1 @@
-Subproject commit 3815fe819ba465159cc618b3521adcba97e3c0d1
+Subproject commit 75ce5767488774065025df34cbc80de6f03c4fd1
diff --git a/libraries/parallel b/libraries/parallel
index 94e1aa6..50a2b2a 160000
--- a/libraries/parallel
+++ b/libraries/parallel
@@ -1 +1 @@
-Subproject commit 94e1aa6f621df464c237c9987bb7f65bd4cb5ff1
+Subproject commit 50a2b2a622898786d623a9f933183525305058d3
diff --git a/libraries/process b/libraries/process
index 7b3ede7..bc5f234 160000
--- a/libraries/process
+++ b/libraries/process
@@ -1 +1 @@
-Subproject commit 7b3ede7dbbb2de80b906c76f747d0b3196c4669a
+Subproject commit bc5f2348b982d9e86bf2f15065187a0ba535a1a3
diff --git a/libraries/time b/libraries/time
index 991e6be..ab6475c 160000
--- a/libraries/time
+++ b/libraries/time
@@ -1 +1 @@
-Subproject commit 991e6be84974b02d7f968601ab02d2e2b3e14190
+Subproject commit ab6475cb94260f4303afbbd4b770cbd14ec2f57e
diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk
index 150aec3..cce5063 100644
--- a/mk/validate-settings.mk
+++ b/mk/validate-settings.mk
@@ -108,6 +108,9 @@ libraries/stm_dist-install_EXTRA_HC_OPTS += -fno-warn-unused-imports
libraries/parallel_dist-install_EXTRA_HC_OPTS += -fno-warn-unused-imports
libraries/vector_dist-install_EXTRA_HC_OPTS += -fno-warn-unused-imports
+# haddock's attoparsec uses deprecated `inlinePerformIO`
+utils/haddock_dist_EXTRA_HC_OPTS += -fno-warn-deprecations
+
# bytestring has identities at the moment
libraries/bytestring_dist-install_EXTRA_HC_OPTS += -fno-warn-identities
diff --git a/testsuite/tests/safeHaskell/check/Check09.stderr b/testsuite/tests/safeHaskell/check/Check09.stderr
index 6954dd1..75803cf 100644
--- a/testsuite/tests/safeHaskell/check/Check09.stderr
+++ b/testsuite/tests/safeHaskell/check/Check09.stderr
@@ -5,4 +5,4 @@ Check09.hs:4:1:
Check09.hs:5:1:
Data.ByteString.Char8: Can't be safely imported!
- The package (bytestring-0.10.4.0) the module resides in isn't trusted.
+ The package (bytestring-0.10.5.0) the module resides in isn't trusted.
diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr
index 2fdf45c..0a012f7 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr
@@ -1,4 +1,4 @@
[2 of 2] Compiling Main ( ImpSafe03.hs, ImpSafe03.o )
<no location info>:
- The package (bytestring-0.10.4.0) is required to be trusted but it isn't!
+ The package (bytestring-0.10.5.0) is required to be trusted but it isn't!
diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr
index 884f080..3dd6759 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr
@@ -3,4 +3,4 @@
The package (base-4.8.0.0) is required to be trusted but it isn't!
<no location info>:
- The package (bytestring-0.10.4.0) is required to be trusted but it isn't!
+ The package (bytestring-0.10.5.0) is required to be trusted but it isn't!
diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr
index 884f080..3dd6759 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr
@@ -3,4 +3,4 @@
The package (base-4.8.0.0) is required to be trusted but it isn't!
<no location info>:
- The package (bytestring-0.10.4.0) is required to be trusted but it isn't!
+ The package (bytestring-0.10.5.0) is required to be trusted but it isn't!
diff --git a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
index 44ea89f..1567b60 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
+++ b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
@@ -29,17 +29,17 @@ trusted: safe
require own pkg trusted: True
M_SafePkg6
-package dependencies: array-0.5.0.1 base-4.8.0.0* bytestring-0.10.4.0* deepseq-1.3.0.3 ghc-prim-0.3.1.0 integer-gmp-0.5.1.0
+package dependencies: array-0.5.0.1 base-4.8.0.0* bytestring-0.10.5.0* deepseq-1.4.0.0 ghc-prim-0.3.1.0 integer-gmp-0.5.1.0
trusted: trustworthy
require own pkg trusted: False
M_SafePkg7
-package dependencies: array-0.5.0.1 base-4.8.0.0* bytestring-0.10.4.0* deepseq-1.3.0.3 ghc-prim-0.3.1.0 integer-gmp-0.5.1.0
+package dependencies: array-0.5.0.1 base-4.8.0.0* bytestring-0.10.5.0* deepseq-1.4.0.0 ghc-prim-0.3.1.0 integer-gmp-0.5.1.0
trusted: safe
require own pkg trusted: False
M_SafePkg8
-package dependencies: array-0.5.0.1 base-4.8.0.0 bytestring-0.10.4.0* deepseq-1.3.0.3 ghc-prim-0.3.1.0 integer-gmp-0.5.1.0
+package dependencies: array-0.5.0.1 base-4.8.0.0 bytestring-0.10.5.0* deepseq-1.4.0.0 ghc-prim-0.3.1.0 integer-gmp-0.5.1.0
trusted: trustworthy
require own pkg trusted: False
diff --git a/utils/haddock b/utils/haddock
index 199936a..9cdf19b 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 199936af5bb902c81f822b2dc57308dc25e18cfc
+Subproject commit 9cdf19bad54a6cc4b322396fdd06f4c1ee045b22
More information about the ghc-commits
mailing list