Skip to content

Commit 6a0c95a

Browse files
fendorfendor
committed
Remove all deriving (Typeable). It is done by default
1 parent 951b749 commit 6a0c95a

File tree

19 files changed

+56
-66
lines changed

19 files changed

+56
-66
lines changed

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

+28-28
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ type instance RuleResult GetKnownTargets = KnownTargets
8383
type instance RuleResult GenerateCore = ModGuts
8484

8585
data GenerateCore = GenerateCore
86-
deriving (Eq, Show, Typeable, Generic)
86+
deriving (Eq, Show, Generic)
8787
instance Hashable GenerateCore
8888
instance NFData GenerateCore
8989

@@ -103,12 +103,12 @@ instance NFData LinkableResult where
103103
rnf = rwhnf
104104

105105
data GetLinkable = GetLinkable
106-
deriving (Eq, Show, Typeable, Generic)
106+
deriving (Eq, Show, Generic)
107107
instance Hashable GetLinkable
108108
instance NFData GetLinkable
109109

110110
data GetImportMap = GetImportMap
111-
deriving (Eq, Show, Typeable, Generic)
111+
deriving (Eq, Show, Generic)
112112
instance Hashable GetImportMap
113113
instance NFData GetImportMap
114114

@@ -334,13 +334,13 @@ instance Hashable GetFileContents
334334
instance NFData GetFileContents
335335

336336
data GetFileExists = GetFileExists
337-
deriving (Eq, Show, Typeable, Generic)
337+
deriving (Eq, Show, Generic)
338338

339339
instance NFData GetFileExists
340340
instance Hashable GetFileExists
341341

342342
data GetFileHash = GetFileHash
343-
deriving (Eq, Show, Typeable, Generic)
343+
deriving (Eq, Show, Generic)
344344

345345
instance NFData GetFileHash
346346
instance Hashable GetFileHash
@@ -349,15 +349,15 @@ data FileOfInterestStatus
349349
= OnDisk
350350
| Modified { firstOpen :: !Bool -- ^ was this file just opened
351351
}
352-
deriving (Eq, Show, Typeable, Generic)
352+
deriving (Eq, Show, Generic)
353353
instance Hashable FileOfInterestStatus
354354
instance NFData FileOfInterestStatus
355355

356356
instance Pretty FileOfInterestStatus where
357357
pretty = viaShow
358358

359359
data IsFileOfInterestResult = NotFOI | IsFOI FileOfInterestStatus
360-
deriving (Eq, Show, Typeable, Generic)
360+
deriving (Eq, Show, Generic)
361361
instance Hashable IsFileOfInterestResult
362362
instance NFData IsFileOfInterestResult
363363

@@ -389,60 +389,60 @@ type instance RuleResult GetModSummary = ModSummaryResult
389389
type instance RuleResult GetModSummaryWithoutTimestamps = ModSummaryResult
390390

391391
data GetParsedModule = GetParsedModule
392-
deriving (Eq, Show, Typeable, Generic)
392+
deriving (Eq, Show, Generic)
393393
instance Hashable GetParsedModule
394394
instance NFData GetParsedModule
395395

396396
data GetParsedModuleWithComments = GetParsedModuleWithComments
397-
deriving (Eq, Show, Typeable, Generic)
397+
deriving (Eq, Show, Generic)
398398
instance Hashable GetParsedModuleWithComments
399399
instance NFData GetParsedModuleWithComments
400400

401401
data GetLocatedImports = GetLocatedImports
402-
deriving (Eq, Show, Typeable, Generic)
402+
deriving (Eq, Show, Generic)
403403
instance Hashable GetLocatedImports
404404
instance NFData GetLocatedImports
405405

406406
-- | Does this module need to be compiled?
407407
type instance RuleResult NeedsCompilation = Maybe LinkableType
408408

409409
data NeedsCompilation = NeedsCompilation
410-
deriving (Eq, Show, Typeable, Generic)
410+
deriving (Eq, Show, Generic)
411411
instance Hashable NeedsCompilation
412412
instance NFData NeedsCompilation
413413

414414
data GetModuleGraph = GetModuleGraph
415-
deriving (Eq, Show, Typeable, Generic)
415+
deriving (Eq, Show, Generic)
416416
instance Hashable GetModuleGraph
417417
instance NFData GetModuleGraph
418418

419419
data ReportImportCycles = ReportImportCycles
420-
deriving (Eq, Show, Typeable, Generic)
420+
deriving (Eq, Show, Generic)
421421
instance Hashable ReportImportCycles
422422
instance NFData ReportImportCycles
423423

