From 462de25cbe169e576e4425931ba94f1e0b114495 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 1 Feb 2018 21:01:29 +0200 Subject: [PATCH] Warnings cleanup --- persistent-test/src/PersistentTest.hs | 1 - persistent/Database/Persist/Class/PersistEntity.hs | 14 ++++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/persistent-test/src/PersistentTest.hs b/persistent-test/src/PersistentTest.hs index 5e2a406f6..5f04ad69a 100644 --- a/persistent-test/src/PersistentTest.hs +++ b/persistent-test/src/PersistentTest.hs @@ -35,7 +35,6 @@ import Database.Persist.MongoDB (toInsertDoc, docToEntityThrow, collectionName, import Database.Persist.TH (mkDeleteCascade, mkSave) import qualified Data.Text as T -import qualified Control.Exception as E # ifdef WITH_POSTGRESQL import Data.List (sort) diff --git a/persistent/Database/Persist/Class/PersistEntity.hs b/persistent/Database/Persist/Class/PersistEntity.hs index 9c077ec03..cabe6ccae 100644 --- a/persistent/Database/Persist/Class/PersistEntity.hs +++ b/persistent/Database/Persist/Class/PersistEntity.hs @@ -175,15 +175,13 @@ data Filter record = forall typ. PersistField typ => Filter data Entity record = Entity { entityKey :: Key record , entityVal :: record } + deriving Typeable -deriving instance (PersistEntity record, Generic (Key record), Generic record) => Generic (Entity record) -deriving instance (PersistEntity record, Eq (Key record), Eq record) => Eq (Entity record) -deriving instance (PersistEntity record, Ord (Key record), Ord record) => Ord (Entity record) -deriving instance (PersistEntity record, Show (Key record), Show record) => Show (Entity record) -deriving instance (PersistEntity record, Read (Key record), Read record) => Read (Entity record) -#if MIN_VERSION_base(4,7,0) -deriving instance Typeable Entity -#endif +deriving instance (Generic (Key record), Generic record) => Generic (Entity record) +deriving instance (Eq (Key record), Eq record) => Eq (Entity record) +deriving instance (Ord (Key record), Ord record) => Ord (Entity record) +deriving instance (Show (Key record), Show record) => Show (Entity record) +deriving instance (Read (Key record), Read record) => Read (Entity record) -- | Get list of values corresponding to given entity. entityValues :: PersistEntity record => Entity record -> [PersistValue]