[commit: ghc] master: Revert "Add Data instance for Const" (18eb57b)

git at git.haskell.org git at git.haskell.org
Thu Nov 17 15:01:55 UTC 2016


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/18eb57be98cecb657febdb4d1dc45b44eff11818/ghc

>---------------------------------------------------------------

commit 18eb57be98cecb657febdb4d1dc45b44eff11818
Author: Ryan Scott <ryan.gl.scott at gmail.com>
Date:   Thu Nov 17 09:58:19 2016 -0500

    Revert "Add Data instance for Const"
    
    This reverts commit 07e40e905357db805e6dbb557b35d6bdf76eaec6.
    
    This was meant for a local branch, but accidentally wound up in master. Oops.


>---------------------------------------------------------------

18eb57be98cecb657febdb4d1dc45b44eff11818
 libraries/base/Data/Data.hs | 4 ----
 libraries/base/changelog.md | 2 --
 2 files changed, 6 deletions(-)

diff --git a/libraries/base/Data/Data.hs b/libraries/base/Data/Data.hs
index e43ec74..df37ab1 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 dcc1719..a01c878 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



More information about the ghc-commits mailing list