[Git][ghc/ghc][wip/az/epa-tidy-locatedxxx-27] 8 commits: Remove bitSize from MINIMAL pragma of class Bits

3 Oct 2026


      Alan Zimmerman pushed to branch wip/az/epa-tidy-locatedxxx-27 at Glasgow Haskell Compiler / GHC


Commits:
1d2a26ee by Andrew Lelechenko at 2026-10-01T20:22:04-04:00
Remove bitSize from MINIMAL pragma of class Bits

Cf. https://github.com/haskell/core-libraries-committee/issues/441

The function is deprecated for 12 years and has a default implementation,
yet it was never removed from the MINIMAL pragma, putting library authors
in a very awkward position. Let's finally remove bitSize from MINIMAL.

- - - - -
3cc21e4c by Hannes Siebenhandl at 2026-10-01T20:22:59-04:00
Add regression test for #27641

- - - - -
c35096f5 by Hannes Siebenhandl at 2026-10-01T20:23:00-04:00
Don't `:add` modules the loader will reject

Only home modules can be actually added to the loader context, thus we
only accept the module if it belongs to a home unit.

- - - - -
a563cb27 by Simon Jakobi at 2026-10-02T17:37:36-04:00
ci: accept modified changelog.d entries in lint-changelog

The changelog guide says to extend an existing entry rather than add a
new one when the feature is already documented. lint_changelog only
counted added files, so such MRs failed before the validator ran.

Fixes #27779.

Assisted-by: Claude Fable 5.1

- - - - -
03082cd4 by Simon Jakobi at 2026-10-02T17:38:17-04:00
changelog.d: Fix warning flag name in the semaphore-v2 entry

The entry refers to -Wsemaphore-version-mismatch, which does not exist.
The warning GHC emits when it cannot use a -jsem semaphore, including
on a protocol version mismatch, is -Wsemaphore-open-failure.

Context: !15729, #25087

Assisted-by: Claude Fable 5.1

- - - - -
a93705ee by Simon Jakobi at 2026-10-02T17:38:17-04:00
changelog.d: Fix the CLC proposal link in the T27455 entry

The entry used the Sphinx :ref: role with a URL as its target. :ref:
resolves only internal labels, so the generated release notes would
show the proposal name without a link. Use the plain hyperlink form
like the other entries.

Context: !16274, #27455

Assisted-by: Claude Fable 5.1

- - - - -
54381079 by Hannes Siebenhandl at 2026-10-02T17:39:01-04:00
Extend the `TrustOverlay` for wired-in units

The TrustOverlay only contained the `UnitId` of all on-disk units.
However, wired-in units are referred to by their wired-in unit id, which
is not the same as the on-disk unit id.

Thus, trust checks for wired-in units failed because the lookup was
using the wired-in unit, which wasn't present in the `TrustOverlay`.

We fix #27834, by copying the trust info for wired-in unit ids.

- - - - -
6d819a47 by Alan Zimmerman at 2026-10-03T10:31:10+01:00
EPA: Start using vocurly as basis for AnnListLayout

For the existing cases that populate AnnList.

This uses AnnListBraces when braces are explicitly supplied, and
AnnListLayout when vocurly is used

The change also shows up AnnList usages that can never capture layout,
these are cleared up later.

- - - - -


22 changed files:

- .gitlab/ci.sh
- + changelog.d/27641
- changelog.d/T27455
- changelog.d/semaphore-v2
- changelog.d/unit-index
- compiler/GHC/Parser.y
- compiler/GHC/Unit/External/Wired.hs
- compiler/GHC/Unit/State.hs
- ghc/GHCi/UI.hs
- libraries/base/changelog.md
- libraries/ghc-internal/src/GHC/Internal/Bits.hs
- + testsuite/tests/ghci/scripts/T27641.script
- + testsuite/tests/ghci/scripts/T27641.stderr
- + testsuite/tests/ghci/scripts/T27641.stdout
- + testsuite/tests/ghci/scripts/T27834.hs
- + testsuite/tests/ghci/scripts/T27834.script
- + testsuite/tests/ghci/scripts/T27834.stdout
- testsuite/tests/ghci/scripts/all.T
- testsuite/tests/interface-stability/base-exports.stdout
- testsuite/tests/interface-stability/base-exports.stdout-javascript-unknown-ghcjs
- testsuite/tests/interface-stability/base-exports.stdout-mingw32
- testsuite/tests/parser/should_compile/DumpSemis.stderr


