[commit: ghc] master: Update containers submodule (54a9456)

git at git.haskell.org git at git.haskell.org
Sun Nov 29 16:52:42 UTC 2015


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/54a94564451bde7250780f76bea952595bf8e612/ghc

>---------------------------------------------------------------

commit 54a94564451bde7250780f76bea952595bf8e612
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Nov 29 16:42:30 2015 +0100

    Update containers submodule
    
    Differential Revision: https://phabricator.haskell.org/D1545


>---------------------------------------------------------------

54a94564451bde7250780f76bea952595bf8e612
 libraries/containers                         | 2 +-
 testsuite/tests/cabal/cabal07/cabal07.stderr | 2 +-
 testsuite/tests/driver/T10970.stdout         | 2 +-
 testsuite/tests/package/package01e.stderr    | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/containers b/libraries/containers
index 924fafe..6405653 160000
--- a/libraries/containers
+++ b/libraries/containers
@@ -1 +1 @@
-Subproject commit 924fafe1030301ee1d62d7acd576e86b50251157
+Subproject commit 6405653480afa675eec804616547b8625244bc7c
diff --git a/testsuite/tests/cabal/cabal07/cabal07.stderr b/testsuite/tests/cabal/cabal07/cabal07.stderr
index b1b90c1..097f23f 100644
--- a/testsuite/tests/cabal/cabal07/cabal07.stderr
+++ b/testsuite/tests/cabal/cabal07/cabal07.stderr
@@ -1,6 +1,6 @@
 
 Q.hs:3:8: error:
     Could not find module ‘Data.Set’
-    It is a member of the hidden package ‘containers-0.5.6.2 at containers-0.5.6.2’.
+    It is a member of the hidden package ‘containers-0.5.6.3 at containers-0.5.6.3’.
     Perhaps you need to add ‘containers’ to the build-depends in your .cabal file.
     Use -v to see a list of the files searched for.
diff --git a/testsuite/tests/driver/T10970.stdout b/testsuite/tests/driver/T10970.stdout
index 2a28356..9476b7c 100644
--- a/testsuite/tests/driver/T10970.stdout
+++ b/testsuite/tests/driver/T10970.stdout
@@ -1,2 +1,2 @@
-0.5.6.2
+0.5.6.3
 OK
diff --git a/testsuite/tests/package/package01e.stderr b/testsuite/tests/package/package01e.stderr
index 5b169aa..33e2deb 100644
--- a/testsuite/tests/package/package01e.stderr
+++ b/testsuite/tests/package/package01e.stderr
@@ -1,10 +1,10 @@
 
 package01e.hs:2:1:
     Failed to load interface for ‘Data.Map’
-    It is a member of the hidden package ‘containers-0.5.6.2’.
+    It is a member of the hidden package ‘containers-0.5.6.3’.
     Use -v to see a list of the files searched for.
 
 package01e.hs:3:1:
     Failed to load interface for ‘Data.IntMap’
-    It is a member of the hidden package ‘containers-0.5.6.2’.
+    It is a member of the hidden package ‘containers-0.5.6.3’.
     Use -v to see a list of the files searched for.



More information about the ghc-commits mailing list