diff options
| author | Tom Ellis <tom.ellis@microsoft.com> | 2020-05-29 16:58:19 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-06-01 06:39:55 -0400 |
| commit | 68b71c4a99ef7c009e0095823950cd12408ad7fe (patch) | |
| tree | 3be68edb5c47e45ea2efeacbe89cc422648218e4 /libraries | |
| parent | 8f2e5732b0eec2d99b821a7f622aee8b2c00739a (diff) | |
| download | haskell-68b71c4a99ef7c009e0095823950cd12408ad7fe.tar.gz | |
Rename the singleton tuple GHC.Tuple.Unit to GHC.Tuple.Solo
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/ghc-prim/GHC/Tuple.hs | 2 | ||||
| -rw-r--r-- | libraries/ghc-prim/changelog.md | 4 | ||||
| -rw-r--r-- | libraries/template-haskell/Language/Haskell/TH/Syntax.hs | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/libraries/ghc-prim/GHC/Tuple.hs b/libraries/ghc-prim/GHC/Tuple.hs index 51179167bc..aa53a023b6 100644 --- a/libraries/ghc-prim/GHC/Tuple.hs +++ b/libraries/ghc-prim/GHC/Tuple.hs @@ -29,7 +29,7 @@ data () = () -- The desugarer uses 1-tuples, -- but "()" is already used up for 0-tuples -- See Note [One-tuples] in GHC.Builtin.Types -data Unit a = Unit a +data Solo a = Solo a data (a,b) = (a,b) data (a,b,c) = (a,b,c) diff --git a/libraries/ghc-prim/changelog.md b/libraries/ghc-prim/changelog.md index ac7a138580..0973959910 100644 --- a/libraries/ghc-prim/changelog.md +++ b/libraries/ghc-prim/changelog.md @@ -1,4 +1,4 @@ -## 0.6.2 (edit as necessary) +## 0.7.0 (edit as necessary) - Shipped with GHC 8.12.1 @@ -17,6 +17,8 @@ If the folding function is known this allows for unboxing of the Char argument resulting in much faster code. +- Renamed the singleton tuple `GHC.Tuple.Unit` to `GHC.Tuple.Solo`. + ## 0.6.1 (edit as necessary) - Shipped with GHC 8.10.1 diff --git a/libraries/template-haskell/Language/Haskell/TH/Syntax.hs b/libraries/template-haskell/Language/Haskell/TH/Syntax.hs index 53d9aabb7d..6555380878 100644 --- a/libraries/template-haskell/Language/Haskell/TH/Syntax.hs +++ b/libraries/template-haskell/Language/Haskell/TH/Syntax.hs @@ -1587,7 +1587,7 @@ mk_tup_name n space boxed withParens thing | boxed = "(" ++ thing ++ ")" | otherwise = "(#" ++ thing ++ "#)" - tup_occ | n == 1 = if boxed then "Unit" else "Unit#" + tup_occ | n == 1 = if boxed then "Solo" else "Solo#" | otherwise = withParens (replicate n_commas ',') n_commas = n - 1 tup_mod = mkModName "GHC.Tuple" |