[commit: ghc] master: Update Cabal submodule for new known extension (b3d6c0f)

git at git.haskell.org git at git.haskell.org
Tue Nov 17 15:20:09 UTC 2015


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

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

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

commit b3d6c0f77df0c2cbb5cedaa48a8e874fad3e9942
Author: Adam Sandberg Eriksson <adam at sandbergericsson.se>
Date:   Tue Nov 17 15:29:22 2015 +0100

    Update Cabal submodule for new known extension
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1485


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

b3d6c0f77df0c2cbb5cedaa48a8e874fad3e9942
 libraries/Cabal                 | 2 +-
 testsuite/tests/driver/T4437.hs | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index 75d2807..4e11fb9 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 75d2807a2bb11762f4db70540d2cc9049e9c7968
+Subproject commit 4e11fb9f353ad78c862c4c123143a0e793fc22d5
diff --git a/testsuite/tests/driver/T4437.hs b/testsuite/tests/driver/T4437.hs
index 0d9d146..f345ce6 100644
--- a/testsuite/tests/driver/T4437.hs
+++ b/testsuite/tests/driver/T4437.hs
@@ -32,8 +32,7 @@ check title expected got
 expectedGhcOnlyExtensions :: [String]
 expectedGhcOnlyExtensions = ["RelaxedLayout",
                              "AlternativeLayoutRule",
-                             "AlternativeLayoutRuleTransitional",
-                             "Strict"]
+                             "AlternativeLayoutRuleTransitional"]
 
 expectedCabalOnlyExtensions :: [String]
 expectedCabalOnlyExtensions = ["Generics",



More information about the ghc-commits mailing list