[Git][ghc/ghc][wip/backports-9.8] 4 commits: Bump Cabal submodule
Ben Gamari (@bgamari)
gitlab at gitlab.haskell.org
Tue Aug 22 13:50:12 UTC 2023
Ben Gamari pushed to branch wip/backports-9.8 at Glasgow Haskell Compiler / GHC
Commits:
c96558b4 by Ben Gamari at 2023-08-22T08:51:07-04:00
Bump Cabal submodule
Back to 3.10 as we will be shipping a minor release of Cabal 3.10 with
GHC 9.8.
- - - - -
4305ff61 by Ben Gamari at 2023-08-22T08:51:07-04:00
Bump haddock submodule
- - - - -
e75bd13f by Matthew Craven at 2023-08-22T08:51:07-04:00
Bump bytestring submodule to 0.11.5, again
Fixes #23789.
The bytestring commit used here is unreleased;
a release can be made when necessary.
(cherry picked from commit bf885d7a1a27e7b1cc34335a1e16d699fe084b47)
- - - - -
b958a6e4 by Ben Gamari at 2023-08-22T09:48:40-04:00
relnotes: Note text breakage
See #23758.
- - - - -
9 changed files:
- .gitlab-ci.yml
- compiler/GHC/Utils/Binary.hs
- docs/users_guide/9.8.1-notes.rst
- hadrian/src/Settings/Warnings.hs
- libraries/Cabal
- libraries/bytestring
- testsuite/tests/driver/recomp007/recomp007.stdout
- testsuite/tests/ghci/scripts/all.T
- utils/haddock
Changes:
=====================================
.gitlab-ci.yml
=====================================
@@ -394,7 +394,7 @@ hadrian-multi:
# workaround for docker permissions
- sudo chown ghc:ghc -R .
variables:
- GHC_FLAGS: -Werror
+ GHC_FLAGS: "-Werror -Wwarn=deprecations"
CONFIGURE_ARGS: --enable-bootstrap-with-devel-snapshot
tags:
- x86_64-linux
=====================================
compiler/GHC/Utils/Binary.hs
=====================================
@@ -1228,13 +1228,13 @@ putBS :: BinHandle -> ByteString -> IO ()
putBS bh bs =
BS.unsafeUseAsCStringLen bs $ \(ptr, l) -> do
put_ bh l
- putPrim bh l (\op -> BS.memcpy op (castPtr ptr) l)
+ putPrim bh l (\op -> copyBytes op (castPtr ptr) l)
getBS :: BinHandle -> IO ByteString
getBS bh = do
l <- get bh :: IO Int
BS.create l $ \dest -> do
- getPrim bh l (\src -> BS.memcpy dest src l)
+ getPrim bh l (\src -> copyBytes dest src l)
instance Binary ByteString where
put_ bh f = putBS bh f
=====================================
docs/users_guide/9.8.1-notes.rst
=====================================
@@ -283,6 +283,23 @@ Runtime system
even if this constructor does not have the field in question.
This change enables :extension:`TemplateHaskell` support for :extension:`DuplicateRecordFields`.
+``text`` library
+~~~~~~~~~~~~~~~~
+
+The version of the ``text`` library included changes ``Data.Text.Array.Array`` to be
+a type synonym of ``Data.Array.Byte.ByteArray``. While its former data
+constructor, ``ByteArray``, has been replaced with a pattern synonym, it cannot
+be imported as bundled with the type constructor.
+
+Consequently, imports like: ::
+
+ import Data.Text.Array (Array(..))
+
+will need to avoid using a bundled import (e.g. by qualification): ::
+
+ import Data.Text.Array as A
+
+
Included libraries
~~~~~~~~~~~~~~~~~~
=====================================
hadrian/src/Settings/Warnings.hs
=====================================
@@ -53,10 +53,12 @@ ghcWarningsArgs = do
, package primitive ? pure [ "-Wno-unused-imports"
, "-Wno-deprecations" ]
, package rts ? pure [ "-Wcpp-undef" ]
+ , package text ? pure [ "-Wno-deprecations" ]
, package terminfo ? pure [ "-Wno-unused-imports" ]
, package transformers ? pure [ "-Wno-unused-matches"
, "-Wno-unused-imports"
, "-Wno-redundant-constraints"
, "-Wno-orphans" ]
+ , package unix ? pure [ "-Wno-deprecations" ]
, package win32 ? pure [ "-Wno-trustworthy-safe" ]
, package xhtml ? pure [ "-Wno-unused-imports" ] ] ]
=====================================
libraries/Cabal
=====================================
@@ -1 +1 @@
-Subproject commit 75e340ceb9beaea9dfc4347684519b0ca3d6a8f8
+Subproject commit a04d518e137372cb79caf8e7333b4284d48d3b04
=====================================
libraries/bytestring
=====================================
@@ -1 +1 @@
-Subproject commit 9cab76dc861f651c3940e873ce921d9e09733cc8
+Subproject commit 2bdeb7b0e7dd100fce9e1f4d1ecf1cd6b5b9702c
=====================================
testsuite/tests/driver/recomp007/recomp007.stdout
=====================================
@@ -1,6 +1,6 @@
"1.0"
-Preprocessing executable 'test' for b-1.0...
-Building executable 'test' for b-1.0...
+Preprocessing executable 'test' for b-1.0..
+Building executable 'test' for b-1.0..
[1 of 2] Compiling B ( B.hs, dist/build/test/test-tmp/B.o ) [A package changed]
[3 of 3] Linking dist/build/test/test [Objects changed]
"2.0"
=====================================
testsuite/tests/ghci/scripts/all.T
=====================================
@@ -57,7 +57,11 @@ test('ghci024',
test('T9367',
[req_interp, when(fast() or config.os != 'mingw32', skip)],
makefile_test, [])
-test('ghci025', extra_files(['Ghci025B.hs', 'Ghci025C.hs', 'Ghci025D.hs']), ghci_script, ['ghci025.script'])
+test('ghci025',
+ [ extra_files(['Ghci025B.hs', 'Ghci025C.hs', 'Ghci025D.hs']),
+ normalise_version("bytestring")],
+ ghci_script,
+ ['ghci025.script']),
test('ghci026', extra_files(['../prog002']), ghci_script, ['ghci026.script'])
test('ghci027', [], ghci_script, ['ghci027.script'])
@@ -216,7 +220,7 @@ test('T9762',
, pre_cmd('$MAKE -s --no-print-directory T9762_prep')
],
ghci_script, ['T9762.script'])
-test('T9881', normal, ghci_script, ['T9881.script'])
+test('T9881', normalise_version("bytestring"), ghci_script, ['T9881.script'])
test('T9878', [], ghci_script, ['T9878.script'])
test('T9878b', [extra_run_opts('-fobject-code')], ghci_script,
['T9878b.script'])
=====================================
utils/haddock
=====================================
@@ -1 +1 @@
-Subproject commit 9b6840977177e34771c652caeb4243bce89e5b97
+Subproject commit 342b0b39bc4a9ac6ddfa616bf7e965263ce78b50
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/7f551ef873da2af5ba7a421b7988d5ff52b4f900...b958a6e4c145a951690ee66c877f786decc0302b
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/7f551ef873da2af5ba7a421b7988d5ff52b4f900...b958a6e4c145a951690ee66c877f786decc0302b
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/20230822/389b74a7/attachment-0001.html>
More information about the ghc-commits
mailing list