diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-04-08 09:59:46 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2022-04-08 09:59:46 -0400 |
| commit | 56254e6be108bf7d1993df269b3ae22a91903d45 (patch) | |
| tree | c6971c5eee3c884944164e6e84b23913e66cae21 /libraries/ghc-prim | |
| parent | 23ef62b3e04ad834153269980dab4aac35a1fc7e (diff) | |
| parent | af300a439fd360944cc9424b1676ef0b832922dc (diff) | |
| download | haskell-56254e6be108bf7d1993df269b3ae22a91903d45.tar.gz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'libraries/ghc-prim')
| -rw-r--r-- | libraries/ghc-prim/GHC/Types.hs | 13 | ||||
| -rw-r--r-- | libraries/ghc-prim/changelog.md | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/libraries/ghc-prim/GHC/Types.hs b/libraries/ghc-prim/GHC/Types.hs index 843da4055c..28aedb7240 100644 --- a/libraries/ghc-prim/GHC/Types.hs +++ b/libraries/ghc-prim/GHC/Types.hs @@ -22,16 +22,15 @@ ----------------------------------------------------------------------------- module GHC.Types ( - -- Data types that are built-in syntax - -- They are defined here, but not explicitly exported - -- - -- Lists: []( [], (:) ) - -- Type equality: (~)( Eq# ) - -- * Built-in types Bool(..), Char(..), Int(..), Word(..), Float(..), Double(..), Ordering(..), IO(..), + + List, -- List( [], (:) ) + -- List constructors are not exported + -- because they are built-in syntax + isTrue#, SPEC(..), Symbol, @@ -177,7 +176,7 @@ type family Any :: k where { } -- >>> ['h','e','l','l','o'] == "hello" -- True -- -data [] a = [] | a : [a] +data List a = [] | a : List a {- ********************************************************************* diff --git a/libraries/ghc-prim/changelog.md b/libraries/ghc-prim/changelog.md index 0485c633af..45701629a4 100644 --- a/libraries/ghc-prim/changelog.md +++ b/libraries/ghc-prim/changelog.md @@ -75,7 +75,7 @@ `unsafeThawSmallArray#`, `copySmallArray#`, `copySmallMutableArray#`, `cloneSmallArray#`, `cloneSmallMutableArray#`, `freezeSmallArray#`, `thawSmallArray#`, `casSmallArray#`, - - `newMutVar#`,`readMutVar#`,`writeMutV#`,`casMutVar#`, + - `newMutVar#`, `readMutVar#`, `writeMutVar#`,`casMutVar#`, - operations on `MVar#` and `TVar#`: |