From 95dfdceb8b4dcc54a366949577d9ee389bad5bc3 Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Tue, 24 May 2016 09:22:04 -0400 Subject: Remove 'deriving Typeable' statements Summary: Deriving `Typeable` has been a no-op since GHC 7.10, and now that we require 7.10+ to build GHC, we can remove all the redundant `deriving Typeable` statements in GHC. Test Plan: ./validate Reviewers: goldfire, austin, hvr, bgamari Reviewed By: austin, hvr, bgamari Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D2260 --- compiler/parser/ApiAnnotation.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'compiler/parser/ApiAnnotation.hs') diff --git a/compiler/parser/ApiAnnotation.hs b/compiler/parser/ApiAnnotation.hs index 6d08b0058c..eebec547cc 100644 --- a/compiler/parser/ApiAnnotation.hs +++ b/compiler/parser/ApiAnnotation.hs @@ -278,7 +278,7 @@ data AnnKeywordId | AnnRarrowtail -- ^ '>>-' | AnnRarrowtailU -- ^ '>>-', unicode variant | AnnEofPos - deriving (Eq, Ord, Data, Typeable, Show) + deriving (Eq, Ord, Data, Show) instance Outputable AnnKeywordId where ppr x = text (show x) @@ -294,7 +294,7 @@ data AnnotationComment = | AnnDocOptions String -- ^ doc options (prune, ignore-exports, etc) | AnnLineComment String -- ^ comment starting by "--" | AnnBlockComment String -- ^ comment in {- -} - deriving (Eq, Ord, Data, Typeable, Show) + deriving (Eq, Ord, Data, Show) -- Note: these are based on the Token versions, but the Token type is -- defined in Lexer.x and bringing it in here would create a loop @@ -314,7 +314,7 @@ type LRdrName = Located RdrName -- original source representation can be reproduced in the corresponding -- 'ApiAnnotation' data IsUnicodeSyntax = UnicodeSyntax | NormalSyntax - deriving (Eq, Ord, Data, Typeable, Show) + deriving (Eq, Ord, Data, Show) -- | Convert a normal annotation into its unicode equivalent one unicodeAnn :: AnnKeywordId -> AnnKeywordId @@ -338,4 +338,4 @@ unicodeAnn ann = ann -- -- This type indicates whether the 'e' is present or not. data HasE = HasE | NoE - deriving (Eq, Ord, Data, Typeable, Show) + deriving (Eq, Ord, Data, Show) -- cgit v1.2.1