diff options
| m--------- | libraries/containers | 0 | ||||
| -rw-r--r-- | mk/warnings.mk | 5 | ||||
| -rw-r--r-- | testsuite/tests/driver/T10970.stdout | 2 | ||||
| -rw-r--r-- | testsuite/tests/package/package01e.stderr | 8 | ||||
| -rw-r--r-- | testsuite/tests/th/TH_Roles2.stderr | 2 |
5 files changed, 6 insertions, 11 deletions
diff --git a/libraries/containers b/libraries/containers -Subproject 6405653480afa675eec804616547b8625244bc7 +Subproject d86ba69819e716d9ee021cf3b34ba7244f2e164 diff --git a/mk/warnings.mk b/mk/warnings.mk index 9107abcb87..63b705f4d7 100644 --- a/mk/warnings.mk +++ b/mk/warnings.mk @@ -48,7 +48,6 @@ SRC_HC_WARNING_OPTS_STAGE2 += -Wnoncanonical-monad-instances libraries/bytestring_dist-install_EXTRA_HC_OPTS += -Wno-inline-rule-shadowing # Turn off import warnings for bad unused imports -libraries/containers_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports libraries/bytestring_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports utils/haddock_dist_EXTRA_HC_OPTS += -Wno-unused-imports libraries/vector_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports @@ -56,10 +55,6 @@ libraries/vector_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports # haddock's attoparsec uses deprecated `inlinePerformIO` utils/haddock_dist_EXTRA_HC_OPTS += -Wno-deprecations -# containers uses bitSize at the moment -libraries/containers_dist-install_EXTRA_HC_OPTS += -Wno-deprecations -libraries/containers_dist-install_EXTRA_HC_OPTS += -Wno-redundant-constraints - # On Windows, there are also some unused import warnings ifeq "$(HostOS_CPP)" "mingw32" libraries/time_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports -Wno-identities diff --git a/testsuite/tests/driver/T10970.stdout b/testsuite/tests/driver/T10970.stdout index 9476b7cac9..18e75efffb 100644 --- a/testsuite/tests/driver/T10970.stdout +++ b/testsuite/tests/driver/T10970.stdout @@ -1,2 +1,2 @@ -0.5.6.3 +0.5.7.0 OK diff --git a/testsuite/tests/package/package01e.stderr b/testsuite/tests/package/package01e.stderr index 33e2debadf..103b0fece8 100644 --- a/testsuite/tests/package/package01e.stderr +++ b/testsuite/tests/package/package01e.stderr @@ -1,10 +1,10 @@ -package01e.hs:2:1: +package01e.hs:2:1: error: Failed to load interface for ‘Data.Map’ - It is a member of the hidden package ‘containers-0.5.6.3’. + It is a member of the hidden package ‘containers-0.5.7.0’. Use -v to see a list of the files searched for. -package01e.hs:3:1: +package01e.hs:3:1: error: Failed to load interface for ‘Data.IntMap’ - It is a member of the hidden package ‘containers-0.5.6.3’. + It is a member of the hidden package ‘containers-0.5.7.0’. Use -v to see a list of the files searched for. diff --git a/testsuite/tests/th/TH_Roles2.stderr b/testsuite/tests/th/TH_Roles2.stderr index a8a4ed1418..0eec5ac88c 100644 --- a/testsuite/tests/th/TH_Roles2.stderr +++ b/testsuite/tests/th/TH_Roles2.stderr @@ -6,7 +6,7 @@ TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] Dependent packages: [array-0.5.1.0, base-4.9.0.0, binary-0.8.0.0, - bytestring-0.10.7.0, containers-0.5.6.3, deepseq-1.4.2.0, + bytestring-0.10.7.0, containers-0.5.7.0, deepseq-1.4.2.0, ghc-boot-0.0.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.0, pretty-1.1.3.2, template-haskell-2.11.0.0] |