git.iko.soy/typeable/katip
on master help sign in
swap
6a146e60 ahead, 2 behind
3 files changed+2−9
since splitsnapshots
unifiedsplit
katip-elasticsearch/src/Katip/Scribes/ElasticSearch/Internal.hs+1−5 katip/src/Katip/Core.hs−3 katip/src/Katip/Scribes/Handle.hs+1−1
katip-elasticsearch/src/Katip/Scribes/ElasticSearch/Internal.hs+1−5
@@ -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,20 +547,16 @@ 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)
551550 type MappingName ESV5 = V5.MappingName
552551 fromMappingName _ (V5.MappingName x) = x
553−#endif
554552 type DocId ESV5 = V5.DocId
555553 toDocId _ = V5.DocId
556554 type BH ESV5 = V5.BH
557555 runBH _ = V5.runBH
558556 type TemplateName ESV5 = V5.TemplateName
559557 toTemplateName _ = V5.TemplateName
560−#if !MIN_VERSION_bloodhound(0,17,0)
561558 type TemplatePattern ESV5 = V5.TemplatePattern
562559 toTemplatePattern _ = V5.TemplatePattern
563−#endif
564560 type IndexTemplate ESV5 = V5.IndexTemplate
565561 toIndexTemplate _ = V5.IndexTemplate
566562 type IndexDocumentSettings ESV5 = V5.IndexDocumentSettings
katip/src/Katip/Core.hs−3
@@ -1037,7 +1037,6 @@ 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)
10411040
10421041
10431042instance TH.Lift Verbosity where
@@ -1045,7 +1044,6 @@ instance TH.Lift Verbosity where
10451044 lift V1 = [| V1 |]
10461045 lift V2 = [| V2 |]
10471046 lift V3 = [| V3 |]
1048− liftTyped x = TH.unsafeTExpCoerce (TH.lift x)
10491047
10501048
10511049instance TH.Lift Severity where
@@ -1057,7 +1055,6 @@ instance TH.Lift Severity where
10571055 lift CriticalS = [| CriticalS |]
10581056 lift AlertS = [| AlertS |]
10591057 lift EmergencyS = [| EmergencyS |]
1060− liftTyped x = TH.unsafeTExpCoerce (TH.lift x)
10611058
10621059
10631060-- | 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 = do
85+ let logger i@Item{..} = do
8686 bracket_ (takeMVar lock) (putMVar lock ()) $
8787 T.hPutStrLn h $ toLazyText $ itemFormatter colorize verb i
8888 return $ Scribe logger (hFlush h) permitF