Teo Camarasu pushed to branch wip/T26865 at Glasgow Haskell Compiler / GHC Commits: 7a308655 by Teo Camarasu at 2026-02-17T21:16:24+00:00 ghc-internal: Move GHC.Internal.Data.Bool to base This is a tiny module that only defines bool :: Bool -> a -> a -> a. We can just move this to base and delete it from ghc-internal. If we want this functionality there we can just use a case statement or if-then expression. Resolves 26865 - - - - - 29 changed files: - libraries/base/src/Data/Bool.hs - libraries/base/src/Data/List.hs - libraries/base/src/Data/List/NubOrdSet.hs - libraries/ghc-internal/ghc-internal.cabal.in - − libraries/ghc-internal/src/GHC/Internal/Data/Bool.hs - libraries/ghc-internal/src/GHC/Internal/Data/Foldable.hs - libraries/ghc-internal/src/GHC/Internal/Data/Function.hs - libraries/ghc-internal/src/GHC/Internal/Data/Type/Bool.hs - libraries/ghc-internal/src/GHC/Internal/Data/Type/Ord.hs - libraries/ghc-internal/src/GHC/Internal/Data/Version.hs - libraries/ghc-internal/src/GHC/Internal/IO/FD.hs - libraries/ghc-internal/src/GHC/Internal/JS/Prim.hs - libraries/ghc-internal/src/GHC/Internal/System/IO/OS.hs - libraries/ghc-internal/src/GHC/Internal/TH/Lift.hs - libraries/ghc-internal/src/GHC/Internal/TypeError.hs - utils/haddock/html-test/ref/A.html - utils/haddock/html-test/ref/Bug1004.html - utils/haddock/html-test/ref/Bug1033.html - utils/haddock/html-test/ref/Bug1103.html - utils/haddock/html-test/ref/Bug548.html - utils/haddock/html-test/ref/Bug923.html - utils/haddock/html-test/ref/ConstructorPatternExport.html - utils/haddock/html-test/ref/FunArgs.html - utils/haddock/html-test/ref/Instances.html - utils/haddock/html-test/ref/LinearTypes.html - utils/haddock/html-test/ref/RedactTypeSynonyms.html - utils/haddock/html-test/ref/T23616.html - utils/haddock/html-test/ref/Test.html - utils/haddock/html-test/ref/TypeFamilies3.html Changes: ===================================== libraries/base/src/Data/Bool.hs ===================================== @@ -24,4 +24,39 @@ module Data.Bool bool ) where -import GHC.Internal.Data.Bool \ No newline at end of file +import Prelude (Bool(..), (&&), (||), not, otherwise) + +-- $setup +-- >>> import Prelude + +-- | Case analysis for the 'Bool' type. @'bool' f t p@ evaluates to @f@ +-- when @p@ is 'False', and evaluates to @t@ when @p@ is 'True'. +-- +-- This is equivalent to @if p then t else f@; that is, one can +-- think of it as an if-then-else construct with its arguments +-- reordered. +-- +-- @since base-4.7.0.0 +-- +-- ==== __Examples__ +-- +-- Basic usage: +-- +-- >>> bool "foo" "bar" True +-- "bar" +-- >>> bool "foo" "bar" False +-- "foo" +-- +-- Confirm that @'bool' f t p@ and @if p then t else f@ are +-- equivalent: +-- +-- >>> let p = True; f = "bar"; t = "foo" +-- >>> bool f t p == if p then t else f +-- True +-- >>> let p = False +-- >>> bool f t p == if p then t else f +-- True +-- +bool :: a -> a -> Bool -> a +bool f _ False = f +bool _ t True = t ===================================== libraries/base/src/Data/List.hs ===================================== @@ -184,7 +184,7 @@ module Data.List genericReplicate ) where -import GHC.Internal.Data.Bool (otherwise) +import Data.Bool (otherwise) import GHC.Internal.Data.Function (const) import GHC.Internal.Data.List import GHC.Internal.Data.List.NonEmpty (NonEmpty(..)) ===================================== libraries/base/src/Data/List/NubOrdSet.hs ===================================== @@ -11,7 +11,7 @@ module Data.List.NubOrdSet ( insert, ) where -import GHC.Internal.Data.Bool (Bool(..)) +import Data.Bool (Bool(..)) import GHC.Internal.Data.Function ((.)) import GHC.Internal.Data.Ord (Ordering(..)) ===================================== libraries/ghc-internal/ghc-internal.cabal.in ===================================== @@ -140,7 +140,6 @@ Library GHC.Internal.Control.Monad.ST.Imp GHC.Internal.Control.Monad.ST.Lazy.Imp GHC.Internal.Data.Bits - GHC.Internal.Data.Bool GHC.Internal.Data.Coerce GHC.Internal.Data.Data GHC.Internal.Data.Dynamic ===================================== libraries/ghc-internal/src/GHC/Internal/Data/Bool.hs deleted ===================================== @@ -1,64 +0,0 @@ -{-# LANGUAGE Trustworthy #-} -{-# LANGUAGE NoImplicitPrelude #-} - ------------------------------------------------------------------------------ --- | --- Module : GHC.Internal.Data.Bool --- Copyright : (c) The University of Glasgow 2001 --- License : BSD-style (see the file libraries/base/LICENSE) --- --- Maintainer : libraries@haskell.org --- Stability : stable --- Portability : portable --- --- The 'Bool' type and related functions. --- ------------------------------------------------------------------------------ - -module GHC.Internal.Data.Bool ( - -- * Booleans - Bool(..), - -- ** Operations - (&&), - (||), - not, - otherwise, - bool, - ) where - -import GHC.Internal.Base - --- $setup --- >>> import Prelude - --- | Case analysis for the 'Bool' type. @'bool' f t p@ evaluates to @f@ --- when @p@ is 'False', and evaluates to @t@ when @p@ is 'True'. --- --- This is equivalent to @if p then t else f@; that is, one can --- think of it as an if-then-else construct with its arguments --- reordered. --- --- @since base-4.7.0.0 --- --- ==== __Examples__ --- --- Basic usage: --- --- >>> bool "foo" "bar" True --- "bar" --- >>> bool "foo" "bar" False --- "foo" --- --- Confirm that @'bool' f t p@ and @if p then t else f@ are --- equivalent: --- --- >>> let p = True; f = "bar"; t = "foo" --- >>> bool f t p == if p then t else f --- True --- >>> let p = False --- >>> bool f t p == if p then t else f --- True --- -bool :: a -> a -> Bool -> a -bool f _ False = f -bool _ t True = t ===================================== libraries/ghc-internal/src/GHC/Internal/Data/Foldable.hs ===================================== @@ -50,7 +50,6 @@ module GHC.Internal.Data.Foldable ( find ) where -import GHC.Internal.Data.Bool import GHC.Internal.Data.Either import GHC.Internal.Data.Eq import GHC.Internal.Data.Functor.Utils (Max(..), Min(..), (#.)) ===================================== libraries/ghc-internal/src/GHC/Internal/Data/Function.hs ===================================== @@ -30,8 +30,7 @@ module GHC.Internal.Data.Function , applyWhen ) where -import GHC.Internal.Base ( TYPE, ($), (.), id, const, flip ) -import GHC.Internal.Data.Bool ( Bool(..) ) +import GHC.Internal.Base ( TYPE, Bool(..), ($), (.), id, const, flip ) infixl 0 `on` infixl 1 & @@ -171,7 +170,7 @@ x & f = f x -- | 'applyWhen' applies a function to a value if a condition is true, -- otherwise, it returns the value unchanged. -- --- It is equivalent to @'flip' ('GHC.Internal.Data.Bool.bool' 'id')@. +-- It is equivalent to @'flip' ('Data.Bool.bool' 'id')@. -- -- ==== __Examples__ -- ===================================== libraries/ghc-internal/src/GHC/Internal/Data/Type/Bool.hs ===================================== @@ -1,7 +1,7 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE PolyKinds #-} -{-# LANGUAGE Safe #-} +{-# LANGUAGE Trustworthy #-} {-# LANGUAGE TypeFamilyDependencies #-} {-# LANGUAGE TypeOperators #-} @@ -23,7 +23,7 @@ module GHC.Internal.Data.Type.Bool ( If, type (&&), type (||), Not ) where -import GHC.Internal.Data.Bool +import GHC.Internal.Base -- This needs to be in base because (&&) is used in Data.Type.Equality. -- The other functions do not need to be in base, but seemed to be appropriate ===================================== libraries/ghc-internal/src/GHC/Internal/Data/Type/Ord.hs ===================================== @@ -34,14 +34,11 @@ module GHC.Internal.Data.Type.Ord ( , OrdCond ) where -import GHC.Internal.Show(Show(..)) +import GHC.Internal.Base +import GHC.Internal.Show (Show(..)) import GHC.Internal.TypeError import GHC.Internal.TypeLits.Internal import GHC.Internal.TypeNats.Internal -import GHC.Internal.Types (type (~), Char) -import GHC.Internal.Data.Bool -import GHC.Internal.Data.Eq -import GHC.Internal.Data.Ord -- | 'Compare' branches on the kind of its arguments to either compare by -- 'Symbol' or 'Nat'. ===================================== libraries/ghc-internal/src/GHC/Internal/Data/Version.hs ===================================== @@ -37,13 +37,12 @@ module GHC.Internal.Data.Version ( ) where import GHC.Internal.Data.Functor ( Functor(..) ) -import GHC.Internal.Data.Bool ( (&&) ) import GHC.Internal.Data.Eq import GHC.Internal.Int ( Int ) import GHC.Internal.Data.List ( map, sort, concat, concatMap, intersperse, (++) ) import GHC.Internal.Data.Ord import GHC.Internal.Data.String ( String ) -import GHC.Internal.Base ( Applicative(..) ) +import GHC.Internal.Base ( Applicative(..), (&&) ) import GHC.Internal.Generics import GHC.Internal.Unicode ( isDigit, isAlphaNum ) import GHC.Internal.Read ===================================== libraries/ghc-internal/src/GHC/Internal/IO/FD.hs ===================================== @@ -49,7 +49,6 @@ import GHC.Internal.Conc.IO import GHC.Internal.IO.Exception #if defined(mingw32_HOST_OS) import GHC.Internal.Windows -import GHC.Internal.Data.Bool import GHC.Internal.IO.SubSystem ((<!>)) import GHC.Internal.Foreign.Storable #endif @@ -717,7 +716,7 @@ asyncReadRawBufferPtr loc !fd !buf !off !len = do if l == (-1) then let sock_errno = c_maperrno_func (fromIntegral rc) non_sock_errno = Errno (fromIntegral rc) - errno = bool non_sock_errno sock_errno (fdIsSocket fd) + errno = if fdIsSocket fd then sock_errno else non_sock_errno in ioError (errnoToIOError loc errno Nothing Nothing) else return (fromIntegral l) @@ -728,7 +727,7 @@ asyncWriteRawBufferPtr loc !fd !buf !off !len = do if l == (-1) then let sock_errno = c_maperrno_func (fromIntegral rc) non_sock_errno = Errno (fromIntegral rc) - errno = bool non_sock_errno sock_errno (fdIsSocket fd) + errno = if fdIsSocket fd then sock_errno else non_sock_errno in ioError (errnoToIOError loc errno Nothing Nothing) else return (fromIntegral l) @@ -740,7 +739,7 @@ blockingReadRawBufferPtr loc !fd !buf !off !len let start_ptr = buf `plusPtr` off recv_ret = c_safe_recv (fdFD fd) start_ptr (fromIntegral len) 0 read_ret = c_safe_read (fdFD fd) start_ptr (fromIntegral len) - r <- bool read_ret recv_ret (fdIsSocket fd) + r <- if fdIsSocket fd then recv_ret else read_ret when ((fdIsSocket fd) && (r == -1)) c_maperrno return r -- We trust read() to give us the correct errno but recv(), as a @@ -753,7 +752,7 @@ blockingWriteRawBufferPtr loc !fd !buf !off !len let start_ptr = buf `plusPtr` off send_ret = c_safe_send (fdFD fd) start_ptr (fromIntegral len) 0 write_ret = c_safe_write (fdFD fd) start_ptr (fromIntegral len) - r <- bool write_ret send_ret (fdIsSocket fd) + r <- if fdIsSocket fd then send_ret else write_ret when (r == -1) c_maperrno return r -- We don't trust write() to give us the correct errno, and ===================================== libraries/ghc-internal/src/GHC/Internal/JS/Prim.hs ===================================== @@ -46,7 +46,6 @@ import GHC.Internal.Types import qualified GHC.Internal.Exception as Ex import qualified GHC.Internal.CString as GHC import GHC.Internal.IO -import GHC.Internal.Data.Bool import GHC.Internal.Base import GHC.Internal.Show ===================================== libraries/ghc-internal/src/GHC/Internal/System/IO/OS.hs ===================================== @@ -1,4 +1,4 @@ -{-# LANGUAGE Safe #-} +{-# LANGUAGE Trustworthy #-} {-# LANGUAGE CPP #-} {-# LANGUAGE RankNTypes #-} @@ -23,14 +23,12 @@ module GHC.Internal.System.IO.OS ) where +import GHC.Internal.Base import GHC.Internal.Control.Monad (return) import GHC.Internal.Control.Concurrent.MVar (MVar) import GHC.Internal.Control.Exception (mask) import GHC.Internal.Data.Function (const, (.), ($)) import GHC.Internal.Data.Functor (fmap) -#if defined(mingw32_HOST_OS) -import GHC.Internal.Data.Bool (otherwise) -#endif import GHC.Internal.Data.Maybe (Maybe (Nothing), maybe) #if defined(mingw32_HOST_OS) import GHC.Internal.Data.Maybe (Maybe (Just)) ===================================== libraries/ghc-internal/src/GHC/Internal/TH/Lift.hs ===================================== @@ -34,7 +34,6 @@ import GHC.Internal.TH.Monad import qualified GHC.Internal.TH.Lib as Lib (litE) -- See wrinkle (W4) of Note [Tracking dependencies on primitives] import GHC.Internal.Data.Either -import GHC.Internal.Data.Bool import GHC.Internal.Base hiding (NonEmpty(..), Type, Module, inline) import GHC.Internal.Data.NonEmpty (NonEmpty(..)) import GHC.Internal.Integer ===================================== libraries/ghc-internal/src/GHC/Internal/TypeError.hs ===================================== @@ -31,8 +31,7 @@ module GHC.Internal.TypeError , Unsatisfiable, unsatisfiable ) where -import GHC.Internal.Data.Bool -import GHC.Internal.Types (TYPE, Constraint, Symbol) +import GHC.Internal.Types (TYPE, Bool(True), Constraint, Symbol) {- Note [Custom type errors] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ===================================== utils/haddock/html-test/ref/A.html ===================================== @@ -70,7 +70,7 @@ ><li class="src short" ><a href="#" >test2</a - > :: <a href="#" title="Data.Bool" + > :: <a href="#" title="GHC.Exts" >Bool</a ></li ><li class="src short" @@ -131,7 +131,7 @@ ><p class="src" ><a id="v:test2" class="def" >test2</a - > :: <a href="#" title="Data.Bool" + > :: <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a ===================================== utils/haddock/html-test/ref/Bug1004.html ===================================== @@ -210,7 +210,7 @@ >D1</a > ('<a href="#" title="GHC.Generics" >MetaData</a - > "Product" "Data.Functor.Product" "base" '<a href="#" title="Data.Bool" + > "Product" "Data.Functor.Product" "base" '<a href="#" title="GHC.Exts" >False</a >) (<a href="#" title="GHC.Generics" >C1</a @@ -218,7 +218,7 @@ >MetaCons</a > "Pair" '<a href="#" title="GHC.Generics" >PrefixI</a - > '<a href="#" title="Data.Bool" + > '<a href="#" title="GHC.Exts" >False</a >) (<a href="#" title="GHC.Generics" >S1</a @@ -505,13 +505,13 @@ ><p class="src" ><a href="#" >liftEq</a - > :: (a -> b -> <a href="#" title="Data.Bool" + > :: (a -> b -> <a href="#" title="GHC.Exts" >Bool</a >) -> <a href="#" title="Bug1004" >Product</a > f g a -> <a href="#" title="Bug1004" >Product</a - > f g b -> <a href="#" title="Data.Bool" + > f g b -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a @@ -1553,7 +1553,7 @@ >null</a > :: <a href="#" title="Bug1004" >Product</a - > f g a -> <a href="#" title="Data.Bool" + > f g a -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a @@ -1575,7 +1575,7 @@ >Eq</a > a => a -> <a href="#" title="Bug1004" >Product</a - > f g a -> <a href="#" title="Data.Bool" + > f g a -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a @@ -1983,7 +1983,7 @@ >Product</a > f g a -> <a href="#" title="Bug1004" >Product</a - > f g a -> <a href="#" title="Data.Bool" + > f g a -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a @@ -1995,7 +1995,7 @@ >Product</a > f g a -> <a href="#" title="Bug1004" >Product</a - > f g a -> <a href="#" title="Data.Bool" + > f g a -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a @@ -2065,7 +2065,7 @@ >Product</a > f g a -> <a href="#" title="Bug1004" >Product</a - > f g a -> <a href="#" title="Data.Bool" + > f g a -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a @@ -2077,7 +2077,7 @@ >Product</a > f g a -> <a href="#" title="Bug1004" >Product</a - > f g a -> <a href="#" title="Data.Bool" + > f g a -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a @@ -2089,7 +2089,7 @@ >Product</a > f g a -> <a href="#" title="Bug1004" >Product</a - > f g a -> <a href="#" title="Data.Bool" + > f g a -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a @@ -2101,7 +2101,7 @@ >Product</a > f g a -> <a href="#" title="Bug1004" >Product</a - > f g a -> <a href="#" title="Data.Bool" + > f g a -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a @@ -2471,7 +2471,7 @@ >D1</a > ('<a href="#" title="GHC.Generics" >MetaData</a - > "Product" "Data.Functor.Product" "base" '<a href="#" title="Data.Bool" + > "Product" "Data.Functor.Product" "base" '<a href="#" title="GHC.Exts" >False</a >) (<a href="#" title="GHC.Generics" >C1</a @@ -2479,7 +2479,7 @@ >MetaCons</a > "Pair" '<a href="#" title="GHC.Generics" >PrefixI</a - > '<a href="#" title="Data.Bool" + > '<a href="#" title="GHC.Exts" >False</a >) (<a href="#" title="GHC.Generics" >S1</a @@ -2768,7 +2768,7 @@ >D1</a > ('<a href="#" title="GHC.Generics" >MetaData</a - > "Product" "Data.Functor.Product" "base" '<a href="#" title="Data.Bool" + > "Product" "Data.Functor.Product" "base" '<a href="#" title="GHC.Exts" >False</a >) (<a href="#" title="GHC.Generics" >C1</a @@ -2776,7 +2776,7 @@ >MetaCons</a > "Pair" '<a href="#" title="GHC.Generics" >PrefixI</a - > '<a href="#" title="Data.Bool" + > '<a href="#" title="GHC.Exts" >False</a >) (<a href="#" title="GHC.Generics" >S1</a @@ -2862,7 +2862,7 @@ >D1</a > ('<a href="#" title="GHC.Generics" >MetaData</a - > "Product" "Data.Functor.Product" "base" '<a href="#" title="Data.Bool" + > "Product" "Data.Functor.Product" "base" '<a href="#" title="GHC.Exts" >False</a >) (<a href="#" title="GHC.Generics" >C1</a @@ -2870,7 +2870,7 @@ >MetaCons</a > "Pair" '<a href="#" title="GHC.Generics" >PrefixI</a - > '<a href="#" title="Data.Bool" + > '<a href="#" title="GHC.Exts" >False</a >) (<a href="#" title="GHC.Generics" >S1</a ===================================== utils/haddock/html-test/ref/Bug1033.html ===================================== @@ -148,7 +148,7 @@ >D1</a > ('<a href="#" title="GHC.Generics" >MetaData</a - > "Foo" "Bug1033" "main" '<a href="#" title="Data.Bool" + > "Foo" "Bug1033" "main" '<a href="#" title="GHC.Exts" >False</a >) (<a href="#" title="GHC.Generics" >C1</a @@ -156,7 +156,7 @@ >MetaCons</a > "Foo" '<a href="#" title="GHC.Generics" >PrefixI</a - > '<a href="#" title="Data.Bool" + > '<a href="#" title="GHC.Exts" >False</a >) (<a href="#" title="GHC.Generics" >U1</a @@ -241,7 +241,7 @@ >D1</a > ('<a href="#" title="GHC.Generics" >MetaData</a - > "Foo" "Bug1033" "main" '<a href="#" title="Data.Bool" + > "Foo" "Bug1033" "main" '<a href="#" title="GHC.Exts" >False</a >) (<a href="#" title="GHC.Generics" >C1</a @@ -249,7 +249,7 @@ >MetaCons</a > "Foo" '<a href="#" title="GHC.Generics" >PrefixI</a - > '<a href="#" title="Data.Bool" + > '<a href="#" title="GHC.Exts" >False</a >) (<a href="#" title="GHC.Generics" >U1</a ===================================== utils/haddock/html-test/ref/Bug1103.html ===================================== @@ -80,7 +80,7 @@ >data</span > <a href="#" title="Bug1103" >Foo1</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a ></span > <a href="#" class="selflink" @@ -103,7 +103,7 @@ >data</span > <a href="#" title="Bug1103" >Foo1</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a > = <a id="v:Foo1Bool" class="def" >Foo1Bool</a @@ -218,7 +218,7 @@ >data</span > <a href="#" title="Bug1103" >Foo2</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a ></span > <a href="#" class="selflink" @@ -241,7 +241,7 @@ >data</span > <a href="#" title="Bug1103" >Foo2</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a > = <a id="v:Foo2Bool" class="def" >Foo2Bool</a @@ -476,7 +476,7 @@ >data</span > <a href="#" title="Bug1103" >Foo3</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a ></span > <a href="#" class="selflink" @@ -499,7 +499,7 @@ >data</span > <a href="#" title="Bug1103" >Foo3</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a > = <a id="v:Foo3Bool" class="def" >Foo3Bool</a ===================================== utils/haddock/html-test/ref/Bug548.html ===================================== @@ -186,7 +186,7 @@ >D1</a > ('<a href="#" title="GHC.Generics" >MetaData</a - > "WrappedArrow" "Control.Applicative" "base" '<a href="#" title="Data.Bool" + > "WrappedArrow" "Control.Applicative" "base" '<a href="#" title="GHC.Exts" >True</a >) (<a href="#" title="GHC.Generics" >C1</a @@ -194,7 +194,7 @@ >MetaCons</a > "WrapArrow" '<a href="#" title="GHC.Generics" >PrefixI</a - > '<a href="#" title="Data.Bool" + > '<a href="#" title="GHC.Exts" >True</a >) (<a href="#" title="GHC.Generics" >S1</a @@ -814,7 +814,7 @@ >D1</a > ('<a href="#" title="GHC.Generics" >MetaData</a - > "WrappedArrow" "Control.Applicative" "base" '<a href="#" title="Data.Bool" + > "WrappedArrow" "Control.Applicative" "base" '<a href="#" title="GHC.Exts" >True</a >) (<a href="#" title="GHC.Generics" >C1</a @@ -822,7 +822,7 @@ >MetaCons</a > "WrapArrow" '<a href="#" title="GHC.Generics" >PrefixI</a - > '<a href="#" title="Data.Bool" + > '<a href="#" title="GHC.Exts" >True</a >) (<a href="#" title="GHC.Generics" >S1</a @@ -925,7 +925,7 @@ >D1</a > ('<a href="#" title="GHC.Generics" >MetaData</a - > "WrappedArrow" "Control.Applicative" "base" '<a href="#" title="Data.Bool" + > "WrappedArrow" "Control.Applicative" "base" '<a href="#" title="GHC.Exts" >True</a >) (<a href="#" title="GHC.Generics" >C1</a @@ -933,7 +933,7 @@ >MetaCons</a > "WrapArrow" '<a href="#" title="GHC.Generics" >PrefixI</a - > '<a href="#" title="Data.Bool" + > '<a href="#" title="GHC.Exts" >True</a >) (<a href="#" title="GHC.Generics" >S1</a @@ -995,7 +995,7 @@ >D1</a > ('<a href="#" title="GHC.Generics" >MetaData</a - > "WrappedArrow" "Control.Applicative" "base" '<a href="#" title="Data.Bool" + > "WrappedArrow" "Control.Applicative" "base" '<a href="#" title="GHC.Exts" >True</a >) (<a href="#" title="GHC.Generics" >C1</a @@ -1003,7 +1003,7 @@ >MetaCons</a > "WrapArrow" '<a href="#" title="GHC.Generics" >PrefixI</a - > '<a href="#" title="Data.Bool" + > '<a href="#" title="GHC.Exts" >True</a >) (<a href="#" title="GHC.Generics" >S1</a ===================================== utils/haddock/html-test/ref/Bug923.html ===================================== @@ -202,7 +202,7 @@ >Type</a >, <a href="#" title="Data.Kind" >Type</a - >)) -> <a href="#" title="Data.Bool" + >)) -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a @@ -226,7 +226,7 @@ >Type</a >, <a href="#" title="Data.Kind" >Type</a - >)) -> <a href="#" title="Data.Bool" + >)) -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a ===================================== utils/haddock/html-test/ref/ConstructorPatternExport.html ===================================== @@ -69,7 +69,7 @@ >pattern</span > <a id="v:MyRecCons" class="def" >MyRecCons</a - > :: <a href="#" title="Data.Bool" + > :: <a href="#" title="GHC.Exts" >Bool</a > -> <a href="#" title="Data.Int" >Int</a ===================================== utils/haddock/html-test/ref/FunArgs.html ===================================== @@ -90,7 +90,7 @@ ></tr ><tr ><td class="src" - >-> <a href="#" title="Data.Bool" + >-> <a href="#" title="GHC.Exts" >Bool</a ></td ><td class="doc" ===================================== utils/haddock/html-test/ref/Instances.html ===================================== @@ -682,7 +682,7 @@ ><p class="src" ><a id="v:bar" class="def" >bar</a - > :: f a -> f <a href="#" title="Data.Bool" + > :: f a -> f <a href="#" title="GHC.Exts" >Bool</a > -> a <a href="#" class="selflink" >#</a @@ -722,7 +722,7 @@ >Bar</a > <a href="#" title="Data.Maybe" >Maybe</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a ></span > <a href="#" class="selflink" @@ -748,13 +748,13 @@ >bar</a > :: <a href="#" title="Data.Maybe" >Maybe</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a > -> <a href="#" title="Data.Maybe" >Maybe</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a - > -> <a href="#" title="Data.Bool" + > -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a @@ -766,7 +766,7 @@ >Maybe</a > (<a href="#" title="Data.Maybe" >Maybe</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a >) -> <a href="#" title="Data.Maybe" >Maybe</a @@ -782,11 +782,11 @@ >bar0</a > :: (<a href="#" title="Data.Maybe" >Maybe</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a >, <a href="#" title="Data.Maybe" >Maybe</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a >) -> (<a href="#" title="Data.Maybe" >Maybe</a @@ -800,11 +800,11 @@ >bar1</a > :: (<a href="#" title="Data.Maybe" >Maybe</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a >, <a href="#" title="Data.Maybe" >Maybe</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a >) -> (<a href="#" title="Data.Maybe" >Maybe</a @@ -852,7 +852,7 @@ >Maybe</a > [a] -> <a href="#" title="Data.Maybe" >Maybe</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a > -> [a] <a href="#" class="selflink" >#</a @@ -936,7 +936,7 @@ ><p class="src" ><a href="#" >bar</a - > :: [(a, a)] -> [<a href="#" title="Data.Bool" + > :: [(a, a)] -> [<a href="#" title="GHC.Exts" >Bool</a >] -> (a, a) <a href="#" class="selflink" >#</a @@ -1000,7 +1000,7 @@ >Either</a > a (f a) -> <a href="#" title="Data.Either" >Either</a - > a <a href="#" title="Data.Bool" + > a <a href="#" title="GHC.Exts" >Bool</a > -> f a <a href="#" class="selflink" >#</a @@ -1092,7 +1092,7 @@ >Quux</a > a b c) -> <a href="#" title="Instances" >Quux</a - > a c <a href="#" title="Data.Bool" + > a c <a href="#" title="GHC.Exts" >Bool</a > -> <a href="#" title="Instances" >Quux</a @@ -1188,7 +1188,7 @@ ><p class="src" ><a href="#" >bar</a - > :: (a, b, (a, b, a)) -> (a, b, <a href="#" title="Data.Bool" + > :: (a, b, (a, b, a)) -> (a, b, <a href="#" title="GHC.Exts" >Bool</a >) -> (a, b, a) <a href="#" class="selflink" >#</a @@ -1754,7 +1754,7 @@ >Quux</a > a b c) -> <a href="#" title="Instances" >Quux</a - > a c <a href="#" title="Data.Bool" + > a c <a href="#" title="GHC.Exts" >Bool</a > -> <a href="#" title="Instances" >Quux</a @@ -2020,7 +2020,7 @@ >Norf</a > <a href="#" title="Data.Int" >Int</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a ></span > <a href="#" class="selflink" @@ -2053,7 +2053,7 @@ >Plugh</a > <a href="#" title="Data.Int" >Int</a - > (a, b) <a href="#" title="Data.Bool" + > (a, b) <a href="#" title="GHC.Exts" >Bool</a ></span ></td @@ -2076,7 +2076,7 @@ >Plugh</a > <a href="#" title="Data.Int" >Int</a - > (a, b) <a href="#" title="Data.Bool" + > (a, b) <a href="#" title="GHC.Exts" >Bool</a > = (a, [b])</div ></details @@ -2093,7 +2093,7 @@ >Plugh</a > <a href="#" title="Data.Int" >Int</a - > [a] <a href="#" title="Data.Bool" + > [a] <a href="#" title="GHC.Exts" >Bool</a ></span ></td @@ -2116,7 +2116,7 @@ >Plugh</a > <a href="#" title="Data.Int" >Int</a - > [a] <a href="#" title="Data.Bool" + > [a] <a href="#" title="GHC.Exts" >Bool</a > = a</div ></details @@ -2156,7 +2156,7 @@ >Int</a > [a] = <a id="v:Thuuuud" class="def" >Thuuuud</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a ></div ></details @@ -2228,13 +2228,13 @@ >Plugh</a > <a href="#" title="Data.Int" >Int</a - > c <a href="#" title="Data.Bool" + > c <a href="#" title="GHC.Exts" >Bool</a > -> <a href="#" title="Data.Int" >Int</a > -> (<a href="#" title="Data.Int" >Int</a - > -> c) -> <a href="#" title="Data.Bool" + > -> c) -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a ===================================== utils/haddock/html-test/ref/LinearTypes.html ===================================== @@ -98,7 +98,7 @@ ><li ><a href="#" >noC</a - > :: <a href="#" title="Data.Bool" + > :: <a href="#" title="GHC.Exts" >Bool</a ></li ></ul @@ -236,7 +236,7 @@ ><dfn class="src" ><a id="v:noC" class="def" >noC</a - > :: <a href="#" title="Data.Bool" + > :: <a href="#" title="GHC.Exts" >Bool</a ></dfn ><div class="doc empty" @@ -324,7 +324,7 @@ ><dfn class="src" > , <a id="v:noG" class="def" >noG</a - > :: <a href="#" title="Data.Bool" + > :: <a href="#" title="GHC.Exts" >Bool</a ></dfn ><div class="doc empty" ===================================== utils/haddock/html-test/ref/RedactTypeSynonyms.html ===================================== @@ -90,7 +90,7 @@ ><li class="src short" ><a href="#" >exportedFn</a - > :: <a href="#" title="Data.Bool" + > :: <a href="#" title="GHC.Exts" >Bool</a > -> AlsoHidden</li ></ul @@ -188,7 +188,7 @@ ><p class="src" ><a id="v:exportedFn" class="def" >exportedFn</a - > :: <a href="#" title="Data.Bool" + > :: <a href="#" title="GHC.Exts" >Bool</a > -> AlsoHidden <a href="#" class="selflink" >#</a ===================================== utils/haddock/html-test/ref/T23616.html ===================================== @@ -51,7 +51,7 @@ >null</a > :: <a href="#" title="Data.Foldable" >Foldable</a - > t => t a -> <a href="#" title="Data.Bool" + > t => t a -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a ===================================== utils/haddock/html-test/ref/Test.html ===================================== @@ -427,9 +427,9 @@ >Int</a > -> <a href="#" title="Test" >T3</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a > -> <a href="#" title="Test" >T4</a @@ -649,9 +649,9 @@ >Int</a > -> (<a href="#" title="Test" >T3</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a > -> <a href="#" title="Test" >T4</a @@ -1450,9 +1450,9 @@ >Int</a > -> <a href="#" title="Test" >T3</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a > -> <a href="#" title="Test" >T4</a @@ -2235,9 +2235,9 @@ is at the beginning of the line).</pre ><td class="src" >-> (<a href="#" title="Test" >T3</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a > -> <a href="#" title="Test" >T4</a ===================================== utils/haddock/html-test/ref/TypeFamilies3.html ===================================== @@ -351,7 +351,7 @@ >Int</a > = <a id="v:Baz2" class="def" >Baz2</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a ></div ></details View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7a308655096be1418291b9e5e0674185... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7a308655096be1418291b9e5e0674185... You're receiving this email because of your account on gitlab.haskell.org.