[Git][ghc/ghc][wip/ghc-toolchain-fixes] 2 commits: Revert "Bump bytestring submodule to 0.11.5.1"

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch wip/ghc-toolchain-fixes at Glasgow Haskell Compiler / GHC


Commits:
eed9bbd1 by Matthew Pickering at 2023-08-08T15:52:20+01:00
Revert "Bump bytestring submodule to 0.11.5.1"

This reverts commit 43578d60bfc478e7277dcd892463cec305400025.

- - - - -
eec5f14e by Matthew Pickering at 2023-08-08T15:56:43+01:00
fix

- - - - -


7 changed files:

- .gitlab-ci.yml
- compiler/GHC/SysTools/Cpp.hs
- compiler/GHC/Utils/Binary.hs
- hadrian/src/Settings/Warnings.hs
- libraries/bytestring
- testsuite/tests/ghci/scripts/T9881.stdout
- testsuite/tests/ghci/scripts/ghci025.stdout


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -401,7 +401,7 @@ hadrian-multi:
     # workaround for docker permissions
     - sudo chown ghc:ghc -R .
   variables:
-    GHC_FLAGS: "-Werror -Wwarn=deprecations"
+    GHC_FLAGS: -Werror
     CONFIGURE_ARGS: --enable-bootstrap-with-devel-snapshot
   tags:
     - x86_64-linux


=====================================
compiler/GHC/SysTools/Cpp.hs
=====================================
@@ -37,6 +37,7 @@ import Data.Maybe
 import Control.Monad
 
 import System.Directory
+import System.FilePath
 
 data CppOpts = CppOpts
   { useHsCpp       :: !Bool


=====================================
compiler/GHC/Utils/Binary.hs
=====================================
@@ -1240,13 +1240,13 @@ putBS :: BinHandle -> ByteString -> IO ()
 putBS bh bs =
   BS.unsafeUseAsCStringLen bs $ \(ptr, l) -> do
     put_ bh l
-    putPrim bh l (\op -> copyBytes op (castPtr ptr) l)
+    putPrim bh l (\op -> BS.memcpy 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 -> copyBytes dest src l)
+    getPrim bh l (\src -> BS.memcpy dest src l)
 
 instance Binary ByteString where
   put_ bh f = putBS bh f


=====================================
hadrian/src/Settings/Warnings.hs
=====================================
@@ -53,12 +53,10 @@ 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/bytestring
=====================================
@@ -1 +1 @@
-Subproject commit 602fd2f3470f180d64cb8baadf63e94baec66b60
+Subproject commit 9cab76dc861f651c3940e873ce921d9e09733cc8


=====================================
testsuite/tests/ghci/scripts/T9881.stdout
=====================================
@@ -19,19 +19,19 @@ instance Ord Data.ByteString.Lazy.ByteString
 
 type Data.ByteString.ByteString :: *
 data Data.ByteString.ByteString
-  = bytestring-0.11.5.1:Data.ByteString.Internal.Type.BS {-# UNPACK #-}(GHC.ForeignPtr.ForeignPtr
+  = bytestring-0.11.4.0:Data.ByteString.Internal.Type.BS {-# UNPACK #-}(GHC.ForeignPtr.ForeignPtr
                                                                           GHC.Word.Word8)
                                                          {-# UNPACK #-}Int
-  	-- Defined in ‘bytestring-0.11.5.1:Data.ByteString.Internal.Type’
+  	-- Defined in ‘bytestring-0.11.4.0:Data.ByteString.Internal.Type’
 instance Monoid Data.ByteString.ByteString
-  -- Defined in ‘bytestring-0.11.5.1:Data.ByteString.Internal.Type’
+  -- Defined in ‘bytestring-0.11.4.0:Data.ByteString.Internal.Type’
 instance Read Data.ByteString.ByteString
-  -- Defined in ‘bytestring-0.11.5.1:Data.ByteString.Internal.Type’
+  -- Defined in ‘bytestring-0.11.4.0:Data.ByteString.Internal.Type’
 instance Semigroup Data.ByteString.ByteString
-  -- Defined in ‘bytestring-0.11.5.1:Data.ByteString.Internal.Type’
+  -- Defined in ‘bytestring-0.11.4.0:Data.ByteString.Internal.Type’
 instance Show Data.ByteString.ByteString
-  -- Defined in ‘bytestring-0.11.5.1:Data.ByteString.Internal.Type’
+  -- Defined in ‘bytestring-0.11.4.0:Data.ByteString.Internal.Type’
 instance Eq Data.ByteString.ByteString
-  -- Defined in ‘bytestring-0.11.5.1:Data.ByteString.Internal.Type’
+  -- Defined in ‘bytestring-0.11.4.0:Data.ByteString.Internal.Type’
 instance Ord Data.ByteString.ByteString
-  -- Defined in ‘bytestring-0.11.5.1:Data.ByteString.Internal.Type’
+  -- Defined in ‘bytestring-0.11.4.0:Data.ByteString.Internal.Type’


=====================================
testsuite/tests/ghci/scripts/ghci025.stdout
=====================================
@@ -54,7 +54,7 @@ Prelude.length :: Data.Foldable.Foldable t => t a -> GHC.Types.Int
 type T.Integer :: *
 data T.Integer = ...
 T.length ::
-  bytestring-0.11.5.1:Data.ByteString.Internal.Type.ByteString
+  bytestring-0.11.4.0:Data.ByteString.Internal.Type.ByteString
   -> GHC.Types.Int
 :browse! T
 -- defined locally



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0a32e22f23ba76bbfe9b34df0fecc011183dd4f6...eec5f14ea8c04d8997d6afe13f1019a18be451bd

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0a32e22f23ba76bbfe9b34df0fecc011183dd4f6...eec5f14ea8c04d8997d6afe13f1019a18be451bd
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/20230808/3d28c9fe/attachment-0001.html>