BinderDavid pushed to branch wip/clc-proposal-442 at Glasgow Haskell Compiler / GHC Commits: 8801a723 by David Binder at 2026-09-23T13:42:21+01:00 Update expected error message in testcase T25180 The testcase T25180 checks for the error messages when the file is compiled with the options: '-fdefer-type-errors -fno-max-valid-hole-fits' - - - - - 240fa032 by David Binder at 2026-09-23T14:00:21+01:00 Fix expected output in testsuite of haddock - - - - - e2b8ee4b by David Binder at 2026-09-23T14:17:20+01:00 Add entry to changelog.d - - - - - 4 changed files: - + changelog.d/clc-442 - testsuite/tests/typecheck/should_compile/T25180.stderr - utils/haddock/html-test/ref/Bug923.html - utils/haddock/html-test/ref/Instances.html Changes: ===================================== changelog.d/clc-442 ===================================== @@ -0,0 +1,8 @@ +section: base +mrs: !16718 +synopsis: + Expose `data Unit` and `data TupleN` from `Data.Tuple` in `base` +description: + The data types `data Unit` and `data TupleN` (for N from 2 to 64) are now exported from + `Data.Tuple` in the `base` library instead of `Data.Tuple.Experimental` in `ghc-experimental`. + See `CLC proposal 442 <https://github.com/haskell/core-libraries-committee/issues/442>`_. ===================================== testsuite/tests/typecheck/should_compile/T25180.stderr ===================================== @@ -5,6 +5,9 @@ T25180.hs:12:8: warning: [GHC-88464] [-Wtyped-holes (in -Wdefault)] Valid hole fits include tup0 :: () (bound at T25180.hs:12:1) () :: () (bound at <wired into compiler>) + () :: () + (imported from ‘Data.Tuple’ at T25180.hs:6:1-17 + (and originally defined in ‘GHC.Internal.Tuple’)) mempty :: forall a. Monoid a => a with mempty @() (imported from ‘Prelude’ @@ -60,6 +63,10 @@ T25180.hs:26:8: warning: [GHC-88464] [-Wtyped-holes (in -Wdefault)] (,) :: forall a b. a -> b -> (a, b) with (,) @a @b (bound at <wired into compiler>) + (,) :: forall a b. a -> b -> (a, b) + with (,) @a @b + (imported from ‘Data.Tuple’ at T25180.hs:6:1-17 + (and originally defined in ‘GHC.Internal.Tuple’)) T25180.hs:33:8: warning: [GHC-88464] [-Wtyped-holes (in -Wdefault)] • Found hole: _ :: a -> b -> c -> (a, b, c) @@ -75,6 +82,10 @@ T25180.hs:33:8: warning: [GHC-88464] [-Wtyped-holes (in -Wdefault)] (,,) :: forall a b c. a -> b -> c -> (a, b, c) with (,,) @a @b @c (bound at <wired into compiler>) + (,,) :: forall a b c. a -> b -> c -> (a, b, c) + with (,,) @a @b @c + (imported from ‘Data.Tuple’ at T25180.hs:6:1-17 + (and originally defined in ‘GHC.Internal.Tuple’)) T25180.hs:38:11: warning: [GHC-88464] [-Wtyped-holes (in -Wdefault)] • Found hole: _ :: (# #) ===================================== utils/haddock/html-test/ref/Bug923.html ===================================== @@ -76,7 +76,9 @@ >forall</span > a. a -> <a href="#" title="Bug923" >T</a - > ('(,) a :: <a href="#" title="Data.Kind" + > ('<a href="#" title="Data.Tuple" + >(,)</a + > a :: <a href="#" title="Data.Kind" >Type</a > -> (<a href="#" title="Data.Kind" >Type</a @@ -126,7 +128,9 @@ >forall</span > a. a -> <a href="#" title="Bug923" >T</a - > ('(,) a :: <a href="#" title="Data.Kind" + > ('<a href="#" title="Data.Tuple" + >(,)</a + > a :: <a href="#" title="Data.Kind" >Type</a > -> (<a href="#" title="Data.Kind" >Type</a @@ -156,7 +160,9 @@ >Eq</a > (<a href="#" title="Bug923" >T</a - > ('(,) a :: <a href="#" title="Data.Kind" + > ('<a href="#" title="Data.Tuple" + >(,)</a + > a :: <a href="#" title="Data.Kind" >Type</a > -> (<a href="#" title="Data.Kind" >Type</a @@ -188,7 +194,9 @@ >(==)</a > :: <a href="#" title="Bug923" >T</a - > ('(,) a :: <a href="#" title="Data.Kind" + > ('<a href="#" title="Data.Tuple" + >(,)</a + > a :: <a href="#" title="Data.Kind" >Type</a > -> (<a href="#" title="Data.Kind" >Type</a @@ -196,7 +204,9 @@ >Type</a >)) -> <a href="#" title="Bug923" >T</a - > ('(,) a :: <a href="#" title="Data.Kind" + > ('<a href="#" title="Data.Tuple" + >(,)</a + > a :: <a href="#" title="Data.Kind" >Type</a > -> (<a href="#" title="Data.Kind" >Type</a @@ -212,7 +222,9 @@ >(/=)</a > :: <a href="#" title="Bug923" >T</a - > ('(,) a :: <a href="#" title="Data.Kind" + > ('<a href="#" title="Data.Tuple" + >(,)</a + > a :: <a href="#" title="Data.Kind" >Type</a > -> (<a href="#" title="Data.Kind" >Type</a @@ -220,7 +232,9 @@ >Type</a >)) -> <a href="#" title="Bug923" >T</a - > ('(,) a :: <a href="#" title="Data.Kind" + > ('<a href="#" title="Data.Tuple" + >(,)</a + > a :: <a href="#" title="Data.Kind" >Type</a > -> (<a href="#" title="Data.Kind" >Type</a ===================================== utils/haddock/html-test/ref/Instances.html ===================================== @@ -450,7 +450,9 @@ >)</span > => <a href="#" title="Instances" >Foo</a - > ((,) (f a))</span + > (<a href="#" title="Data.Tuple" + >(,)</a + > (f a))</span > <a href="#" class="selflink" >#</a ></td @@ -560,7 +562,9 @@ ></span > <a href="#" title="Instances" >Foo</a - > ((,,) a a)</span + > (<a href="#" title="Data.Tuple" + >(,,)</a + > a a)</span > <a href="#" class="selflink" >#</a ></td @@ -1164,9 +1168,13 @@ ></span > <a href="#" title="Instances" >Foo</a - > ((,,) a b) => <a href="#" title="Instances" + > (<a href="#" title="Data.Tuple" + >(,,)</a + > a b) => <a href="#" title="Instances" >Bar</a - > ((,,) a b) (a, b, a)</span + > (<a href="#" title="Data.Tuple" + >(,,)</a + > a b) (a, b, a)</span > <a href="#" class="selflink" >#</a ></td View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0957bd7e5c7bb455716cd646725ab53... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0957bd7e5c7bb455716cd646725ab53... 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