[commit: ghc] wip/ttypeable: Fix warnings (dd91807)

[git at git.haskell.org]

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

On branch  : wip/ttypeable
Link       : http://ghc.haskell.org/trac/ghc/changeset/dd9180748695f84d941472ecccaf19781dd0e6ea/ghc

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

commit dd9180748695f84d941472ecccaf19781dd0e6ea
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Mar 11 17:51:26 2016 +0100

    Fix warnings


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

dd9180748695f84d941472ecccaf19781dd0e6ea
 libraries/base/Data/Typeable/Internal.hs | 17 ++++++++++++-----
 libraries/ghc-boot/GHC/Serialized.hs     |  1 -
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/libraries/base/Data/Typeable/Internal.hs b/libraries/base/Data/Typeable/Internal.hs
index 6704154..7a3344e 100644
--- a/libraries/base/Data/Typeable/Internal.hs
+++ b/libraries/base/Data/Typeable/Internal.hs
@@ -68,7 +68,7 @@ module Data.Typeable.Internal (
 
     -- * Construction
     -- | These are for internal use only
-    mkTrCon, mkTrApp, mkTyCon,
+    mkTrCon, mkTrApp, mkTyCon, mkTyCon#,
     typeSymbolTypeRep, typeNatTypeRep,
 
     -- * Representations for primitive types
@@ -220,6 +220,7 @@ mkTrCon tc kind = TrTyCon fpr tc kind
     fpr    = fingerprintFingerprints [fpr_tc, fpr_k]
 
 -- | Construct a representation for a type application.
+-- TODO: Is this necessary?
 mkTrApp :: forall k1 k2 (a :: k1 -> k2) (b :: k1).
            TypeRep (a :: k1 -> k2)
         -> TypeRep (b :: k1)
@@ -250,7 +251,7 @@ pattern TRCon con <- TrTyCon _ con _
 
 -- | Splits a type application.
 splitApp :: TypeRep a -> Maybe (AppResult a)
-splitApp (TrTyCon _ a _) = Nothing
+splitApp (TrTyCon _ _ _) = Nothing
 splitApp (TrApp _ f x)   = Just $ App f x
 
 ----------------- Observation ---------------------
@@ -259,7 +260,9 @@ typeRepKind :: forall k (a :: k). TypeRep a -> TypeRep k
 typeRepKind (TrTyCon _ _ k) = k
 typeRepKind (TrApp _ f _) =
     case typeRepKind f of
-        TRFun arg res -> res
+        TRFun _arg res -> res
+        -- TODO: why is this case needed?
+        _  -> error "typeRepKind: impossible"
 
 -- | Observe the type constructor of a quantified type representation.
 typeRepXTyCon :: TypeRepX -> TyCon
@@ -316,13 +319,16 @@ typeRepXFingerprint (TypeRepX t) = typeRepFingerprint t
 ----------------- Showing TypeReps --------------------
 
 instance Show (TypeRep a) where
-  showsPrec p (TrTyCon _ tycon _) = shows tycon
-  showsPrec p (TrApp _ f x)       = shows f . showString " " . shows x
+  showsPrec p (TrTyCon _ tycon _) = showsPrec p tycon
+  showsPrec p (TrApp _ f x)       = showsPrec p f . showString " " . showsPrec p x
+  -- TODO: Reconsider precedence
 
 instance Show TypeRepX where
   showsPrec p (TypeRepX ty) = showsPrec p ty
 
 -- Some (Show.TypeRepX) helpers:
+{-
+-- FIXME: Handle tuples, etc.
 showArgs :: Show a => ShowS -> [a] -> ShowS
 showArgs _   []     = id
 showArgs _   [a]    = showsPrec 10 a
@@ -332,6 +338,7 @@ showTuple :: [TypeRepX] -> ShowS
 showTuple args = showChar '('
                . showArgs (showChar ',') args
                . showChar ')'
+-}
 
 -- | Helper to fully evaluate 'TypeRep' for use as @NFData(rnf)@ implementation
 --
diff --git a/libraries/ghc-boot/GHC/Serialized.hs b/libraries/ghc-boot/GHC/Serialized.hs
index 7f86df9..8653049 100644
--- a/libraries/ghc-boot/GHC/Serialized.hs
+++ b/libraries/ghc-boot/GHC/Serialized.hs
@@ -22,7 +22,6 @@ module GHC.Serialized (
 import Data.Bits
 import Data.Word        ( Word8 )
 import Data.Data
-import Data.Typeable
 
 
 -- | Represents a serialized value of a particular type. Attempts can be made to deserialize it at certain types