[commit: ghc] master: Make Generic (Proxy t) instance poly-kinded (fixes #10775) (a6826c5)

[git at git.haskell.org]

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

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

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

commit a6826c5d18675a783acce39352eea283e462bf8b
Author: RyanGlScott <ryan.gl.scott at gmail.com>
Date:   Sat Aug 29 12:23:31 2015 +0200

    Make Generic (Proxy t) instance poly-kinded (fixes #10775)
    
    This amounts to enabling PolyKinds in GHC.Generics. However, explicit
    kind signatures must be applied to the datatypes and typeclasses in
    GHC.Generics to ensure that the Core which TcGenGenerics generates
    is properly kinded.
    
    Several of the typeclasses in GHC.Generics could be poly-kinded, but
    this differential does not attempt to address this, since D493 already
    addresses this.
    
    Test Plan: ./validate
    
    Reviewers: hvr, austin, dreixel, bgamari
    
    Reviewed By: austin, dreixel, bgamari
    
    Subscribers: goldfire, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1166
    
    GHC Trac Issues: #10775


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

a6826c5d18675a783acce39352eea283e462bf8b
 libraries/base/GHC/Generics.hs | 39 ++++++++++++++++++++-------------------
 libraries/base/changelog.md    |  2 ++
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/libraries/base/GHC/Generics.hs b/libraries/base/GHC/Generics.hs
index 0b4ebc6..d98533b 100644
--- a/libraries/base/GHC/Generics.hs
+++ b/libraries/base/GHC/Generics.hs
@@ -7,6 +7,7 @@
 {-# LANGUAGE TypeFamilies           #-}
 {-# LANGUAGE StandaloneDeriving     #-}
 {-# LANGUAGE DeriveGeneric          #-}
+{-# LANGUAGE PolyKinds              #-}
 
 -----------------------------------------------------------------------------
 -- |
@@ -576,10 +577,10 @@ import Data.Proxy
 --------------------------------------------------------------------------------
 
 -- | Void: used for datatypes without constructors
-data V1 p
+data V1 (p :: *)
 
 -- | Unit: used for constructors without arguments
-data U1 p = U1
+data U1 (p :: *) = U1
   deriving (Eq, Ord, Read, Show, Generic)
 
 -- | Used for marking occurrences of the parameter
@@ -587,30 +588,30 @@ newtype Par1 p = Par1 { unPar1 :: p }
   deriving (Eq, Ord, Read, Show, Generic)
 
 -- | Recursive calls of kind * -> *
-newtype Rec1 f p = Rec1 { unRec1 :: f p }
+newtype Rec1 f (p :: *) = Rec1 { unRec1 :: f p }
   deriving (Eq, Ord, Read, Show, Generic)
 
 -- | Constants, additional parameters and recursion of kind *
-newtype K1 i c p = K1 { unK1 :: c }
+newtype K1 (i :: *) c (p :: *) = K1 { unK1 :: c }
   deriving (Eq, Ord, Read, Show, Generic)
 
 -- | Meta-information (constructor names, etc.)
-newtype M1 i c f p = M1 { unM1 :: f p }
+newtype M1 (i :: *) (c :: *) f (p :: *) = M1 { unM1 :: f p }
   deriving (Eq, Ord, Read, Show, Generic)
 
 -- | Sums: encode choice between constructors
 infixr 5 :+:
-data (:+:) f g p = L1 (f p) | R1 (g p)
+data (:+:) f g (p :: *) = L1 (f p) | R1 (g p)
   deriving (Eq, Ord, Read, Show, Generic)
 
 -- | Products: encode multiple arguments to constructors
 infixr 6 :*:
-data (:*:) f g p = f p :*: g p
+data (:*:) f g (p :: *) = f p :*: g p
   deriving (Eq, Ord, Read, Show, Generic)
 
 -- | Composition of functors
 infixr 7 :.:
-newtype (:.:) f g p = Comp1 { unComp1 :: f (g p) }
+newtype (:.:) f (g :: * -> *) (p :: *) = Comp1 { unComp1 :: f (g p) }
   deriving (Eq, Ord, Read, Show, Generic)
 
 -- | Tag for K1: recursion (of kind *)
@@ -643,22 +644,22 @@ type S1 = M1 S
 
 
 -- | Class for datatypes that represent datatypes
-class Datatype d where
+class Datatype (d :: *) where
   -- | The name of the datatype (unqualified)
-  datatypeName :: t d (f :: * -> *) a -> [Char]
+  datatypeName :: t d (f :: * -> *) (a :: *) -> [Char]
   -- | The fully-qualified name of the module where the type is declared
-  moduleName   :: t d (f :: * -> *) a -> [Char]
+  moduleName   :: t d (f :: * -> *) (a :: *) -> [Char]
   -- | The package name of the module where the type is declared
-  packageName :: t d (f :: * -> *) a -> [Char]
+  packageName :: t d (f :: * -> *) (a :: *) -> [Char]
   -- | Marks if the datatype is actually a newtype
-  isNewtype    :: t d (f :: * -> *) a -> Bool
+  isNewtype    :: t d (f :: * -> *) (a :: *) -> Bool
   isNewtype _ = False
 
 
 -- | Class for datatypes that represent records
-class Selector s where
+class Selector (s :: *) where
   -- | The name of the selector
-  selName :: t s (f :: * -> *) a -> [Char]
+  selName :: t s (f :: * -> *) (a :: *) -> [Char]
 
 -- | Used for constructor fields without a name
 data NoSelector
@@ -666,16 +667,16 @@ data NoSelector
 instance Selector NoSelector where selName _ = ""
 
 -- | Class for datatypes that represent data constructors
-class Constructor c where
+class Constructor (c :: *) where
   -- | The name of the constructor
-  conName :: t c (f :: * -> *) a -> [Char]
+  conName :: t c (f :: * -> *) (a :: *) -> [Char]
 
   -- | The fixity of the constructor
-  conFixity :: t c (f :: * -> *) a -> Fixity
+  conFixity :: t c (f :: * -> *) (a :: *) -> Fixity
   conFixity _ = Prefix
 
   -- | Marks if this constructor is a record
-  conIsRecord :: t c (f :: * -> *) a -> Bool
+  conIsRecord :: t c (f :: * -> *) (a :: *) -> Bool
   conIsRecord _ = False
 
 
diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md
index 9ceef87..51a1de9 100644
--- a/libraries/base/changelog.md
+++ b/libraries/base/changelog.md
@@ -56,6 +56,8 @@
   * Made `PatternMatchFail`, `RecSelError`, `RecConError`, `RecUpdError`,
     `NoMethodError`, and `AssertionFailed` newtypes (#10738)
 
+  * The `Generic` instance for `Proxy` is now poly-kinded (#10775)
+
 ## 4.8.1.0  *Jul 2015*
 
   * Bundled with GHC 7.10.2