[Git][ghc/ghc][master] 4 commits: Allow transformers-0.6 in ghc, ghci, ghc-bin and hadrian

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
3ce2ab94 by Bodigrim at 2022-12-21T06:17:56-05:00
Allow transformers-0.6 in ghc, ghci, ghc-bin and hadrian

- - - - -
954de93a by Bodigrim at 2022-12-21T06:17:56-05:00
Update submodule haskeline to HEAD (to allow transformers-0.6)

- - - - -
cefbeec3 by Bodigrim at 2022-12-21T06:17:56-05:00
Update submodule transformers to 0.6.0.4

- - - - -
b4730b62 by Bodigrim at 2022-12-21T06:17:56-05:00
Fix tests

T13253 imports MonadTrans, which acquired a quantified constraint in transformers-0.6, thus increase in allocations

Metric Increase:
    T13253

- - - - -


7 changed files:

- compiler/ghc.cabal.in
- ghc/ghc-bin.cabal.in
- hadrian/hadrian.cabal
- libraries/ghci/ghci.cabal.in
- libraries/haskeline
- libraries/transformers
- testsuite/tests/ghci/scripts/T5979.stderr


Changes:

=====================================
compiler/ghc.cabal.in
=====================================
@@ -88,7 +88,7 @@ Library
                    filepath   >= 1   && < 1.5,
                    template-haskell == 2.19.*,
                    hpc        == 0.6.*,
-                   transformers == 0.5.*,
+                   transformers >= 0.5 && < 0.7,
                    exceptions == 0.10.*,
                    stm,
                    ghc-boot   == @ProjectVersionMunged@,


=====================================
ghc/ghc-bin.cabal.in
=====================================
@@ -38,7 +38,7 @@ Executable ghc
                    process    >= 1   && < 1.7,
                    filepath   >= 1   && < 1.5,
                    containers >= 0.5 && < 0.7,
-                   transformers == 0.5.*,
+                   transformers >= 0.5 && < 0.7,
                    ghc-boot      == @ProjectVersionMunged@,
                    ghc           == @ProjectVersionMunged@
 


=====================================
hadrian/hadrian.cabal
=====================================
@@ -158,7 +158,7 @@ executable hadrian
                        , mtl                  >= 2.2     && < 2.4
                        , parsec               >= 3.1     && < 3.2
                        , shake                >= 0.18.3  && < 0.20
-                       , transformers         >= 0.4     && < 0.6
+                       , transformers         >= 0.4     && < 0.7
                        , unordered-containers >= 0.2.1   && < 0.3
                        , text                 >= 1.2     && < 3
     ghc-options:       -Wall


=====================================
libraries/ghci/ghci.cabal.in
=====================================
@@ -80,7 +80,7 @@ library
         ghc-boot         == @ProjectVersionMunged@,
         ghc-heap         == @ProjectVersionMunged@,
         template-haskell == 2.19.*,
-        transformers     == 0.5.*
+        transformers     >= 0.5 && < 0.7
 
     if !os(windows)
         Build-Depends: unix >= 2.7 && < 2.9


=====================================
libraries/haskeline
=====================================
@@ -1 +1 @@
-Subproject commit d4f343509e905a717ea463ad84462c126d8990d8
+Subproject commit ad40faf532ca86ae6d0839a299234db2ce4fc424


=====================================
libraries/transformers
=====================================
@@ -1 +1 @@
-Subproject commit def8c55d0c47c1c40de985d83f052f3659b40cfd
+Subproject commit 2745db6c374c7e830a0f8fdeb8cc39bd8f054f36


=====================================
testsuite/tests/ghci/scripts/T5979.stderr
=====================================
@@ -4,4 +4,4 @@
     Perhaps you meant
       Control.Monad.Trans.State (from transformers-0.5.6.2)
       Control.Monad.Trans.Cont (from transformers-0.5.6.2)
-      Control.Monad.Trans.List (from transformers-0.5.6.2)
+      Control.Monad.Trans.Class (from transformers-0.5.6.2)



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/5d96fd5060958238d5b5c98f14a8b9221c87df93...b4730b629fb5502685fa63e4afd3724339a447b2

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/5d96fd5060958238d5b5c98f14a8b9221c87df93...b4730b629fb5502685fa63e4afd3724339a447b2
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20221221/364d603d/attachment-0001.html>