Changes:

=====================================
.gitlab/ci.sh
=====================================
@@ -982,23 +982,24 @@ function lint_changelog() {
     exit 0
   fi
 
-  # Check that the MR adds at least one changelog entry.
+  # Check that the MR adds or modifies at least one changelog entry.
   git fetch --depth=1 \
     "$CI_MERGE_REQUEST_PROJECT_URL" \
     "$CI_MERGE_REQUEST_DIFF_BASE_SHA"
 
-  local added
-  added=$(git diff --name-only --diff-filter=A \
+  local entries
+  entries=$(git diff --name-only --diff-filter=AM \
     "$CI_MERGE_REQUEST_DIFF_BASE_SHA..$CI_COMMIT_SHA" -- \
     'changelog.d/' | grep -v '^changelog.d/config$' || true)
 
-  if [ -z "$added" ]; then
+  if [ -z "$entries" ]; then
     error "No changelog entry found in changelog.d/"
-    echo "Please add a changelog entry file describing your user-facing changes."
+    echo "Please add a changelog entry file describing your user-facing changes,"
+    echo "or add this MR to the 'mrs' field of an existing entry."
     echo "If this MR does not need a changelog entry, apply the 'no-changelog' label."
     exit 1
   fi
-  echo "Found changelog entries: $added"
+  echo "Found changelog entries: $entries"
 
   # Build changelog-d with the bootstrap compiler and validate all entries
   # (checks required fields, section names, and the MR number).


=====================================
changelog.d/27641
=====================================
@@ -0,0 +1,4 @@
+section: ghci
+synopsis: Don't accept modules in `:add` that the loader will reject
+issues: #27641
+mrs: !16734


=====================================
changelog.d/T27455
=====================================
@@ -4,5 +4,5 @@ mrs: !16274
 synopsis:
   Don't drop `ExceptionContext` in `SomeException(toException)`
 description:
-  Previously the implementation of ``Exception(toException)`` given to `SomeException` would inappropriately drop the carried `ExceptionContext`. Now ``toException = id``, faithfully implementing the semantics proposed in :ref:`CLC Proposal #200 <https://github.com/haskell/core-libraries-committee/issues/200>`.
+  Previously the implementation of ``Exception(toException)`` given to `SomeException` would inappropriately drop the carried `ExceptionContext`. Now ``toException = id``, faithfully implementing the semantics proposed in `CLC Proposal #200 <https://github.com/haskell/core-libraries-committee/issues/200>`_.
 


=====================================
changelog.d/semaphore-v2
=====================================
@@ -12,7 +12,7 @@ description:
   semaphores); its reported protocol version remains v1.
 
   When GHC receives a ``-jsem`` name whose protocol version it does not
-  support, it now emits a ``-Wsemaphore-version-mismatch`` warning and
+  support, it now emits a :ghc-flag:`-Wsemaphore-open-failure` warning and
   falls back to ``-j1`` rather than crashing. ``ghc --info`` exposes the
   supported version in a new ``"Semaphore version"`` entry so
   cabal-install can detect a mismatch before invoking GHC.


=====================================
changelog.d/unit-index
=====================================
@@ -1,7 +1,7 @@
 section: compiler
 synopsis: Use global ``UnitIndex`` to deduplicate ``UnitInfo``s over multiple home units
-issues: #27500 #26423 #27748
-mrs: !16115 !16598
+issues: #27500 #26423 #27748 #27834
+mrs: !16115 !16598 !16743
 
 description: {
     The ``UnitState`` used to be duplicated for all ``HomeUnitEnv``, not sharing any of the ``UnitInfo``s.


=====================================
compiler/GHC/Parser.y
=====================================
@@ -1796,10 +1796,10 @@ cvars1 :: { [RecordPatSynField GhcPs] }
 where_decls :: { LocatedA (OrdList (LHsDecl GhcPs), EpToken "where", AnnList) }
         : 'where' '{' decls '}'       {% amsA' (sLL $1 $> (thdOf3 $ unLoc $3,
                                                 epTok $1,
-                                                AnnList (AnnListLayout (fstOf3 $ unLoc $3)) (ListBraces (epTok $2) (epTok $4)) (sndOf3 $ unLoc $3))) }
+                                                AnnList AnnListBraces (ListBraces (epTok $2) (epTok $4)) (sndOf3 $ unLoc $3))) }
         | 'where' vocurly decls close {% amsA' (sLL $1 $3 (thdOf3 $ unLoc $3,
                                                 epTok $1,
-                                                AnnList (AnnListLayout (fstOf3 $ unLoc $3)) ListNone (sndOf3 $ unLoc $3))) }
+                                                AnnList (AnnListLayout (glR $3)) ListNone (sndOf3 $ unLoc $3))) }
 
 pattern_synonym_sig :: { LSig GhcPs }
         : 'pattern' con_list '::' sigtype