424424
data TypeCheck = TypeCheck
425-
deriving (Eq, Show, Typeable, Generic)
425+
deriving (Eq, Show, Generic)
426426
instance Hashable TypeCheck
427427
instance NFData TypeCheck
428428

429429
data GetDocMap = GetDocMap
430-
deriving (Eq, Show, Typeable, Generic)
430+
deriving (Eq, Show, Generic)
431431
instance Hashable GetDocMap
432432
instance NFData GetDocMap
433433

434434
data GetHieAst = GetHieAst
435-
deriving (Eq, Show, Typeable, Generic)
435+
deriving (Eq, Show, Generic)
436436
instance Hashable GetHieAst
437437
instance NFData GetHieAst
438438

439439
data GetBindings = GetBindings
440-
deriving (Eq, Show, Typeable, Generic)
440+
deriving (Eq, Show, Generic)
441441
instance Hashable GetBindings
442442
instance NFData GetBindings
443443

444444
data GhcSession = GhcSession
445-
deriving (Eq, Show, Typeable, Generic)
445+
deriving (Eq, Show, Generic)
446446
instance Hashable GhcSession
447447
instance NFData GhcSession
448448

@@ -451,7 +451,7 @@ newtype GhcSessionDeps = GhcSessionDeps_
451451
-- Required for interactive evaluation, but leads to more cache invalidations
452452
fullModSummary :: Bool
453453
}
454-
deriving newtype (Eq, Typeable, Hashable, NFData)
454+
deriving newtype (Eq, Hashable, NFData)
455455

456456
instance Show GhcSessionDeps where
457457
show (GhcSessionDeps_ False) = "GhcSessionDeps"
@@ -461,45 +461,45 @@ pattern GhcSessionDeps :: GhcSessionDeps
461461
pattern GhcSessionDeps = GhcSessionDeps_ False
462462

463463
data GetModIfaceFromDisk = GetModIfaceFromDisk
464-
deriving (Eq, Show, Typeable, Generic)
464+
deriving (Eq, Show, Generic)
465465
instance Hashable GetModIfaceFromDisk
466466
instance NFData GetModIfaceFromDisk
467467

468468
data GetModIfaceFromDiskAndIndex = GetModIfaceFromDiskAndIndex
469-
deriving (Eq, Show, Typeable, Generic)
469+
deriving (Eq, Show, Generic)
470470
instance Hashable GetModIfaceFromDiskAndIndex
471471
instance NFData GetModIfaceFromDiskAndIndex
472472

473473
data GetModIface = GetModIface
474-
deriving (Eq, Show, Typeable, Generic)
474+
deriving (Eq, Show, Generic)
475475
instance Hashable GetModIface
476476
instance NFData GetModIface
477477

478478
data IsFileOfInterest = IsFileOfInterest
479-
deriving (Eq, Show, Typeable, Generic)
479+
deriving (Eq, Show, Generic)
480480
instance Hashable IsFileOfInterest
481481
instance NFData IsFileOfInterest
482482

483483
data GetModSummaryWithoutTimestamps = GetModSummaryWithoutTimestamps
484-
deriving (Eq, Show, Typeable, Generic)
484+
deriving (Eq, Show, Generic)
485485
instance Hashable GetModSummaryWithoutTimestamps
486486
instance NFData GetModSummaryWithoutTimestamps
487487

488488
data GetModSummary = GetModSummary
489-
deriving (Eq, Show, Typeable, Generic)
489+
deriving (Eq, Show, Generic)
490490
instance Hashable GetModSummary
491491
instance NFData GetModSummary
492492

493493
-- See Note [Client configuration in Rules]
494494
-- | Get the client config stored in the ide state
495495
data GetClientSettings = GetClientSettings
496-
deriving (Eq, Show, Typeable, Generic)
496+
deriving (Eq, Show, Generic)
497497
instance Hashable GetClientSettings
498498
instance NFData GetClientSettings
499499

500500
type instance RuleResult GetClientSettings = Hashed (Maybe Value)
501501

502-
data AddWatchedFile = AddWatchedFile deriving (Eq, Show, Typeable, Generic)
502+
data AddWatchedFile = AddWatchedFile deriving (Eq, Show, Generic)
503503
instance Hashable AddWatchedFile
504504
instance NFData AddWatchedFile
505505

@@ -519,7 +519,7 @@ data IdeGhcSession = IdeGhcSession
519519
instance Show IdeGhcSession where show _ = "IdeGhcSession"
520520
instance NFData IdeGhcSession where rnf !_ = ()
521521

