Version bump: base-4.16 (#18712)

Also bumps upper bounds on base in boot libraries (incl. submodules).

30 files changed, 23 insertions, 21 deletions

diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index c0f01db2ee..f653c154b0 100644
--- a/compiler/ghc.cabal.in
+++ b/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,
diff --git a/libraries/array b/libraries/array
-Subproject ab535173d7885ebfc2005d8da2765f0f52c923c
+Subproject 10e6c7e0522367677e4c33cc1c56eb852ef1342
diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal
index 4a7fe6e133..5da92855f7 100644
--- a/libraries/base/base.cabal
+++ b/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
diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md
index 56fedd5ed6..197388a652 100644
--- a/libraries/base/changelog.md
+++ b/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.
diff --git a/libraries/deepseq b/libraries/deepseq
-Subproject b8c4fb4debaed6ef7eb6940ca4cfea6bd63cc21
+Subproject 0fd7fc88aded7d7a7a1c1250fd3dcd9152edba3
diff --git a/libraries/directory b/libraries/directory
-Subproject b697b3ea77dd4803f2f8f676dd64c8ea5277fcf
+Subproject cecf363bc07004ad314e0297ce34ddba05031c0
diff --git a/libraries/filepath b/libraries/filepath
-Subproject 9088df9f97914664c9360857347d65c32dd6c89
+Subproject e60969e693ffea59725cc3ebcae415343ddd069
diff --git a/libraries/ghc-boot-th/ghc-boot-th.cabal.in b/libraries/ghc-boot-th/ghc-boot-th.cabal.in
index cfbe696c43..7a0fa8634e 100644
--- a/libraries/ghc-boot-th/ghc-boot-th.cabal.in
+++ b/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
diff --git a/libraries/ghc-boot/ghc-boot.cabal.in b/libraries/ghc-boot/ghc-boot.cabal.in
index c58b6893eb..45f8fcc1d8 100644
--- a/libraries/ghc-boot/ghc-boot.cabal.in
+++ b/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,
diff --git a/libraries/ghc-compact/ghc-compact.cabal b/libraries/ghc-compact/ghc-compact.cabal
index 18282725d4..4c55e09e4e 100644
--- a/libraries/ghc-compact/ghc-compact.cabal
+++ b/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
 
diff --git a/libraries/ghci/ghci.cabal.in b/libraries/ghci/ghci.cabal.in
index 60330f72b6..e33b703b49 100644
--- a/libraries/ghci/ghci.cabal.in
+++ b/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,
diff --git a/libraries/haskeline b/libraries/haskeline
-Subproject 2790f1c6ed94990ed51466079e8fb1097129c9b
+Subproject 28ee26ad5b4ae1c0584f2ec11ac53be9671bf87
diff --git a/libraries/hpc b/libraries/hpc
-Subproject 772de3f7b43e31178f042ba77c071594845363e
+Subproject fecf0496a65c4be275d613eb0632fecd5a123b6
diff --git a/libraries/parsec b/libraries/parsec
-Subproject 190492494fe92e8dd42165190b7ac112be1f738
+Subproject 905bc2e3e1c374934d49e16dc5b7c49bf2c3c81
diff --git a/libraries/process b/libraries/process
-Subproject 72c6be917064c923e365622032d1f2fa07acb5e
+Subproject 102f5ca98661d3a6118e6610e59579c715a8ffd
diff --git a/libraries/stm b/libraries/stm
-Subproject 444f672416a354c3cfde9d94ec237a36be46ef5
+Subproject a439b76a645a903757d2410dd70fe44538f4575
diff --git a/libraries/template-haskell/template-haskell.cabal.in b/libraries/template-haskell/template-haskell.cabal.in
index 34984c00bb..950b247614 100644
--- a/libraries/template-haskell/template-haskell.cabal.in
+++ b/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.*
diff --git a/libraries/terminfo b/libraries/terminfo
-Subproject 3ebb36f4a2c42b74ec4e35efccc2be34c198a83
+Subproject 9add7edcc04a9a86aa84a7faea203b654da447d
diff --git a/libraries/unix b/libraries/unix
-Subproject ea13d990580273a883368793dfbb826cab5a22d
+Subproject 8abd63ea234de02d2b3cb08b5098cd06c1a728f
diff --git a/testsuite/tests/dependent/should_compile/T14729.stderr b/testsuite/tests/dependent/should_compile/T14729.stderr
index 7ea3af9ba9..f3e8a1fdf9 100644
--- a/testsuite/tests/dependent/should_compile/T14729.stderr
+++ b/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]
diff --git a/testsuite/tests/dependent/should_compile/T15743.stderr b/testsuite/tests/dependent/should_compile/T15743.stderr
index 4fa3024e4a..4aeecbcc23 100644
--- a/testsuite/tests/dependent/should_compile/T15743.stderr
+++ b/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]
diff --git a/testsuite/tests/dependent/should_compile/T15743e.stderr b/testsuite/tests/dependent/should_compile/T15743e.stderr
index dc10c36337..01e20c63b9 100644
--- a/testsuite/tests/dependent/should_compile/T15743e.stderr
+++ b/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]
diff --git a/testsuite/tests/indexed-types/should_compile/T15711.stderr b/testsuite/tests/indexed-types/should_compile/T15711.stderr
index fb7bd9025c..3e5cf86195 100644
--- a/testsuite/tests/indexed-types/should_compile/T15711.stderr
+++ b/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]
diff --git a/testsuite/tests/indexed-types/should_compile/T15852.stderr b/testsuite/tests/indexed-types/should_compile/T15852.stderr
index 6bad8e11df..05aef7ca0d 100644
--- a/testsuite/tests/indexed-types/should_compile/T15852.stderr
+++ b/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]
diff --git a/testsuite/tests/polykinds/T15592.stderr b/testsuite/tests/polykinds/T15592.stderr
index 8e2935af5f..5f0334b43b 100644
--- a/testsuite/tests/polykinds/T15592.stderr
+++ b/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]
diff --git a/testsuite/tests/polykinds/T15592b.stderr b/testsuite/tests/polykinds/T15592b.stderr
index 32424d061d..e2a538f9d8 100644
--- a/testsuite/tests/polykinds/T15592b.stderr
+++ b/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]
diff --git a/testsuite/tests/printer/T18052a.stderr b/testsuite/tests/printer/T18052a.stderr
index d8d9f94ba3..de339de3c4 100644
--- a/testsuite/tests/printer/T18052a.stderr
+++ b/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
diff --git a/testsuite/tests/typecheck/should_compile/T12763.stderr b/testsuite/tests/typecheck/should_compile/T12763.stderr
index f0e97d58a2..552fd5f1d2 100644
--- a/testsuite/tests/typecheck/should_compile/T12763.stderr
+++ b/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]
diff --git a/testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr b/testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr
index 7799aad239..a081a78582 100644
--- a/testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr
+++ b/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
diff --git a/utils/hsc2hs b/utils/hsc2hs
-Subproject 9cacd5d465d5797e4935d1aa6ae6a71488a0393
+Subproject fe518b0e86a45826b5b1f4642037981bac7413d