[Git][ghc/ghc][wip/9.2.6-backports] Testsuite fixes

[Zubin (@wz1000)]

Zubin pushed to branch wip/9.2.6-backports at Glasgow Haskell Compiler / GHC


Commits:
34dd0823 by Zubin Duggal at 2023-02-03T15:08:48+05:30
Testsuite fixes

- - - - -


6 changed files:

- testsuite/tests/ghci/scripts/T9881.stdout
- testsuite/tests/ghci/scripts/ghci025.stdout
- testsuite/tests/safeHaskell/warnings/T22728.stderr
- testsuite/tests/safeHaskell/warnings/T22728b.stderr
- testsuite/tests/typecheck/should_fail/T22645.stderr
- testsuite/tests/warnings/should_compile/T16282/T16282.stderr


Changes:

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


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


=====================================
testsuite/tests/safeHaskell/warnings/T22728.stderr
=====================================
@@ -1,4 +1,4 @@
 [2 of 2] Compiling T22728           ( T22728.hs, T22728.o )
 
-T22728.hs:6:1: warning: [GHC-82658] [-Winferred-safe-imports]
+T22728.hs:6:1: warning: [-Winferred-safe-imports]
     Importing Safe-Inferred module T22728_B from explicitly Safe module


=====================================
testsuite/tests/safeHaskell/warnings/T22728b.stderr
=====================================
@@ -1,4 +1,4 @@
 [2 of 2] Compiling T22728b          ( T22728b.hs, T22728b.o )
 
-T22728b.hs:6:1: error: [GHC-82658] [-Winferred-safe-imports, Werror=inferred-safe-imports]
+T22728b.hs:6:1: error: [-Winferred-safe-imports, -Werror=inferred-safe-imports]
     Importing Safe-Inferred module T22728b_B from explicitly Safe module


=====================================
testsuite/tests/typecheck/should_fail/T22645.stderr
=====================================
@@ -1,5 +1,5 @@
 
-T22645.hs:9:5: error: [GHC-25897]
+T22645.hs:9:5: error:
     • Couldn't match type ‘a’ with ‘b’ arising from a use of ‘coerce’
       ‘a’ is a rigid type variable bound by
         the type signature for:


=====================================
testsuite/tests/warnings/should_compile/T16282/T16282.stderr
=====================================
@@ -5,5 +5,6 @@ T16282.hs: warning: [-Wall-missed-specialisations]
     Probable fix: add INLINABLE pragma on ‘Data.Foldable.$wmapM_’
 
 T16282.hs: warning: [-Wall-missed-specialisations]
-    Could not specialise imported function ‘Data.Map.Internal.$fShowMap_$cshowsPrec’
-    Probable fix: add INLINABLE pragma on ‘Data.Map.Internal.$fShowMap_$cshowsPrec’
+    Could not specialise imported function ‘Data.Map.Internal.$w$cshowsPrec’
+      when specialising ‘Data.Map.Internal.$fShowMap_$cshowsPrec’
+    Probable fix: add INLINABLE pragma on ‘Data.Map.Internal.$w$cshowsPrec’



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/34dd0823f59b2e9d32b79d84c843b9bc8f158c56

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/34dd0823f59b2e9d32b79d84c843b9bc8f158c56
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/20230203/6e9563d7/attachment-0001.html>