522-
data GhcSessionIO = GhcSessionIO deriving (Eq, Show, Typeable, Generic)
522+
data GhcSessionIO = GhcSessionIO deriving (Eq, Show, Generic)
523523
instance Hashable GhcSessionIO
524524
instance NFData GhcSessionIO
525525

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import Data.Aeson
1616
import Data.Aeson.Types
1717
import Data.Hashable (Hashable)
1818
import Data.Text (Text)
19-
import Data.Typeable (Typeable)
2019
import Development.IDE.GHC.Compat
2120
import Development.IDE.Graph (RuleResult)
2221
import Development.IDE.Spans.Common ()
@@ -31,12 +30,12 @@ type instance RuleResult LocalCompletions = CachedCompletions
3130
type instance RuleResult NonLocalCompletions = CachedCompletions
3231

3332
data LocalCompletions = LocalCompletions
34-
deriving (Eq, Show, Typeable, Generic)
33+
deriving (Eq, Show, Generic)
3534
instance Hashable LocalCompletions
3635
instance NFData LocalCompletions
3736

3837
data NonLocalCompletions = NonLocalCompletions
39-
deriving (Eq, Show, Typeable, Generic)
38+
deriving (Eq, Show, Generic)
4039
instance Hashable NonLocalCompletions
4140
instance NFData NonLocalCompletions
4241

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ import qualified Data.Array as A
7272
import qualified Data.ByteString as BS
7373
import qualified Data.Map as M
7474
import qualified Data.Set as S
75-
import Data.Data ( Data, Typeable )
75+
import Data.Data ( Data )
7676
import Data.Void ( Void, absurd )
7777
import Control.Monad ( forM_ )
7878
import Control.Monad.Trans.State.Strict
@@ -469,7 +469,7 @@ data PScoped a = PS (Maybe Span)
469469
Scope -- ^ use site of the pattern
470470
Scope -- ^ pattern to the right of a, not including a
471471
a
472-
deriving (Typeable, Data) -- Pattern Scope
472+
deriving (Data) -- Pattern Scope
473473

