Remove all deriving (Typeable). It is done by default

Author: fendor

ghcide/src/Development/IDE/Core/RuleTypes.hs

@@ -84,7 +84,7 @@ type instance RuleResult GetKnownTargets = KnownTargets
 type instance RuleResult GenerateCore = ModGuts
 
 data GenerateCore = GenerateCore
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 instance Hashable GenerateCore
 instance NFData   GenerateCore
 
@@ -104,12 +104,12 @@ instance NFData LinkableResult where
     rnf = rwhnf
 
 data GetLinkable = GetLinkable
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 instance Hashable GetLinkable
 instance NFData   GetLinkable
 
 data GetImportMap = GetImportMap
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 instance Hashable GetImportMap
 instance NFData   GetImportMap
 
@@ -335,13 +335,13 @@ instance Hashable GetFileContents
 instance NFData   GetFileContents
 
 data GetFileExists = GetFileExists
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 
 instance NFData   GetFileExists
 instance Hashable GetFileExists
 
 data GetFileHash = GetFileHash
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 
 instance NFData   GetFileHash
 instance Hashable GetFileHash
@@ -350,15 +350,15 @@ data FileOfInterestStatus
   = OnDisk
   | Modified { firstOpen :: !Bool -- ^ was this file just opened
              }
-  deriving (Eq, Show, Typeable, Generic)
+  deriving (Eq, Show, Generic)
 instance Hashable FileOfInterestStatus
 instance NFData   FileOfInterestStatus
 
 instance Pretty FileOfInterestStatus where
     pretty = viaShow
 
 data IsFileOfInterestResult = NotFOI | IsFOI FileOfInterestStatus
-  deriving (Eq, Show, Typeable, Generic)
+  deriving (Eq, Show, Generic)
 instance Hashable IsFileOfInterestResult
 instance NFData   IsFileOfInterestResult
 
@@ -390,60 +390,60 @@ type instance RuleResult GetModSummary = ModSummaryResult
 type instance RuleResult GetModSummaryWithoutTimestamps = ModSummaryResult
 
 data GetParsedModule = GetParsedModule
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 instance Hashable GetParsedModule
 instance NFData   GetParsedModule
 
 data GetParsedModuleWithComments = GetParsedModuleWithComments
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 instance Hashable GetParsedModuleWithComments
 instance NFData   GetParsedModuleWithComments
 
 data GetLocatedImports = GetLocatedImports
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 instance Hashable GetLocatedImports
 instance NFData   GetLocatedImports
 
 -- | Does this module need to be compiled?
 type instance RuleResult NeedsCompilation = Maybe LinkableType
 
 data NeedsCompilation = NeedsCompilation
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 instance Hashable NeedsCompilation
 instance NFData   NeedsCompilation
 
 data GetModuleGraph = GetModuleGraph
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 instance Hashable GetModuleGraph
 instance NFData   GetModuleGraph
 
 data ReportImportCycles = ReportImportCycles
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 instance Hashable ReportImportCycles
 instance NFData   ReportImportCycles
 
 data TypeCheck = TypeCheck
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 instance Hashable TypeCheck
 instance NFData   TypeCheck
 
 data GetDocMap = GetDocMap
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 instance Hashable GetDocMap
 instance NFData   GetDocMap
 
 data GetHieAst = GetHieAst
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 instance Hashable GetHieAst
 instance NFData   GetHieAst
 
 data GetBindings = GetBindings
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 instance Hashable GetBindings
 instance NFData   GetBindings
 
 data GhcSession = GhcSession
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 instance Hashable GhcSession
 instance NFData   GhcSession
 
@@ -452,7 +452,7 @@ newtype GhcSessionDeps = GhcSessionDeps_
         -- Required for interactive evaluation, but leads to more cache invalidations
         fullModSummary :: Bool
     }
-    deriving newtype (Eq, Typeable, Hashable, NFData)
+    deriving newtype (Eq, Hashable, NFData)
 
 instance Show GhcSessionDeps where
     show (GhcSessionDeps_ False) = "GhcSessionDeps"