@@ -1935,7 +1935,7 @@ decls   :: { Located (EpaLocation, [EpToken ";"], OrdList (LHsDecl GhcPs)) }
         | {- empty -}                   { noLoc (noAnn, [],nilOL) }
 
 decllist :: { Located (AnnList,Located (OrdList (LHsDecl GhcPs))) }
-        : '{'            decls '}'     { sLL $1 $> (AnnList (AnnListLayout (fstOf3 $ unLoc $2)) (ListBraces (epTok $1) (epTok $3)) (sndOf3 $ unLoc $2)
+        : '{'            decls '}'     { sLL $1 $> (AnnList AnnListBraces (ListBraces (epTok $1) (epTok $3)) (sndOf3 $ unLoc $2)
                                                    ,sL1 $2 $ thdOf3 $ unLoc $2) }
         |     vocurly    decls close   { sL1 $2    (AnnList (AnnListLayout (fstOf3 $ unLoc $2)) ListNone (sndOf3 $ unLoc $2)
                                                    ,sL1 $2 $ thdOf3 $ unLoc $2) }
@@ -1951,7 +1951,7 @@ binds   ::  { Located (HsLocalBinds GhcPs) }
                                   ; return (sL1 $1 $ HsValBinds (EpAnn (glR $1) (AnnList la p s) cs, noEpTok) val_binds)} }
 
         | '{'            dbinds '}'     {% acs (comb3 $1 $2 $3) (\loc cs -> (L loc
-                                             $ HsIPBinds (EpAnn (spanAsAnchor (comb3 $1 $2 $3)) (AnnList (AnnListLayout$ glR $2) (ListBraces (epTok $1) (epTok $3)) []) cs, noEpTok) (IPBinds noExtField (reverse $ unLoc $2)))) }
+                                             $ HsIPBinds (EpAnn (spanAsAnchor (comb3 $1 $2 $3)) (AnnList AnnListBraces (ListBraces (epTok $1) (epTok $3)) []) cs, noEpTok) (IPBinds noExtField (reverse $ unLoc $2)))) }
 
         |     vocurly    dbinds close   {% acs (gl $2) (\loc cs -> (L loc
                                              $ HsIPBinds (EpAnn (glR $1) (AnnList (AnnListLayout $ glR $2) ListNone []) cs, noEpTok) (IPBinds noExtField (reverse $ unLoc $2)))) }
@@ -3542,12 +3542,12 @@ guardquals1 :: { Located [LStmt GhcPs (LHsExpr GhcPs)] }
 altslist(PATS) :: { forall b. DisambECP b => PV (LocatedA ([LMatch GhcPs (LocatedA b)], AnnList)) }
         : '{'        alts(PATS) '}'    { $2 >>= \ $2 -> amsA'
                                            (sLL $1 $> (reverse (snd $ unLoc $2),
-                                           (AnnList (AnnListLayout $ glR $2) (ListBraces (epTok $1) (epTok $3)) (fst $ unLoc $2)))) }
+                                           (AnnList AnnListBraces (ListBraces (epTok $1) (epTok $3)) (fst $ unLoc $2)))) }
         | vocurly    alts(PATS)  close { $2 >>= \ $2 -> amsA'
                                            (L (getLoc $2) (reverse (snd $ unLoc $2),
                                            (AnnList (AnnListLayout $ glR $2) ListNone (fst $ unLoc $2)))) }