474474
{- Note [TyVar Scopes]
475475
~~~~~~~~~~~~~~~~~~~

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

-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import Control.Monad
2020
import Data.IORef
2121
import qualified Data.Map.Strict as M
2222
import Data.Time (getCurrentTime)
23-
import Data.Typeable (Typeable)
2423
import GHC.Conc (unsafeIOToSTM)
2524
import System.IO
2625
import System.IO.Unsafe
@@ -151,7 +150,6 @@ trackSTMConf (TrackSTMConf {..}) name txm = do
151150
-- 'BlockedIndefinitelyOnNamedSTM', carrying the name of the transaction and
152151
-- thus giving more helpful error messages.
153152
newtype BlockedIndefinitelyOnNamedSTM = BlockedIndefinitelyOnNamedSTM String
154-
deriving (Typeable)
155153

156154
instance Show BlockedIndefinitelyOnNamedSTM where
157155
showsPrec _ (BlockedIndefinitelyOnNamedSTM name) =

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ data GraphException = forall e. Exception e => GraphException {
227227
stack :: [String], -- ^ The stack of keys that led to this exception
228228
inner :: e -- ^ The underlying exception
229229
}
230-
deriving (Typeable, Exception)
230+
deriving (Exception)
231231

232232
instance Show GraphException where
233233
show GraphException{..} = unlines $
@@ -249,7 +249,7 @@ instance Show Stack where
249249
show (Stack kk _) = "Stack: " <> intercalate " -> " (map show kk)
250250

251251
newtype StackException = StackException Stack
252-
deriving (Typeable, Show)
252+
deriving (Show)
253253

254254
instance Exception StackException where
255255
fromException = fromGraphException

‎hls-graph/test/Example.hs

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ ruleBool = addRule $ \Rule _old _mode -> do
3838

3939

4040
data CondRule = CondRule
41-
deriving (Eq, Generic, Hashable, NFData, Show, Typeable)
41+
deriving (Eq, Generic, Hashable, NFData, Show)
4242
type instance RuleResult CondRule = Bool
4343

4444

@@ -48,7 +48,7 @@ ruleCond mv = addRule $ \CondRule _old _mode -> do
4848
return $ RunResult ChangedRecomputeDiff "" r (return ())
4949

5050
data BranchedRule = BranchedRule
51-
deriving (Eq, Generic, Hashable, NFData, Show, Typeable)
51+
deriving (Eq, Generic, Hashable, NFData, Show)
5252
type instance RuleResult BranchedRule = Int
5353

5454
ruleWithCond :: Rules ()
@@ -61,7 +61,7 @@ ruleWithCond = addRule $ \BranchedRule _old _mode -> do
6161
return $ RunResult ChangedRecomputeDiff "" (2 :: Int) (return ())
6262

6363
data SubBranchRule = SubBranchRule
64-
deriving (Eq, Generic, Hashable, NFData, Show, Typeable)
64+
deriving (Eq, Generic, Hashable, NFData, Show)
6565
type instance RuleResult SubBranchRule = Int
6666

6767
ruleSubBranch :: C.MVar Int -> Rules ()
@@ -70,5 +70,5 @@ ruleSubBranch mv = addRule $ \SubBranchRule _old _mode -> do
7070
return $ RunResult ChangedRecomputeDiff "" r (return ())
7171

7272
data CountRule = CountRule
73-
deriving (Eq, Generic, Hashable, NFData, Show, Typeable)
73+
deriving (Eq, Generic, Hashable, NFData, Show)
7474
type instance RuleResult CountRule = Int

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import qualified Data.HashMap.Strict as HashMap
2020
import qualified Data.List as List
2121
import qualified Data.List.NonEmpty as NE
2222
import qualified Data.Maybe as Maybe
23+
import Data.Proxy
2324
import qualified Data.Text ()
2425
import qualified Data.Text as T
2526
import qualified Data.Text.Encoding as Encoding
2627
import Data.Text.Utf16.Rope.Mixed as Rope
27-
import Data.Typeable
2828
import Development.IDE as D
2929
import Development.IDE.Core.FileStore (getVersionedTextDoc)
3030
import Development.IDE.Core.PluginUtils
@@ -442,14 +442,14 @@ newtype OfInterestCabalVar = OfInterestCabalVar (Var (HashMap NormalizedFilePath
442442
instance Shake.IsIdeGlobal OfInterestCabalVar
443443

444444
data IsCabalFileOfInterest = IsCabalFileOfInterest
445-
deriving (Eq, Show, Typeable, Generic)
445+
deriving (Eq, Show, Generic)
446446
instance Hashable IsCabalFileOfInterest
447447
instance NFData IsCabalFileOfInterest
448448

449449
type instance RuleResult IsCabalFileOfInterest = CabalFileOfInterestResult
450450

451451
data CabalFileOfInterestResult = NotCabalFOI | IsCabalFOI FileOfInterestStatus
452-
deriving (Eq, Show, Typeable, Generic)
452+
deriving (Eq, Show, Generic)
453453
instance Hashable CabalFileOfInterestResult
454454
instance NFData CabalFileOfInterestResult
455455

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import Control.DeepSeq (NFData)
88
import Control.Lens ((^.))
99
import Data.Hashable
1010
import qualified Data.Text as T
11-
import Data.Typeable
1211
import Development.IDE as D
1312
import qualified Distribution.Fields as Syntax
1413
import qualified Distribution.PackageDescription as PD
@@ -44,7 +43,7 @@ instance Pretty Log where
4443
type instance RuleResult ParseCabalFile = PD.GenericPackageDescription
4544

4645
data ParseCabalFile = ParseCabalFile
47-
deriving (Eq, Show, Typeable, Generic)
46+
deriving (Eq, Show, Generic)
4847

4948
instance Hashable ParseCabalFile
5049

@@ -53,7 +52,7 @@ instance NFData ParseCabalFile
5352
type instance RuleResult ParseCabalFields = [Syntax.Field Syntax.Position]
5453

5554
data ParseCabalFields = ParseCabalFields
56-
deriving (Eq, Show, Typeable, Generic)
55+
deriving (Eq, Show, Generic)
5756

5857
instance Hashable ParseCabalFields
5958

@@ -62,7 +61,7 @@ instance NFData ParseCabalFields
6261
type instance RuleResult ParseCabalCommonSections = [Syntax.Field Syntax.Position]
6362

6463
data ParseCabalCommonSections = ParseCabalCommonSections
65-
deriving (Eq, Show, Typeable, Generic)
64+
deriving (Eq, Show, Generic)
6665

6766
instance Hashable ParseCabalCommonSections
6867

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import Control.Monad.Trans.Maybe (MaybeT (MaybeT),
2929
maybeToExceptT)
3030
import Control.Monad.Trans.Writer.CPS
3131
import Data.Coerce (coerce)
32-
import Data.Data (Typeable)
3332
import Data.Foldable (traverse_)
3433
import Data.Function (on, (&))
3534
import Data.Hashable
@@ -158,7 +157,7 @@ simplify r =
158157
withChildrenSimplified = r { _codeRange_children = simplify <$> _codeRange_children r }
159158

160159
data GetCodeRange = GetCodeRange
161-
deriving (Eq, Show, Typeable, Generic)
160+
deriving (Eq, Show, Generic)
162161

163162
instance Hashable GetCodeRange
164163
instance NFData GetCodeRange

0 commit comments

Comments
 (0)