[Git][ghc/ghc][master] Version bump: base-4.16 (#18712)
Marge Bot
gitlab at gitlab.haskell.org
Tue Oct 27 18:00:20 UTC 2020
Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC
Commits:
eedec53d by Vladislav Zavialov at 2020-10-27T14:00:11-04:00
Version bump: base-4.16 (#18712)
Also bumps upper bounds on base in boot libraries (incl. submodules).
- - - - -
30 changed files:
- compiler/ghc.cabal.in
- libraries/array
- libraries/base/base.cabal
- libraries/base/changelog.md
- libraries/deepseq
- libraries/directory
- libraries/filepath
- libraries/ghc-boot-th/ghc-boot-th.cabal.in
- libraries/ghc-boot/ghc-boot.cabal.in
- libraries/ghc-compact/ghc-compact.cabal
- libraries/ghci/ghci.cabal.in
- libraries/haskeline
- libraries/hpc
- libraries/parsec
- libraries/process
- libraries/stm
- libraries/template-haskell/template-haskell.cabal.in
- libraries/terminfo
- libraries/unix
- testsuite/tests/dependent/should_compile/T14729.stderr
- testsuite/tests/dependent/should_compile/T15743.stderr
- testsuite/tests/dependent/should_compile/T15743e.stderr
- testsuite/tests/indexed-types/should_compile/T15711.stderr
- testsuite/tests/indexed-types/should_compile/T15852.stderr
- testsuite/tests/polykinds/T15592.stderr
- testsuite/tests/polykinds/T15592b.stderr
- testsuite/tests/printer/T18052a.stderr
- testsuite/tests/typecheck/should_compile/T12763.stderr
- testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr
- utils/hsc2hs
Changes:
=====================================
compiler/ghc.cabal.in
=====================================
@@ -57,7 +57,7 @@ Library
Default-Language: Haskell2010
Exposed: False
- Build-Depends: base >= 4.11 && < 4.16,
+ Build-Depends: base >= 4.11 && < 4.17,
deepseq >= 1.4 && < 1.5,
directory >= 1 && < 1.4,
process >= 1 && < 1.7,
=====================================
libraries/array
=====================================
@@ -1 +1 @@
-Subproject commit ab535173d7885ebfc2005d8da2765f0f52c923ce
+Subproject commit 10e6c7e0522367677e4c33cc1c56eb852ef13420
=====================================
libraries/base/base.cabal
=====================================
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: base
-version: 4.15.0.0
+version: 4.16.0.0
-- NOTE: Don't forget to update ./changelog.md
license: BSD-3-Clause
=====================================
libraries/base/changelog.md
=====================================
@@ -29,7 +29,7 @@
`ConcFlags`, `DebugFlags`, `CCFlags`, `DoHeapProfile`, `ProfFlags`,
`DoTrace`, `TraceFlags`, `TickyFlags`, `ParFlags`, `RTSFlags`, `RTSStats`,
`GCStats`, `ByteOrder`, `GeneralCategory`, `SrcLoc`
-
+
* Add rules `unpackUtf8`, `unpack-listUtf8` and `unpack-appendUtf8` to `GHC.Base`.
They correspond to their ascii versions and hopefully make it easier
for libraries to handle utf8 encoded strings efficiently.
=====================================
libraries/deepseq
=====================================
@@ -1 +1 @@
-Subproject commit b8c4fb4debaed6ef7eb6940ca4cfea6bd63cc212
+Subproject commit 0fd7fc88aded7d7a7a1c1250fd3dcd9152edba34
=====================================
libraries/directory
=====================================
@@ -1 +1 @@
-Subproject commit b697b3ea77dd4803f2f8f676dd64c8ea5277fcf0
+Subproject commit cecf363bc07004ad314e0297ce34ddba05031c0e
=====================================
libraries/filepath
=====================================
@@ -1 +1 @@
-Subproject commit 9088df9f97914664c9360857347d65c32dd6c892
+Subproject commit e60969e693ffea59725cc3ebcae415343ddd0692
=====================================
libraries/ghc-boot-th/ghc-boot-th.cabal.in
=====================================
@@ -36,4 +36,4 @@ Library
GHC.ForeignSrcLang.Type
GHC.Lexeme
- build-depends: base >= 4.7 && < 4.16
+ build-depends: base >= 4.7 && < 4.17
=====================================
libraries/ghc-boot/ghc-boot.cabal.in
=====================================
@@ -64,7 +64,7 @@ Library
-- GHC.Version
-- GHC.Platform.Host
- build-depends: base >= 4.7 && < 4.16,
+ build-depends: base >= 4.7 && < 4.17,
binary == 0.8.*,
bytestring == 0.10.*,
containers >= 0.5 && < 0.7,
=====================================
libraries/ghc-compact/ghc-compact.cabal
=====================================
@@ -37,7 +37,7 @@ library
CPP
build-depends: ghc-prim >= 0.5.3 && < 0.8,
- base >= 4.9.0 && < 4.16,
+ base >= 4.9.0 && < 4.17,
bytestring >= 0.10.6.0
ghc-options: -Wall
=====================================
libraries/ghci/ghci.cabal.in
=====================================
@@ -72,7 +72,7 @@ library
Build-Depends:
array == 0.5.*,
- base >= 4.8 && < 4.16,
+ base >= 4.8 && < 4.17,
binary == 0.8.*,
bytestring == 0.10.*,
containers >= 0.5 && < 0.7,
=====================================
libraries/haskeline
=====================================
@@ -1 +1 @@
-Subproject commit 2790f1c6ed94990ed51466079e8fb1097129c9b8
+Subproject commit 28ee26ad5b4ae1c0584f2ec11ac53be9671bf878
=====================================
libraries/hpc
=====================================
@@ -1 +1 @@
-Subproject commit 772de3f7b43e31178f042ba77c071594845363e3
+Subproject commit fecf0496a65c4be275d613eb0632fecd5a123b69
=====================================
libraries/parsec
=====================================
@@ -1 +1 @@
-Subproject commit 190492494fe92e8dd42165190b7ac112be1f7389
+Subproject commit 905bc2e3e1c374934d49e16dc5b7c49bf2c3c815
=====================================
libraries/process
=====================================
@@ -1 +1 @@
-Subproject commit 72c6be917064c923e365622032d1f2fa07acb5eb
+Subproject commit 102f5ca98661d3a6118e6610e59579c715a8ffd1
=====================================
libraries/stm
=====================================
@@ -1 +1 @@
-Subproject commit 444f672416a354c3cfde9d94ec237a36be46ef59
+Subproject commit a439b76a645a903757d2410dd70fe44538f45759
=====================================
libraries/template-haskell/template-haskell.cabal.in
=====================================
@@ -55,7 +55,7 @@ Library
Language.Haskell.TH.Lib.Map
build-depends:
- base >= 4.11 && < 4.16,
+ base >= 4.11 && < 4.17,
ghc-boot-th == @ProjectVersionMunged@,
ghc-prim,
pretty == 1.1.*
=====================================
libraries/terminfo
=====================================
@@ -1 +1 @@
-Subproject commit 3ebb36f4a2c42b74ec4e35efccc2be34c198a830
+Subproject commit 9add7edcc04a9a86aa84a7faea203b654da447d1
=====================================
libraries/unix
=====================================
@@ -1 +1 @@
-Subproject commit ea13d990580273a883368793dfbb826cab5a22d4
+Subproject commit 8abd63ea234de02d2b3cb08b5098cd06c1a728f6
=====================================
testsuite/tests/dependent/should_compile/T14729.stderr
=====================================
@@ -11,4 +11,4 @@ COERCION AXIOMS
FAMILY INSTANCES
type instance F Int = Bool -- Defined at T14729.hs:10:15
Dependent modules: []
-Dependent packages: [base-4.15.0.0, ghc-bignum-1.0, ghc-prim-0.7.0]
+Dependent packages: [base-4.16.0.0, ghc-bignum-1.0, ghc-prim-0.7.0]
=====================================
testsuite/tests/dependent/should_compile/T15743.stderr
=====================================
@@ -3,4 +3,4 @@ TYPE CONSTRUCTORS
forall {k1} k2 (k3 :: k2). Proxy k3 -> k1 -> k2 -> *
roles nominal nominal nominal phantom phantom phantom
Dependent modules: []
-Dependent packages: [base-4.15.0.0, ghc-bignum-1.0, ghc-prim-0.7.0]
+Dependent packages: [base-4.16.0.0, ghc-bignum-1.0, ghc-prim-0.7.0]
=====================================
testsuite/tests/dependent/should_compile/T15743e.stderr
=====================================
@@ -1,6 +1,7 @@
TYPE CONSTRUCTORS
data type T{14} ::
- forall {k1} {k2} {k3} (k4 :: k2) k5. forall k6 ->
+ forall {k1} {k2} {k3} (k4 :: k2) k5.
+ forall k6 ->
k6
-> Proxy k4
-> (k3 -> *)
@@ -21,7 +22,8 @@ TYPE CONSTRUCTORS
nominal
phantom
data type T2{14} ::
- forall {k1} {k2} (k3 :: k2) k7. forall k4 ->
+ forall {k1} {k2} (k3 :: k2) k7.
+ forall k4 ->
k4
-> Proxy k3
-> (k7 -> *)
@@ -52,4 +54,4 @@ DATA CONSTRUCTORS
(d :: Proxy k5) (e :: Proxy k7).
f c -> T k8 a b f c d e
Dependent modules: []
-Dependent packages: [base-4.15.0.0, ghc-bignum-1.0, ghc-prim-0.7.0]
+Dependent packages: [base-4.16.0.0, ghc-bignum-1.0, ghc-prim-0.7.0]
=====================================
testsuite/tests/indexed-types/should_compile/T15711.stderr
=====================================
@@ -3,4 +3,4 @@ TYPE CONSTRUCTORS
associated type family F{2} :: forall a. Maybe a -> *
roles nominal nominal
Dependent modules: []
-Dependent packages: [base-4.15.0.0, ghc-bignum-1.0, ghc-prim-0.7.0]
+Dependent packages: [base-4.16.0.0, ghc-bignum-1.0, ghc-prim-0.7.0]
=====================================
testsuite/tests/indexed-types/should_compile/T15852.stderr
=====================================
@@ -9,4 +9,4 @@ FAMILY INSTANCES
data instance forall {k1} {k2} {j :: k1} {c :: k2}.
DF (Proxy c) -- Defined at T15852.hs:10:15
Dependent modules: []
-Dependent packages: [base-4.15.0.0, ghc-bignum-1.0, ghc-prim-0.7.0]
+Dependent packages: [base-4.16.0.0, ghc-bignum-1.0, ghc-prim-0.7.0]
=====================================
testsuite/tests/polykinds/T15592.stderr
=====================================
@@ -5,4 +5,4 @@ DATA CONSTRUCTORS
MkT :: forall {k} k1 (f :: k1 -> k -> *) (a :: k1) (b :: k).
f a b -> T f a b -> T f a b
Dependent modules: []
-Dependent packages: [base-4.15.0.0, ghc-bignum-1.0, ghc-prim-0.7.0]
+Dependent packages: [base-4.16.0.0, ghc-bignum-1.0, ghc-prim-0.7.0]
=====================================
testsuite/tests/polykinds/T15592b.stderr
=====================================
@@ -4,4 +4,4 @@ TYPE CONSTRUCTORS
forall k (f :: k -> *) (a :: k). f a -> *
roles nominal nominal nominal nominal
Dependent modules: []
-Dependent packages: [base-4.15.0.0, ghc-bignum-1.0, ghc-prim-0.7.0]
+Dependent packages: [base-4.16.0.0, ghc-bignum-1.0, ghc-prim-0.7.0]
=====================================
testsuite/tests/printer/T18052a.stderr
=====================================
@@ -6,7 +6,7 @@ TYPE CONSTRUCTORS
PATTERN SYNONYMS
(:||:) :: forall {a} {b}. a -> b -> (a, b)
Dependent modules: []
-Dependent packages: [base-4.15.0.0, ghc-bignum-1.0, ghc-prim-0.7.0]
+Dependent packages: [base-4.16.0.0, ghc-bignum-1.0, ghc-prim-0.7.0]
==================== Tidy Core ====================
Result size of Tidy Core
=====================================
testsuite/tests/typecheck/should_compile/T12763.stderr
=====================================
@@ -8,4 +8,4 @@ COERCION AXIOMS
CLASS INSTANCES
instance C Int -- Defined at T12763.hs:9:10
Dependent modules: []
-Dependent packages: [base-4.15.0.0, ghc-bignum-1.0, ghc-prim-0.7.0]
+Dependent packages: [base-4.16.0.0, ghc-bignum-1.0, ghc-prim-0.7.0]
=====================================
testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr
=====================================
@@ -8,10 +8,10 @@ subsumption_sort_hole_fits.hs:2:5: warning: [-Wtyped-holes (in -Wdefault)]
Valid hole fits include
lines :: String -> [String]
(imported from ‘Prelude’ at subsumption_sort_hole_fits.hs:1:1
- (and originally defined in ‘base-4.15.0.0:Data.OldList’))
+ (and originally defined in ‘base-4.16.0.0:Data.OldList’))
words :: String -> [String]
(imported from ‘Prelude’ at subsumption_sort_hole_fits.hs:1:1
- (and originally defined in ‘base-4.15.0.0:Data.OldList’))
+ (and originally defined in ‘base-4.16.0.0:Data.OldList’))
read :: forall a. Read a => String -> a
with read @[String]
(imported from ‘Prelude’ at subsumption_sort_hole_fits.hs:1:1
=====================================
utils/hsc2hs
=====================================
@@ -1 +1 @@
-Subproject commit 9cacd5d465d5797e4935d1aa6ae6a71488a03938
+Subproject commit fe518b0e86a45826b5b1f4642037981bac7413d7
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/eedec53df8bf030b36cdd1fcfd1ff06041bc46fd
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/eedec53df8bf030b36cdd1fcfd1ff06041bc46fd
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/20201027/4ef575f7/attachment-0001.html>
More information about the ghc-commits
mailing list