Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC

Commits:

6 changed files:

Changes:

  • libraries/base/changelog.md
    1 1 
     # Changelog for [`base` package](http://hackage.haskell.org/package/base)
    2 2
    3 3 
     ## 4.23.0.0 *TBA*
    4 
    +  * Remove deprecated, unstable heap representation details from `GHC.Exts` ([CLC proposal #212](https://github.com/haskell/core-libraries-committee/issues/212))
    4 5 
       * Add `Data.List.NonEmpty.mapMaybe`. ([CLC proposal #337](https://github.com/haskell/core-libraries-committee/issues/337))
    5 6 
       * Fix issues with toRational for types capable to represent infinite and not-a-number values ([CLC proposal #338](https://github.com/haskell/core-libraries-committee/issues/338))
    6 7 
       * Modify the implementation of `Data.List.sortOn` to use `(>)` instead of `compare`. ([CLC proposal #332](https://github.com/haskell/core-libraries-committee/issues/332))

  • libraries/base/src/GHC/Exts.hs
    ... ... @@ -26,12 +26,6 @@ module GHC.Exts
    26 26 
          -- **  Legacy interface for arrays of arrays
    27 27 
          module GHC.Internal.ArrayArray,
    28 28 
          -- *  Primitive operations
    29 
    -     {-# DEPRECATED ["The BCO, mkApUpd0#, and newBCO# re-exports from GHC.Exts have been deprecated and will be removed in 9.14", "These symbols should be imported from ghc-internal instead if needed."] #-}
    30 
    -     Prim.BCO,
    31 
    -     {-# DEPRECATED ["The BCO, mkApUpd0#, and newBCO# re-exports from GHC.Exts have been deprecated and will be removed in 9.14", "These symbols should be imported from ghc-internal instead if needed."] #-}
    32 
    -     Prim.mkApUpd0#,
    33 
    -     {-# DEPRECATED ["The BCO, mkApUpd0#, and newBCO# re-exports from GHC.Exts have been deprecated and will be removed in 9.14", "These symbols should be imported from ghc-internal instead if needed."] #-}
    34 
    -     Prim.newBCO#,
    35 29 
          module GHC.Prim,
    36 30 
          module GHC.Prim.Ext,
    37 31 
          -- **  Running 'RealWorld' state thread
    ... ... @@ -130,9 +124,6 @@ import GHC.Prim hiding
    130 124 
       , whereFrom#
    131 125 
       , isByteArrayWeaklyPinned#, isMutableByteArrayWeaklyPinned#
    132 126
    133 
    -  -- deprecated
    134 
    -  , BCO, mkApUpd0#, newBCO#
    135 
    -
    136 127 
       -- Don't re-export vector FMA instructions
    137 128 
       , fmaddFloatX4#
    138 129 
       , fmsubFloatX4#
    ... ... @@ -255,8 +246,6 @@ import GHC.Prim hiding
    255 246 
       , minWord8X32#
    256 247 
       , minWord8X64#
    257 248 
       )
    258 
    -import qualified GHC.Prim as Prim
    259 
    -  ( BCO, mkApUpd0#, newBCO# )
    260 249
    261 250 
     import GHC.Prim.Ext
    262 251

  • libraries/ghci/GHCi/CreateBCO.hs
    ... ... @@ -6,10 +6,6 @@
    6 6 
     {-# LANGUAGE UnboxedTuples #-}
    7 7 
     {-# LANGUAGE RecordWildCards #-}
    8 8 
     {-# LANGUAGE CPP #-}
    9 
    -{-# OPTIONS_GHC -Wno-warnings-deprecations #-}
    10 
    --- TODO We want to import GHC.Internal.Base (BCO, mkApUpd0#, newBCO#) instead
    11 
    --- of from GHC.Exts when we can require of the bootstrap compiler to have
    12 
    --- ghc-internal.
    13 9
    14 10 
     --
    15 11 
     --  (c) The University of Glasgow 2002-2006
    ... ... @@ -30,7 +26,8 @@ import Data.Array.Base
    30 26 
     import Foreign hiding (newArray)
    31 27 
     import Unsafe.Coerce (unsafeCoerce)
    32 28 
     import GHC.Arr          ( Array(..) )
    33 
    -import GHC.Exts
    29 
    +import GHC.Exts   hiding ( BCO, mkApUpd0#, newBCO# )
    30 
    +import GHC.Internal.Base ( BCO, mkApUpd0#, newBCO# )
    34 31 
     import GHC.IO
    35 32 
     import Control.Exception ( ErrorCall(..) )
    36 33

  • libraries/ghci/GHCi/TH.hs
    1 1 
     {-# LANGUAGE ScopedTypeVariables, StandaloneDeriving, DeriveGeneric,
    2 2 
         TupleSections, RecordWildCards, InstanceSigs, CPP #-}
    3 3 
     {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
    4 
    -{-# OPTIONS_GHC -Wno-warnings-deprecations #-}
    5 
    --- TODO We want to import GHC.Internal.Desugar instead of GHC.Desugar when we
    6 
    --- can require of the bootstrap compiler to have ghc-internal.
    7 4
    8 5 
     -- |
    9 6 
     -- Running TH splices
    ... ... @@ -112,7 +109,7 @@ import Data.IORef
    112 109 
     import Data.Map (Map)
    113 110 
     import qualified Data.Map as M
    114 111 
     import Data.Maybe
    115 
    -import GHC.Desugar (AnnotationWrapper(..))
    112 
    +import GHC.Internal.Desugar (AnnotationWrapper(..))
    116 113 
     import qualified GHC.Boot.TH.Syntax as TH
    117 114 
     import Unsafe.Coerce
    118 115

  • libraries/ghci/ghci.cabal.in
    ... ... @@ -86,11 +86,7 @@ library
    86 86 
             rts,
    87 87 
             array            == 0.5.*,
    88 88 
             base             >= 4.8 && < 4.23,
    89 
    -        -- ghc-internal     == @ProjectVersionForLib@.*
    90 
    -        -- TODO: Use GHC.Internal.Desugar and GHC.Internal.Base from
    91 
    -        -- ghc-internal instead of ignoring the deprecation warning in GHCi.TH
    92 
    -        -- and GHCi.CreateBCO when we require ghc-internal of the bootstrap
    93 
    -        -- compiler
    89 
    +        ghc-internal     >= 9.1001.0 && <=@ProjectVersionForLib@.0,
    94 90 
             ghc-prim         >= 0.5.0 && < 0.14,
    95 91 
             binary           == 0.8.*,
    96 92 
             bytestring       >= 0.10 && < 0.13,

  • testsuite/tests/module/T21752.stderr deleted
    1 
    -T21752A.hs:4:5: warning: [GHC-68441] [-Wdeprecations (in -Wextended-warnings)]
    2 
    -    In the use of ‘newBCO#’ (imported from GHC.Exts):
    3 
    -    Deprecated: "The BCO, mkApUpd0#, and newBCO# re-exports from GHC.Exts have been deprecated and will be removed in 9.14
    4 
    -                 These symbols should be imported from ghc-internal instead if needed."
    5 
    -
    6 
    -T21752A.hs:4:5: warning: [GHC-68441] [-Wdeprecations (in -Wextended-warnings)]
    7 
    -    In the use of ‘newBCO#’ (imported from GHC.Exts):
    8 
    -    Deprecated: "The BCO, mkApUpd0#, and newBCO# re-exports from GHC.Exts have been deprecated and will be removed in 9.14
    9 
    -                 These symbols should be imported from ghc-internal instead if needed."
    10 
    -
    11 
    -T21752A.hs:4:5: warning: [GHC-68441] [-Wdeprecations (in -Wextended-warnings)]
    12 
    -    In the use of ‘mkApUpd0#’ (imported from GHC.Exts):
    13 
    -    Deprecated: "The BCO, mkApUpd0#, and newBCO# re-exports from GHC.Exts have been deprecated and will be removed in 9.14
    14 
    -                 These symbols should be imported from ghc-internal instead if needed."
    15 
    -
    16 
    -T21752A.hs:4:5: warning: [GHC-68441] [-Wdeprecations (in -Wextended-warnings)]
    17 
    -    In the use of ‘mkApUpd0#’ (imported from GHC.Exts):
    18 
    -    Deprecated: "The BCO, mkApUpd0#, and newBCO# re-exports from GHC.Exts have been deprecated and will be removed in 9.14
    19 
    -                 These symbols should be imported from ghc-internal instead if needed."
    20 
    -
    21 
    -T21752A.hs:4:5: warning: [GHC-68441] [-Wdeprecations (in -Wextended-warnings)]
    22 
    -    In the use of type constructor or class ‘BCO’
    23 
    -    (imported from GHC.Exts):
    24 
    -    Deprecated: "The BCO, mkApUpd0#, and newBCO# re-exports from GHC.Exts have been deprecated and will be removed in 9.14
    25 
    -                 These symbols should be imported from ghc-internal instead if needed."
    26 
    -
    27 
    -T21752A.hs:4:5: warning: [GHC-68441] [-Wdeprecations (in -Wextended-warnings)]
    28 
    -    In the use of type constructor or class ‘BCO’
    29 
    -    (imported from GHC.Exts):
    30 
    -    Deprecated: "The BCO, mkApUpd0#, and newBCO# re-exports from GHC.Exts have been deprecated and will be removed in 9.14
    31 
    -                 These symbols should be imported from ghc-internal instead if needed."
    32 
    -

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications · Help