[Git][ghc/ghc][master] 4 commits: Update submodule mtl to 2.3.1, parsec to 3.1.15.1, haddock and Cabal to HEAD
Marge Bot (@marge-bot)
gitlab at gitlab.haskell.org
Fri Dec 9 03:47:08 UTC 2022
Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC
Commits:
9eb9d2f4 by Bodigrim at 2022-12-08T22:46:47-05:00
Update submodule mtl to 2.3.1, parsec to 3.1.15.1, haddock and Cabal to HEAD
- - - - -
08d8fe2a by Bodigrim at 2022-12-08T22:46:47-05:00
Allow mtl-2.3 in hadrian
- - - - -
3807a46c by Bodigrim at 2022-12-08T22:46:47-05:00
Support mtl-2.3 in check-exact
- - - - -
ef702a18 by Bodigrim at 2022-12-08T22:46:47-05:00
Fix tests
- - - - -
15 changed files:
- hadrian/cabal.project
- hadrian/hadrian.cabal
- libraries/Cabal
- libraries/mtl
- libraries/parsec
- testsuite/tests/deriving/should_compile/deriving-via-compile.hs
- testsuite/tests/driver/T4437.hs
- testsuite/tests/haddock/perf/Makefile
- testsuite/tests/module/mod133.hs
- testsuite/tests/simplCore/should_compile/T17810a.hs
- testsuite/tests/typecheck/should_compile/tc223.hs
- testsuite/tests/typecheck/should_run/T4809_XMLGenerator.hs
- utils/check-exact/ExactPrint.hs
- utils/check-exact/Parsers.hs
- utils/check-exact/Utils.hs
Changes:
=====================================
hadrian/cabal.project
=====================================
@@ -1,7 +1,7 @@
packages: ./
-- This essentially freezes the build plan for hadrian
-index-state: 2022-09-10T18:46:55Z
+index-state: 2022-11-19T22:13:06Z
-- N.B. Compile with -O0 since this is not a performance-critical executable
-- and the Cabal takes nearly twice as long to build with -O1. See #16817.
=====================================
hadrian/hadrian.cabal
=====================================
@@ -155,7 +155,7 @@ executable hadrian
, extra >= 1.4.7
, filepath
, time
- , mtl == 2.2.*
+ , mtl >= 2.2 && < 2.4
, parsec >= 3.1 && < 3.2
, shake >= 0.18.3 && < 0.20
, transformers >= 0.4 && < 0.6
=====================================
libraries/Cabal
=====================================
@@ -1 +1 @@
-Subproject commit 410f871df899e5af0847089354e0031fe051551d
+Subproject commit 6cd29789ca866464dc3af89f62c98c41264ce3cd
=====================================
libraries/mtl
=====================================
@@ -1 +1 @@
-Subproject commit c7d396732bd45e409478bd4df1d0ca95d6f39356
+Subproject commit 37cbd924cb71eba591a2e2b6b131767f632d22c9
=====================================
libraries/parsec
=====================================
@@ -1 +1 @@
-Subproject commit a74c68e948c99621100447014f48ccac7ee0448e
+Subproject commit f1171a4b212070bb0299b636aeee7d0534a6c76c
=====================================
testsuite/tests/deriving/should_compile/deriving-via-compile.hs
=====================================
@@ -25,6 +25,7 @@ import Data.Complex
import Data.Functor.Const
import Data.Functor.Identity
import Data.Ratio
+import Control.Monad (liftM, ap)
import Control.Monad.Reader
import Control.Monad.State
import Control.Monad.Writer
=====================================
testsuite/tests/driver/T4437.hs
=====================================
@@ -37,8 +37,7 @@ check title expected got
-- See Note [Adding a language extension] in compiler/GHC/Driver/Session.hs.
expectedGhcOnlyExtensions :: [String]
expectedGhcOnlyExtensions =
- [ "DeepSubsumption"
- , "TypeData"
+ [
]
expectedCabalOnlyExtensions :: [String]
@@ -54,5 +53,7 @@ expectedCabalOnlyExtensions = ["Generics",
"Unsafe",
"Trustworthy",
"MonadFailDesugaring",
- "MonoPatBinds"
+ "MonoPatBinds",
+ -- https://github.com/haskell/cabal/pull/8521
+ "RequiredTypeArguments"
]
=====================================
testsuite/tests/haddock/perf/Makefile
=====================================
@@ -12,4 +12,4 @@ haddock_parser_perf :
haddock_renamer_perf :
WithoutHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -O0 Fold.hs 2>/dev/null | grep Renamer | egrep -o 'alloc=[0-9]+' | cut -c7- ) ; \
WithHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -haddock -O0 Fold.hs 2>/dev/null | grep Renamer | egrep -o 'alloc=[0-9]+' | cut -c7- ) ; \
- awk "BEGIN { ratio = ($$WithHaddock / $$WithoutHaddock); if (ratio > 1.05) {print \"-haddock allocation ratio too high:\", ratio; exit 1} else {exit 0} }"
+ awk "BEGIN { ratio = ($$WithHaddock / $$WithoutHaddock); if (ratio > 1.20) {print \"-haddock allocation ratio too high:\", ratio; exit 1} else {exit 0} }"
=====================================
testsuite/tests/module/mod133.hs
=====================================
@@ -1,4 +1,4 @@
--- Control.Monad.Except re-exports Control.Monad.Fix.
+-- Control.Monad re-exports Control.Monad.Fail.
-- This test checks that the subordinate-name test
-- for a class operation (when renaming the instance decl)
-- works correctly.
@@ -6,7 +6,6 @@
module ShouldCompile where
import Control.Monad
-import Control.Monad.Except
data Foo a = Foo a
@@ -21,5 +20,5 @@ instance Monad Foo where
return = pure
(Foo a) >>= k = k a
-instance MonadFix Foo where
- mfix = undefined
+instance MonadFail Foo where
+ fail = undefined
=====================================
testsuite/tests/simplCore/should_compile/T17810a.hs
=====================================
@@ -1,6 +1,9 @@
module T17810a where
+import Control.Monad
+import Control.Monad.IO.Class
import Control.Monad.Except
+import Control.Monad.Trans
class Monad m => ReadTCState m where
locallyTCState :: m ()
=====================================
testsuite/tests/typecheck/should_compile/tc223.hs
=====================================
@@ -5,11 +5,8 @@ module Foo where
-- This example suggested by Yitzchak Gale
import Control.Monad.State
-import Control.Monad.Error
-class Error e => Game b mv e | b -> mv e where
+class Game b mv e | b -> mv e where
newBoard :: MonadState b m => m ()
-- This method is unambiguous, because
-- m determines b (via a fundep in MonadState)
-
-
=====================================
testsuite/tests/typecheck/should_run/T4809_XMLGenerator.hs
=====================================
@@ -22,7 +22,7 @@ import Control.Applicative
import Control.Monad
import Control.Monad.Trans
import Control.Monad.Cont (MonadCont)
-import Control.Monad.Error (MonadError)
+import Control.Monad.Except(MonadError)
import Control.Monad.Reader(MonadReader)
import Control.Monad.Writer(MonadWriter)
import Control.Monad.State (MonadState)
=====================================
utils/check-exact/ExactPrint.hs
=====================================
@@ -50,9 +50,11 @@ import GHC.Utils.Panic
import Language.Haskell.Syntax.Basic (FieldLabelString(..))
-import Control.Monad.Identity
+import Control.Monad (forM, when, unless)
+import Control.Monad.Identity (Identity(..))
import qualified Control.Monad.Reader as Reader
-import Control.Monad.RWS
+import Control.Monad.RWS (MonadReader, RWST, evalRWST, tell, modify, get, gets, ask)
+import Control.Monad.Trans (lift)
import Data.Data ( Data )
import Data.Dynamic
import Data.Foldable
=====================================
utils/check-exact/Parsers.hs
=====================================
@@ -47,7 +47,7 @@ module Parsers (
import Preprocess
-import Control.Monad.RWS
+import Data.Functor (void)
import qualified GHC hiding (parseModule)
import qualified Control.Monad.IO.Class as GHC
=====================================
utils/check-exact/Utils.hs
=====================================
@@ -18,7 +18,8 @@ module Utils
-- , isGoodDelta
-- ) where
where
-import Control.Monad.State
+
+import Control.Monad (when)
import Data.Function
import Data.Maybe (isJust)
import Data.Ord (comparing)
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ea25088d4edd9f96e48f0a7f9407fd8eb9c2ae9c...ef702a18dbe44d486d7a41c554564ca3e0f236ee
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ea25088d4edd9f96e48f0a7f9407fd8eb9c2ae9c...ef702a18dbe44d486d7a41c554564ca3e0f236ee
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/20221208/7f39e653/attachment-0001.html>
More information about the ghc-commits
mailing list