-        | '{'              '}'   { amsA' (sLL $1 $> ([], (AnnList AnnListNoLayout (ListBraces (epTok $1) (epTok $2)) []))) }
-        | vocurly          close { return $ noLocA ([], noAnn) }
+        | '{'              '}'   { amsA' (sLL $1 $> ([], (AnnList AnnListBraces (ListBraces (epTok $1) (epTok $2)) []))) }
+        | vocurly          close { return $ noLocA ([], AnnList (AnnListLayout $ glR $1) ListNone []) }
 
 alts(PATS) :: { forall b. DisambECP b => PV (Located ([EpToken ";"],[LMatch GhcPs (LocatedA b)])) }
         : alts1(PATS)              { $1 >>= \ $1 -> return $
@@ -3656,7 +3656,7 @@ apat    : aexp                  {% (checkPattern <=< runPV) (unECP $1) }
 
 stmtlist :: { forall b. DisambECP b => PV (LocatedA (AnnList, Located [LocatedA (Stmt GhcPs (LocatedA b))])) }
         : '{'           stmts '}'       { $2 >>= \ $2 ->
-                                          amsA' (sLL $1 $> (AnnList (AnnListLayout (spanAsAnchor $ stmtsLoc $2)) (ListBraces (epTok $1) (epTok $3)) (fromOL $ fst $ unLoc $2)
+                                          amsA' (sLL $1 $> (AnnList AnnListBraces (ListBraces (epTok $1) (epTok $3)) (fromOL $ fst $ unLoc $2)
                                                            , sL1 $2 $ reverse $ snd $ unLoc $2))}
         |     vocurly   stmts close     { $2 >>= \ $2 ->
                                           amsA' (L (stmtsLoc $2) (AnnList (AnnListLayout (spanAsAnchor $ stmtsLoc $2)) ListNone (fromOL $ fst $ unLoc $2)


=====================================
compiler/GHC/Unit/External/Wired.hs
=====================================
@@ -5,6 +5,7 @@ module GHC.Unit.External.Wired (
   isWireMapEmpty,
   lookupWireMap,
   listWireMap,
+  nonDetFoldWireMap,
   -- * 'UnwireMap'
   UnwireMap,
   emptyUnwireMap,
@@ -48,6 +49,9 @@ lookupWireMap uid (WireMap wmap) = lookupUniqMap wmap uid
 listWireMap :: WireMap -> [(UnitId, UnitId)]
 listWireMap (WireMap wmap) = nonDetUniqMapToList wmap
 
+nonDetFoldWireMap :: ((UnitId, UnitId) -> b -> b) -> b -> WireMap -> b
+nonDetFoldWireMap go z (WireMap uniq) = nonDetFoldUniqMap go z uniq
+
 -- | The reverse of 'WireMap'.
 -- Records the mapping from the wired-in 'UnitId' to the on-disk 'UnitId'.
 newtype UnwireMap =


=====================================
compiler/GHC/Unit/State.hs
=====================================
@@ -286,6 +286,21 @@ trustUnits elements (TrustOverlay to) = TrustOverlay $ foldl' (\ acc uid -> addT
 emptyTrustOverlay :: TrustOverlay
 emptyTrustOverlay = TrustOverlay emptyUniqMap
 
+-- | For all values in the 'WireMap', copy the recorded trust/distrust
+-- for the wired-in unit id.
+--
+extendForWireMap :: TrustOverlay -> WireMap -> TrustOverlay
+extendForWireMap to wmap =
+  nonDetFoldWireMap go to wmap
+  where
+    go (onDiskUid, wiredInUid) overlay =
+      case lookupTrustOverlay overlay onDiskUid of
+        Nothing -> overlay
+        Just Trusted ->
+          trustUnits [wiredInUid] overlay
+        Just Distrusted ->
+          distrustUnits [wiredInUid] overlay
+
 {-
 Note [Sharing 'UnitInfo's across the 'UnitEnv']
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -957,7 +972,7 @@ mkUnitState logger unit_index cfg = do
          , explicitUnits                = explicit_pkgs
          , homeUnitDepends              = home_unit_deps
          , unitInfoMap                  = pkg_db
-         , trustedUnits                 = trustUnitsOverlay
+         , trustedUnits                 = trustUnitsOverlay `extendForWireMap` wired_map
          , moduleNameProvidersMap       = mod_map
          , pluginModuleNameProvidersMap = mkModuleNameProvidersMap logger (unitConfigAllowVirtual cfg) pkg_db plugin_vis_map
          , packageNameMap               = pkgname_map


=====================================
ghc/GHCi/UI.hs
=====================================
@@ -180,6 +180,7 @@ import GHC.IO.Handle ( hFlushAll )
 import GHC.TopHandler ( topHandler )
 
 import qualified GHC.Unit.Module.Graph as GHC
+import GHC.Unit.Home.Graph (memberHugUnit)
 
 -----------------------------------------------------------------------------
 
@@ -2400,7 +2401,9 @@ addModule files = do
       result <- liftIO $
         Finder.findImportedModule hsc_env Finder.LookupUser m NoPkgQual
       case result of
-        Found _ _ -> return True
+        -- We could find a module from a dependency, such as `Data.List`, but we can't
+        -- actualy load that unless the module is located in a home unit.
+        Found _ m | moduleUnit m `memberHugUnit` hsc_HUG hsc_env -> return True
         _ -> do reportError (GhciModuleError $ GhciModuleNotFound (moduleNameString m))
                 return False
 


=====================================
libraries/base/changelog.md
=====================================
@@ -7,6 +7,7 @@
   * Add `Data.List.NonEmpty.{zip{3..7},zipWith{3..7},unzip{3..7}}` ([CLC proposal #409)(https://github.com/haskell/core-libraries-committee/issues/409))
   * Ensure that `Data.List.elem` and `notElem` can be specialized even when no list fusion happens. ([CLC proposal #412)(https://github.com/haskell/core-libraries-committee/issues/412))
   * Introduce `Data.Double` and `Data.Float` modules. ([CLC proposal #378](https://github.com/haskell/core-libraries-committee/issues/378))
+  * Remove `bitSize` from `MINIMAL` pragma of `class Bits`. ([CLC proposal #440](https://github.com/haskell/core-libraries-committee/issues/440))
   * Change `Generically a`'s `Monoid` definition to require a `Semigroup` constraint, and define its `mconcat` using `(<>)` from that constraint. ([CLC proposal #413](https://github.com/haskell/core-libraries-committee/issues/413))
   * Add `withEmptyCallStack` to `GHC.Stack`. ([CLC proposal #428](https://github.com/haskell/core-libraries-committee/issues/428))
   * Add new `Data.RealFloat` module re-exporting `RealFloat` from `GHC.Float` ([CLC proposal #394](https://github.com/haskell/core-libraries-committee/issues/394))


=====================================
libraries/ghc-internal/src/GHC/Internal/Bits.hs
=====================================
@@ -90,7 +90,7 @@ class Eq a => Bits a where
     {-# MINIMAL (.&.), (.|.), xor, complement,
                 (shift | (shiftL, shiftR)),
                 (rotate | (rotateL, rotateR)),
-                bitSize, bitSizeMaybe, isSigned, testBit, bit, popCount #-}
+                bitSizeMaybe, isSigned, testBit, bit, popCount #-}
 
     -- | Bitwise \"and\"
     (.&.) :: a -> a -> a


=====================================
testsuite/tests/ghci/scripts/T27641.script
=====================================
@@ -0,0 +1,3 @@
+:add Data.List
+:reload
+putStrLn ":add Data.List should fail and a subsequent :reload should succeed"


=====================================
testsuite/tests/ghci/scripts/T27641.stderr
=====================================
@@ -0,0 +1,2 @@
+<interactive>: error: [GHCi-23305] Module Data.List not found
+


=====================================
testsuite/tests/ghci/scripts/T27641.stdout
=====================================
@@ -0,0 +1 @@
+:add Data.List should fail and a subsequent :reload should succeed


=====================================
testsuite/tests/ghci/scripts/T27834.hs
=====================================
@@ -0,0 +1,9 @@
+{-# LANGUAGE Haskell2010 #-}
+{-# LANGUAGE Safe #-}
+module Main where
+
+-- Importing a wired-in in module should honour trustworthiness
+import GHC.Internal.Char (chr)
+
+main :: IO ()
+main = print (chr 120)


=====================================
testsuite/tests/ghci/scripts/T27834.script
=====================================
@@ -0,0 +1,2 @@
+:load T27834
+putStrLn "Can import trusted module from ghc-internal"


=====================================
testsuite/tests/ghci/scripts/T27834.stdout
=====================================
@@ -0,0 +1 @@
+Can import trusted module from ghc-internal


=====================================
testsuite/tests/ghci/scripts/all.T
=====================================
@@ -402,3 +402,5 @@ test('GhciPackageRename',
      ghci_script,
      ['GhciPackageRename.script'])
 test('T26233', normal, ghci_script, ['T26233.script'])
+test('T27641', normal, ghci_script, ['T27641.script'])
+test('T27834', [extra_hc_opts("-fpackage-trust -trust base -trust ghc-internal -package ghc-internal")], ghci_script, ['T27834.script'])


=====================================
testsuite/tests/interface-stability/base-exports.stdout
=====================================
@@ -726,7 +726,7 @@ module Data.Bits where
     rotateL :: a -> GHC.Internal.Types.Int -> a
     rotateR :: a -> GHC.Internal.Types.Int -> a
     popCount :: a -> GHC.Internal.Types.Int
-    {-# MINIMAL (.&.), (.|.), xor, complement, (shift | (shiftL, shiftR)), (rotate | (rotateL, rotateR)), bitSize, bitSizeMaybe, isSigned, testBit, bit, popCount #-}
+    {-# MINIMAL (.&.), (.|.), xor, complement, (shift | (shiftL, shiftR)), (rotate | (rotateL, rotateR)), bitSizeMaybe, isSigned, testBit, bit, popCount #-}
   type FiniteBits :: * -> Constraint
   class Bits b => FiniteBits b where
     finiteBitSize :: b -> GHC.Internal.Types.Int
@@ -2024,7 +2024,7 @@ module Foreign where
     rotateL :: a -> Int -> a
     rotateR :: a -> Int -> a
     popCount :: a -> Int
-    {-# MINIMAL (.&.), (.|.), xor, complement, (shift | (shiftL, shiftR)), (rotate | (rotateL, rotateR)), bitSize, bitSizeMaybe, isSigned, testBit, bit, popCount #-}
+    {-# MINIMAL (.&.), (.|.), xor, complement, (shift | (shiftL, shiftR)), (rotate | (rotateL, rotateR)), bitSizeMaybe, isSigned, testBit, bit, popCount #-}
   type FinalizerEnvPtr :: * -> * -> *
   type FinalizerEnvPtr env a = FunPtr (Ptr env -> Ptr a -> GHC.Internal.Types.IO ())
   type FinalizerPtr :: * -> *
@@ -2938,7 +2938,7 @@ module Foreign.Safe where
     rotateL :: a -> Int -> a
     rotateR :: a -> Int -> a
     popCount :: a -> Int
-    {-# MINIMAL (.&.), (.|.), xor, complement, (shift | (shiftL, shiftR)), (rotate | (rotateL, rotateR)), bitSize, bitSizeMaybe, isSigned, testBit, bit, popCount #-}
+    {-# MINIMAL (.&.), (.|.), xor, complement, (shift | (shiftL, shiftR)), (rotate | (rotateL, rotateR)), bitSizeMaybe, isSigned, testBit, bit, popCount #-}
   type FinalizerEnvPtr :: * -> * -> *
   type FinalizerEnvPtr env a = FunPtr (Ptr env -> Ptr a -> GHC.Internal.Types.IO ())
   type FinalizerPtr :: * -> *
@@ -5070,7 +5070,7 @@ module GHC.Bits where
     rotateL :: a -> GHC.Internal.Types.Int -> a
     rotateR :: a -> GHC.Internal.Types.Int -> a
     popCount :: a -> GHC.Internal.Types.Int
-    {-# MINIMAL (.&.), (.|.), xor, complement, (shift | (shiftL, shiftR)), (rotate | (rotateL, rotateR)), bitSize, bitSizeMaybe, isSigned, testBit, bit, popCount #-}
+    {-# MINIMAL (.&.), (.|.), xor, complement, (shift | (shiftL, shiftR)), (rotate | (rotateL, rotateR)), bitSizeMaybe, isSigned, testBit, bit, popCount #-}
   type FiniteBits :: * -> Constraint
   class Bits b => FiniteBits b where
     finiteBitSize :: b -> GHC.Internal.Types.Int


=====================================
testsuite/tests/interface-stability/base-exports.stdout-javascript-unknown-ghcjs
=====================================
@@ -726,7 +726,7 @@ module Data.Bits where
     rotateL :: a -> GHC.Internal.Types.Int -> a
     rotateR :: a -> GHC.Internal.Types.Int -> a
     popCount :: a -> GHC.Internal.Types.Int
-    {-# MINIMAL (.&.), (.|.), xor, complement, (shift | (shiftL, shiftR)), (rotate | (rotateL, rotateR)), bitSize, bitSizeMaybe, isSigned, testBit, bit, popCount #-}
+    {-# MINIMAL (.&.), (.|.), xor, complement, (shift | (shiftL, shiftR)), (rotate | (rotateL, rotateR)), bitSizeMaybe, isSigned, testBit, bit, popCount #-}
   type FiniteBits :: * -> Constraint
   class Bits b => FiniteBits b where
     finiteBitSize :: b -> GHC.Internal.Types.Int
@@ -2024,7 +2024,7 @@ module Foreign where
     rotateL :: a -> Int -> a
     rotateR :: a -> Int -> a
     popCount :: a -> Int
-    {-# MINIMAL (.&.), (.|.), xor, complement, (shift | (shiftL, shiftR)), (rotate | (rotateL, rotateR)), bitSize, bitSizeMaybe, isSigned, testBit, bit, popCount #-}
+    {-# MINIMAL (.&.), (.|.), xor, complement, (shift | (shiftL, shiftR)), (rotate | (rotateL, rotateR)), bitSizeMaybe, isSigned, testBit, bit, popCount #-}
   type FinalizerEnvPtr :: * -> * -> *
   type FinalizerEnvPtr env a = FunPtr (Ptr env -> Ptr a -> GHC.Internal.Types.IO ())
   type FinalizerPtr :: * -> *
@@ -2938,7 +2938,7 @@ module Foreign.Safe where
     rotateL :: a -> Int -> a
     rotateR :: a -> Int -> a
     popCount :: a -> Int
-    {-# MINIMAL (.&.), (.|.), xor, complement, (shift | (shiftL, shiftR)), (rotate | (rotateL, rotateR)), bitSize, bitSizeMaybe, isSigned, testBit, bit, popCount #-}
+    {-# MINIMAL (.&.), (.|.), xor, complement, (shift | (shiftL, shiftR)), (rotate | (rotateL, rotateR)), bitSizeMaybe, isSigned, testBit, bit, popCount #-}
   type FinalizerEnvPtr :: * -> * -> *
   type FinalizerEnvPtr env a = FunPtr (Ptr env -> Ptr a -> GHC.Internal.Types.IO ())
   type FinalizerPtr :: * -> *
@@ -5070,7 +5070,7 @@ module GHC.Bits where
     rotateL :: a -> GHC.Internal.Types.Int -> a
     rotateR :: a -> GHC.Internal.Types.Int -> a
     popCount :: a -> GHC.Internal.Types.Int
-    {-# MINIMAL (.&.), (.|.), xor, complement, (shift | (shiftL, shiftR)), (rotate | (rotateL, rotateR)), bitSize, bitSizeMaybe, isSigned, testBit, bit, popCount #-}
+    {-# MINIMAL (.&.), (.|.), xor, complement, (shift | (shiftL, shiftR)), (rotate | (rotateL, rotateR)), bitSizeMaybe, isSigned, testBit, bit, popCount #-}
   type FiniteBits :: * -> Constraint
   class Bits b => FiniteBits b where
     finiteBitSize :: b -> GHC.Internal.Types.Int


=====================================
testsuite/tests/interface-stability/base-exports.stdout-mingw32
=====================================
@@ -726,7 +726,7 @@ module Data.Bits where
     rotateL :: a -> GHC.Internal.Types.Int -> a
     rotateR :: a -> GHC.Internal.Types.Int -> a
     popCount :: a -> GHC.Internal.Types.Int
-    {-# MINIMAL (.&.), (.|.), xor, complement, (shift | (shiftL, shiftR)), (rotate | (rotateL, rotateR)), bitSize, bitSizeMaybe, isSigned, testBit, bit, popCount #-}
+    {-# MINIMAL (.&.), (.|.), xor, complement, (shift | (shiftL, shiftR)), (rotate | (rotateL, rotateR)), bitSizeMaybe, isSigned, testBit, bit, popCount #-}
   type FiniteBits :: * -> Constraint
   class Bits b => FiniteBits b where
     finiteBitSize :: b -> GHC.Internal.Types.Int
@@ -2024,7 +2024,7 @@ module Foreign where
     rotateL :: a -> Int -> a
     rotateR :: a -> Int -> a
     popCount :: a -> Int
-    {-# MINIMAL (.&.), (.|.), xor, complement, (shift | (shiftL, shiftR)), (rotate | (rotateL, rotateR)), bitSize, bitSizeMaybe, isSigned, testBit, bit, popCount #-}
+    {-# MINIMAL (.&.), (.|.), xor, complement, (shift | (shiftL, shiftR)), (rotate | (rotateL, rotateR)), bitSizeMaybe, isSigned, testBit, bit, popCount #-}
   type FinalizerEnvPtr :: * -> * -> *
   type FinalizerEnvPtr env a = FunPtr (Ptr env -> Ptr a -> GHC.Internal.Types.IO ())
   type FinalizerPtr :: * -> *
@@ -2938,7 +2938,7 @@ module Foreign.Safe where
     rotateL :: a -> Int -> a
     rotateR :: a -> Int -> a
     popCount :: a -> Int
-    {-# MINIMAL (.&.), (.|.), xor, complement, (shift | (shiftL, shiftR)), (rotate | (rotateL, rotateR)), bitSize, bitSizeMaybe, isSigned, testBit, bit, popCount #-}
+    {-# MINIMAL (.&.), (.|.), xor, complement, (shift | (shiftL, shiftR)), (rotate | (rotateL, rotateR)), bitSizeMaybe, isSigned, testBit, bit, popCount #-}
   type FinalizerEnvPtr :: * -> * -> *
   type FinalizerEnvPtr env a = FunPtr (Ptr env -> Ptr a -> GHC.Internal.Types.IO ())
   type FinalizerPtr :: * -> *
@@ -5073,7 +5073,7 @@ module GHC.Bits where
     rotateL :: a -> GHC.Internal.Types.Int -> a
     rotateR :: a -> GHC.Internal.Types.Int -> a
     popCount :: a -> GHC.Internal.Types.Int
-    {-# MINIMAL (.&.), (.|.), xor, complement, (shift | (shiftL, shiftR)), (rotate | (rotateL, rotateR)), bitSize, bitSizeMaybe, isSigned, testBit, bit, popCount #-}
+    {-# MINIMAL (.&.), (.|.), xor, complement, (shift | (shiftL, shiftR)), (rotate | (rotateL, rotateR)), bitSizeMaybe, isSigned, testBit, bit, popCount #-}
   type FiniteBits :: * -> Constraint
   class Bits b => FiniteBits b where
     finiteBitSize :: b -> GHC.Internal.Types.Int


=====================================
testsuite/tests/parser/should_compile/DumpSemis.stderr
=====================================
@@ -364,8 +364,7 @@
                        ((,)
                         (Right
                          (AnnList
-                          (AnnListLayout
-                           (EpaSpan { DumpSemis.hs:11:8-13 }))
+                          (AnnListBraces)
                           (ListBraces
                            (EpTok (EpaSpan { DumpSemis.hs:11:6 }))
                            (EpTok (EpaSpan { DumpSemis.hs:11:15 })))
@@ -627,8 +626,7 @@
                  ((,)
                   (Right
                    (AnnList
-                    (AnnListLayout
-                     (EpaSpan { DumpSemis.hs:(16,5)-(18,5) }))
+                    (AnnListBraces)
                     (ListBraces
                      (EpTok (EpaSpan { DumpSemis.hs:16:3 }))
                      (EpTok (EpaSpan { DumpSemis.hs:19:3 })))
@@ -880,8 +878,7 @@
                  ((,)
                   (Right
                    (AnnList
-                    (AnnListLayout
-                     (EpaSpan { DumpSemis.hs:22:12-28 }))
+                    (AnnListBraces)
                     (ListBraces
                      (EpTok (EpaSpan { DumpSemis.hs:22:10 }))
                      (EpTok (EpaSpan { DumpSemis.hs:22:30 })))
@@ -1936,8 +1933,7 @@
                    (EpAnn
                     (EpaSpan { DumpSemis.hs:34:13-31 })
                     (AnnList
-                     (AnnListLayout
-                      (EpaSpan { DumpSemis.hs:34:18-30 }))
+                     (AnnListBraces)
                      (ListBraces
                       (EpTok (EpaSpan { DumpSemis.hs:34:13 }))
                       (EpTok (EpaSpan { DumpSemis.hs:34:31 })))
@@ -2333,8 +2329,7 @@
                   ((,)
                    (FromSource)
                    (AnnList
-                    (AnnListLayout
-                     (EpaSpan { DumpSemis.hs:(38,6)-(43,13) }))
+                    (AnnListBraces)
                     (ListBraces
                      (EpTok (EpaSpan { DumpSemis.hs:38:4 }))
                      (EpTok (EpaSpan { DumpSemis.hs:44:4 })))



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/4f404570a658955bdc2505c8becf4c5...

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/4f404570a658955bdc2505c8becf4c5...
You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

    

[Git][ghc/ghc][wip/az/epa-tidy-locatedxxx-27] 8 commits: Remove bitSize from MINIMAL pragma of class Bits

Alan Zimmerman (＠alanz)