@@ -462,45 +462,45 @@ pattern GhcSessionDeps :: GhcSessionDeps
 pattern GhcSessionDeps = GhcSessionDeps_ False
 
 data GetModIfaceFromDisk = GetModIfaceFromDisk
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 instance Hashable GetModIfaceFromDisk
 instance NFData   GetModIfaceFromDisk
 
 data GetModIfaceFromDiskAndIndex = GetModIfaceFromDiskAndIndex
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 instance Hashable GetModIfaceFromDiskAndIndex
 instance NFData   GetModIfaceFromDiskAndIndex
 
 data GetModIface = GetModIface
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 instance Hashable GetModIface
 instance NFData   GetModIface
 
 data IsFileOfInterest = IsFileOfInterest
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 instance Hashable IsFileOfInterest
 instance NFData   IsFileOfInterest
 
 data GetModSummaryWithoutTimestamps = GetModSummaryWithoutTimestamps
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 instance Hashable GetModSummaryWithoutTimestamps
 instance NFData   GetModSummaryWithoutTimestamps
 
 data GetModSummary = GetModSummary
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 instance Hashable GetModSummary
 instance NFData   GetModSummary
 
 -- See Note [Client configuration in Rules]
 -- | Get the client config stored in the ide state
 data GetClientSettings = GetClientSettings
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 instance Hashable GetClientSettings
 instance NFData   GetClientSettings
 
 type instance RuleResult GetClientSettings = Hashed (Maybe Value)
 
-data AddWatchedFile = AddWatchedFile deriving (Eq, Show, Typeable, Generic)
+data AddWatchedFile = AddWatchedFile deriving (Eq, Show, Generic)
 instance Hashable AddWatchedFile
 instance NFData   AddWatchedFile
 
@@ -520,7 +520,7 @@ data IdeGhcSession = IdeGhcSession
 instance Show IdeGhcSession where show _ = "IdeGhcSession"
 instance NFData IdeGhcSession where rnf !_ = ()
 
-data GhcSessionIO = GhcSessionIO deriving (Eq, Show, Typeable, Generic)
+data GhcSessionIO = GhcSessionIO deriving (Eq, Show, Generic)
 instance Hashable GhcSessionIO
 instance NFData   GhcSessionIO
 

ghcide/src/Development/IDE/Plugin/Completions/Types.hs

@@ -16,7 +16,6 @@ import           Data.Aeson
 import           Data.Aeson.Types
 import           Data.Hashable                (Hashable)
 import           Data.Text                    (Text)
-import           Data.Typeable                (Typeable)
 import           Development.IDE.GHC.Compat
 import           Development.IDE.Graph        (RuleResult)
 import           Development.IDE.Spans.Common ()
@@ -31,12 +30,12 @@ type instance RuleResult LocalCompletions = CachedCompletions
 type instance RuleResult NonLocalCompletions = CachedCompletions
 
 data LocalCompletions = LocalCompletions
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 instance Hashable LocalCompletions
 instance NFData   LocalCompletions
 
 data NonLocalCompletions = NonLocalCompletions
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 instance Hashable NonLocalCompletions
 instance NFData   NonLocalCompletions
 

hie-compat/src-ghc92/Compat/HieAst.hs

@@ -72,7 +72,7 @@ import qualified Data.Array as A
 import qualified Data.ByteString as BS
 import qualified Data.Map as M
 import qualified Data.Set as S
-import Data.Data                  ( Data, Typeable )
+import Data.Data                  ( Data )
 import Data.Void                  ( Void, absurd )
 import Control.Monad              ( forM_ )
 import Control.Monad.Trans.State.Strict
@@ -469,7 +469,7 @@ data PScoped a = PS (Maybe Span)
                     Scope       -- ^ use site of the pattern
                     Scope       -- ^ pattern to the right of a, not including a
                     a
