diff options
author | Ryan Scott <ryan.gl.scott@gmail.com> | 2016-11-17 09:58:19 -0500 |
---|---|---|
committer | Ryan Scott <ryan.gl.scott@gmail.com> | 2016-11-17 09:58:19 -0500 |
commit | 18eb57be98cecb657febdb4d1dc45b44eff11818 (patch) | |
tree | 1859f567081b1eba1719cd18ae83b16dce52e38d /libraries | |
parent | 07e40e905357db805e6dbb557b35d6bdf76eaec6 (diff) | |
download | haskell-18eb57be98cecb657febdb4d1dc45b44eff11818.tar.gz |
Revert "Add Data instance for Const"
This reverts commit 07e40e905357db805e6dbb557b35d6bdf76eaec6.
This was meant for a local branch, but accidentally wound up in master. Oops.
Diffstat (limited to 'libraries')
-rw-r--r-- | libraries/base/Data/Data.hs | 4 | ||||
-rw-r--r-- | libraries/base/changelog.md | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/libraries/base/Data/Data.hs b/libraries/base/Data/Data.hs index e43ec74e3f..df37ab1a1a 100644 --- a/libraries/base/Data/Data.hs +++ b/libraries/base/Data/Data.hs @@ -9,7 +9,6 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE Trustworthy #-} -{-# LANGUAGE TypeInType #-} {-# LANGUAGE TypeOperators #-} ----------------------------------------------------------------------------- @@ -1198,9 +1197,6 @@ deriving instance (Coercible a b, Data a, Data b) => Data (Coercion a b) -- | @since 4.9.0.0 deriving instance Data a => Data (Identity a) --- | @since 4.10.0.0 -deriving instance (Typeable k, Data a, Typeable (b :: k)) => Data (Const a b) - -- | @since 4.7.0.0 deriving instance Data Version diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md index dcc171979f..a01c878a53 100644 --- a/libraries/base/changelog.md +++ b/libraries/base/changelog.md @@ -26,8 +26,6 @@ * Add `Semigroup` instance for `IO`, as well as for `Event` and `Lifetime` from `GHC.Event` (#12464) - * Add `Data` instance for `Const` (#12438) - ## 4.9.0.0 *May 2016* * Bundled with GHC 8.0 |