git.iko.soy/typeable/katip
on 3a8cd39 help sign in
6a146e6
swap
2 ahead, 0 behind
3 files changed+9−2
since splitsnapshots
unifiedsplit
katip-elasticsearch/src/Katip/Scribes/ElasticSearch/Internal.hs+5−1 katip/src/Katip/Core.hs+3 katip/src/Katip/Scribes/Handle.hs+1−1
katip-elasticsearch/src/Katip/Scribes/ElasticSearch/Internal.hs+5−1
@@ -38,7 +38,7 @@ import Data.Typeable as Typeable
3838import Data.UUID
3939import qualified Data.UUID.V4 as UUID4
4040#if MIN_VERSION_bloodhound(0,17,0)
41−import qualified Database.Bloodhound as V5
41+import qualified Database.Bloodhound as V5
4242#else
4343import qualified Database.V1.Bloodhound as V1
4444import qualified Database.V5.Bloodhound as V5
@@ -547,16 +547,20 @@ instance ESVersion ESV5 where
547547 type IndexName ESV5 = V5.IndexName
548548 toIndexName _ = V5.IndexName
549549 fromIndexName _ (V5.IndexName x) = x
550+#if !MIN_VERSION_bloodhound(0,17,0)
550551 type MappingName ESV5 = V5.MappingName
551552 fromMappingName _ (V5.MappingName x) = x
553+#endif
552554 type DocId ESV5 = V5.DocId
553555 toDocId _ = V5.DocId
554556 type BH ESV5 = V5.BH
555557 runBH _ = V5.runBH
556558 type TemplateName ESV5 = V5.TemplateName
557559 toTemplateName _ = V5.TemplateName
560+#if !MIN_VERSION_bloodhound(0,17,0)
558561 type TemplatePattern ESV5 = V5.TemplatePattern
559562 toTemplatePattern _ = V5.TemplatePattern
563+#endif
560564 type IndexTemplate ESV5 = V5.IndexTemplate
561565 toIndexTemplate _ = V5.IndexTemplate
562566 type IndexDocumentSettings ESV5 = V5.IndexDocumentSettings
katip/src/Katip/Core.hs+3
@@ -1037,6 +1037,7 @@ instance TH.Lift Namespace where
10371037 lift (Namespace xs) =
10381038 let xs' = map T.unpack xs
10391039 in [| Namespace (map T.pack xs') |]
1040+ liftTyped x = TH.unsafeTExpCoerce (TH.lift x)
10401041
10411042
10421043instance TH.Lift Verbosity where
@@ -1044,6 +1045,7 @@ instance TH.Lift Verbosity where
10441045 lift V1 = [| V1 |]
10451046 lift V2 = [| V2 |]
10461047 lift V3 = [| V3 |]
1048+ liftTyped x = TH.unsafeTExpCoerce (TH.lift x)
10471049
10481050
10491051instance TH.Lift Severity where
@@ -1055,6 +1057,7 @@ instance TH.Lift Severity where
10551057 lift CriticalS = [| CriticalS |]
10561058 lift AlertS = [| AlertS |]
10571059 lift EmergencyS = [| EmergencyS |]
1060+ liftTyped x = TH.unsafeTExpCoerce (TH.lift x)
10581061
10591062
10601063-- | Lift a location into an Exp.
katip/src/Katip/Scribes/Handle.hs+1−1
@@ -82,7 +82,7 @@ mkHandleScribeWithFormatter itemFormatter cs h permitF verb = do
8282 ColorIfTerminal -> hIsTerminalDevice h
8383 ColorLog b -> return b
8484 lock <- newMVar ()
85− let logger i@Item{..} = do
85+ let logger i = do
8686 bracket_ (takeMVar lock) (putMVar lock ()) $
8787 T.hPutStrLn h $ toLazyText $ itemFormatter colorize verb i
8888 return $ Scribe logger (hFlush h) permitF