-  deriving (Typeable, Data) -- Pattern Scope
+  deriving (Data) -- Pattern Scope
 
 {- Note [TyVar Scopes]
    ~~~~~~~~~~~~~~~~~~~

hls-graph/src/Control/Concurrent/STM/Stats.hs

@@ -20,7 +20,6 @@ import           Control.Monad
 import           Data.IORef
 import qualified Data.Map.Strict        as M
 import           Data.Time              (getCurrentTime)
-import           Data.Typeable          (Typeable)
 import           GHC.Conc               (unsafeIOToSTM)
 import           System.IO
 import           System.IO.Unsafe
@@ -151,7 +150,6 @@ trackSTMConf (TrackSTMConf {..}) name txm = do
 -- 'BlockedIndefinitelyOnNamedSTM', carrying the name of the transaction and
 -- thus giving more helpful error messages.
 newtype BlockedIndefinitelyOnNamedSTM = BlockedIndefinitelyOnNamedSTM String
-    deriving (Typeable)
 
 instance Show BlockedIndefinitelyOnNamedSTM where
     showsPrec _ (BlockedIndefinitelyOnNamedSTM name) =

hls-graph/src/Development/IDE/Graph/Internal/Types.hs

@@ -227,7 +227,7 @@ data GraphException = forall e. Exception e => GraphException {
     stack  :: [String], -- ^ The stack of keys that led to this exception
     inner  :: e -- ^ The underlying exception
 }
-  deriving (Typeable, Exception)
+  deriving (Exception)
 
 instance Show GraphException where
     show GraphException{..} = unlines $
@@ -249,7 +249,7 @@ instance Show Stack where
     show (Stack kk _) = "Stack: " <> intercalate " -> " (map show kk)
 
 newtype StackException = StackException Stack
-  deriving (Typeable, Show)
+  deriving (Show)
 
 instance Exception StackException where
     fromException = fromGraphException

hls-graph/test/Example.hs

@@ -38,7 +38,7 @@ ruleBool = addRule $ \Rule _old _mode -> do
 
 
 data CondRule = CondRule
-    deriving (Eq, Generic, Hashable, NFData, Show, Typeable)
+    deriving (Eq, Generic, Hashable, NFData, Show)
 type instance RuleResult CondRule = Bool
 
 
@@ -48,7 +48,7 @@ ruleCond mv = addRule $ \CondRule _old _mode -> do
     return $ RunResult ChangedRecomputeDiff "" r (return ())
 
 data BranchedRule = BranchedRule
-    deriving (Eq, Generic, Hashable, NFData, Show, Typeable)
+    deriving (Eq, Generic, Hashable, NFData, Show)
 type instance RuleResult BranchedRule = Int
 
 ruleWithCond :: Rules ()
@@ -61,7 +61,7 @@ ruleWithCond = addRule $ \BranchedRule _old _mode -> do
             return $ RunResult ChangedRecomputeDiff "" (2 :: Int) (return ())
 
 data SubBranchRule = SubBranchRule
-    deriving (Eq, Generic, Hashable, NFData, Show, Typeable)
+    deriving (Eq, Generic, Hashable, NFData, Show)
 type instance RuleResult SubBranchRule = Int
 
 ruleSubBranch :: C.MVar Int -> Rules ()
@@ -70,5 +70,5 @@ ruleSubBranch mv = addRule $ \SubBranchRule _old _mode -> do
     return $ RunResult ChangedRecomputeDiff "" r (return ())
 
 data CountRule = CountRule
-    deriving (Eq, Generic, Hashable, NFData, Show, Typeable)
+    deriving (Eq, Generic, Hashable, NFData, Show)
 type instance RuleResult CountRule = Int

plugins/hls-cabal-plugin/src/Ide/Plugin/Cabal.hs

@@ -20,11 +20,11 @@ import qualified Data.HashMap.Strict                           as HashMap
 import qualified Data.List                                     as List
 import qualified Data.List.NonEmpty                            as NE
 import qualified Data.Maybe                                    as Maybe
+import           Data.Proxy
 import qualified Data.Text                                     ()
 import qualified Data.Text                                     as T
 import qualified Data.Text.Encoding                            as Encoding
 import           Data.Text.Utf16.Rope.Mixed                    as Rope
-import           Data.Typeable
 import           Development.IDE                               as D
 import           Development.IDE.Core.FileStore                (getVersionedTextDoc)
 import           Development.IDE.Core.PluginUtils
@@ -442,14 +442,14 @@ newtype OfInterestCabalVar = OfInterestCabalVar (Var (HashMap NormalizedFilePath
 instance Shake.IsIdeGlobal OfInterestCabalVar
 
 data IsCabalFileOfInterest = IsCabalFileOfInterest
-  deriving (Eq, Show, Typeable, Generic)
+  deriving (Eq, Show, Generic)
 instance Hashable IsCabalFileOfInterest
 instance NFData IsCabalFileOfInterest
 
 type instance RuleResult IsCabalFileOfInterest = CabalFileOfInterestResult
 
 data CabalFileOfInterestResult = NotCabalFOI | IsCabalFOI FileOfInterestStatus
-  deriving (Eq, Show, Typeable, Generic)
+  deriving (Eq, Show, Generic)
 instance Hashable CabalFileOfInterestResult
 instance NFData CabalFileOfInterestResult
 

plugins/hls-cabal-plugin/src/Ide/Plugin/Cabal/Completion/Types.hs

@@ -8,7 +8,6 @@ import           Control.DeepSeq                 (NFData)
 import           Control.Lens                    ((^.))
 import           Data.Hashable
 import qualified Data.Text                       as T
-import           Data.Typeable
 import           Development.IDE                 as D
 import qualified Distribution.Fields             as Syntax
 import qualified Distribution.PackageDescription as PD
@@ -44,7 +43,7 @@ instance Pretty Log where
 type instance RuleResult ParseCabalFile = PD.GenericPackageDescription
 
 data ParseCabalFile = ParseCabalFile
-  deriving (Eq, Show, Typeable, Generic)
+  deriving (Eq, Show, Generic)
 
 instance Hashable ParseCabalFile
 
@@ -53,7 +52,7 @@ instance NFData ParseCabalFile
 type instance RuleResult ParseCabalFields = [Syntax.Field Syntax.Position]
 
 data ParseCabalFields = ParseCabalFields
-  deriving (Eq, Show, Typeable, Generic)
+  deriving (Eq, Show, Generic)
 
 instance Hashable ParseCabalFields
 
@@ -62,7 +61,7 @@ instance NFData ParseCabalFields
 type instance RuleResult ParseCabalCommonSections = [Syntax.Field Syntax.Position]
 
 data ParseCabalCommonSections = ParseCabalCommonSections
-  deriving (Eq, Show, Typeable, Generic)
+  deriving (Eq, Show, Generic)
 
 instance Hashable ParseCabalCommonSections
 

plugins/hls-code-range-plugin/src/Ide/Plugin/CodeRange/Rules.hs

@@ -29,7 +29,6 @@ import           Control.Monad.Trans.Maybe          (MaybeT (MaybeT),
                                                      maybeToExceptT)
 import           Control.Monad.Trans.Writer.CPS
 import           Data.Coerce                        (coerce)
-import           Data.Data                          (Typeable)
 import           Data.Foldable                      (traverse_)
 import           Data.Function                      (on, (&))
 import           Data.Hashable
@@ -158,7 +157,7 @@ simplify r =
     withChildrenSimplified = r { _codeRange_children = simplify <$> _codeRange_children r }
 
 data GetCodeRange = GetCodeRange
-    deriving (Eq, Show, Typeable, Generic)
+    deriving (Eq, Show, Generic)
 
 instance Hashable GetCodeRange
 instance NFData   GetCodeRange