Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 607b287b by Wolfgang Jeltsch at 2026-01-28T15:41:53+02:00 Remove `GHC.Desugar` from `base` `GHC.Desugar` was deprecated and should have been removed in GHC 9.14. However, the removal was forgotten, although there was a code block that was intended to trigger a compilation error when the GHC version in use was 9.14 or later. This code sadly didn’t work, because the `__GLASGOW_HASKELL__` macro was misspelled as `__GLASGOW_HASKELL`. - - - - - 6 changed files: - libraries/base/base.cabal.in - − libraries/base/src/GHC/Desugar.hs - 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/interface-stability/base-exports.stdout-ws-32 Changes: ===================================== libraries/base/base.cabal.in ===================================== @@ -161,7 +161,6 @@ Library , GHC.Conc.Sync , GHC.ConsoleHandler , GHC.Constants - , GHC.Desugar , GHC.Encoding.UTF8 , GHC.Enum , GHC.Environment ===================================== libraries/base/src/GHC/Desugar.hs deleted ===================================== @@ -1,33 +0,0 @@ -{-# LANGUAGE CPP #-} -{-# LANGUAGE Safe #-} -{-# OPTIONS_HADDOCK not-home #-} - ------------------------------------------------------------------------------ --- | --- --- Module : GHC.Desugar --- Copyright : (c) The University of Glasgow, 2007 --- License : see libraries/base/LICENSE --- --- Maintainer : ghc-devs@haskell.org --- Stability : deprecated (https://github.com/haskell/core-libraries-committee/issues/216) --- Portability : non-portable (GHC extensions) --- --- Support code for desugaring in GHC --- --- /The API of this module is unstable and not meant to be consumed by the general public./ --- If you absolutely must depend on it, make sure to use a tight upper --- bound, e.g., @base < 4.X@ rather than @base < 5@, because the interface can --- change rapidly without much warning. --- ------------------------------------------------------------------------------ - -#if __GLASGOW_HASKELL >= 914 -#error "GHC.Desugar should be removed in GHC 9.14" -#endif - -module GHC.Desugar - {-# DEPRECATED ["GHC.Desugar is deprecated and will be removed in GHC 9.14.", "(>>>) should be imported from Control.Arrow.", "AnnotationWrapper is internal to GHC and should not be used externally."] #-} - ((>>>), AnnotationWrapper(..), toAnnotationWrapper) where - -import GHC.Internal.Desugar ===================================== testsuite/tests/interface-stability/base-exports.stdout ===================================== @@ -5212,13 +5212,6 @@ module GHC.ConsoleHandler where module GHC.Constants where -- Safety: None -module GHC.Desugar where - -- Safety: Safe - (>>>) :: forall (arr :: * -> * -> *) a b c. GHC.Internal.Control.Arrow.Arrow arr => arr a b -> arr b c -> arr a c - type AnnotationWrapper :: * - data AnnotationWrapper = forall a. GHC.Internal.Data.Data.Data a => AnnotationWrapper a - toAnnotationWrapper :: forall a. GHC.Internal.Data.Data.Data a => a -> AnnotationWrapper - module GHC.Encoding.UTF8 where -- Safety: None utf8CompareByteArray# :: GHC.Internal.Prim.ByteArray# -> GHC.Internal.Prim.ByteArray# -> GHC.Internal.Types.Ordering ===================================== testsuite/tests/interface-stability/base-exports.stdout-javascript-unknown-ghcjs ===================================== @@ -5212,13 +5212,6 @@ module GHC.ConsoleHandler where module GHC.Constants where -- Safety: None -module GHC.Desugar where - -- Safety: Safe - (>>>) :: forall (arr :: * -> * -> *) a b c. GHC.Internal.Control.Arrow.Arrow arr => arr a b -> arr b c -> arr a c - type AnnotationWrapper :: * - data AnnotationWrapper = forall a. GHC.Internal.Data.Data.Data a => AnnotationWrapper a - toAnnotationWrapper :: forall a. GHC.Internal.Data.Data.Data a => a -> AnnotationWrapper - module GHC.Encoding.UTF8 where -- Safety: None utf8CompareByteArray# :: GHC.Internal.Prim.ByteArray# -> GHC.Internal.Prim.ByteArray# -> GHC.Internal.Types.Ordering ===================================== testsuite/tests/interface-stability/base-exports.stdout-mingw32 ===================================== @@ -5257,13 +5257,6 @@ module GHC.ConsoleHandler where module GHC.Constants where -- Safety: None -module GHC.Desugar where - -- Safety: Safe - (>>>) :: forall (arr :: * -> * -> *) a b c. GHC.Internal.Control.Arrow.Arrow arr => arr a b -> arr b c -> arr a c - type AnnotationWrapper :: * - data AnnotationWrapper = forall a. GHC.Internal.Data.Data.Data a => AnnotationWrapper a - toAnnotationWrapper :: forall a. GHC.Internal.Data.Data.Data a => a -> AnnotationWrapper - module GHC.Encoding.UTF8 where -- Safety: None utf8CompareByteArray# :: GHC.Internal.Prim.ByteArray# -> GHC.Internal.Prim.ByteArray# -> GHC.Internal.Types.Ordering ===================================== testsuite/tests/interface-stability/base-exports.stdout-ws-32 ===================================== @@ -5212,13 +5212,6 @@ module GHC.ConsoleHandler where module GHC.Constants where -- Safety: None -module GHC.Desugar where - -- Safety: Safe - (>>>) :: forall (arr :: * -> * -> *) a b c. GHC.Internal.Control.Arrow.Arrow arr => arr a b -> arr b c -> arr a c - type AnnotationWrapper :: * - data AnnotationWrapper = forall a. GHC.Internal.Data.Data.Data a => AnnotationWrapper a - toAnnotationWrapper :: forall a. GHC.Internal.Data.Data.Data a => a -> AnnotationWrapper - module GHC.Encoding.UTF8 where -- Safety: None utf8CompareByteArray# :: GHC.Internal.Prim.ByteArray# -> GHC.Internal.Prim.ByteArray# -> GHC.Internal.Types.Ordering View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/607b287bf80b8a8b32b6cf55d6a21a13... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/607b287bf80b8a8b32b6cf55d6a21a13... You're receiving this email because of your account on gitlab.haskell.org.