From c0e018289854d96f02920b568a2fc1964b9dc20b Mon Sep 17 00:00:00 2001 From: Javier Sagredo Date: Wed, 2 Jul 2025 13:48:20 +0200 Subject: [PATCH] Allow IOG's contra-tracer --- lsm-tree.cabal | 2 +- src/Database/LSMTree/Internal/Unsafe.hs | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lsm-tree.cabal b/lsm-tree.cabal index a43a8fb12..ef1823b5b 100644 --- a/lsm-tree.cabal +++ b/lsm-tree.cabal @@ -600,7 +600,7 @@ library , bytestring ^>=0.11.4.0 || ^>=0.12.1.0 , cborg ^>=0.2.10.0 , containers ^>=0.6 || ^>=0.7 - , contra-tracer ^>=0.2 + , contra-tracer ^>=0.1 || ^>=0.2 , crc32c ^>=0.2.1 , deepseq ^>=1.4 || ^>=1.5 , filepath diff --git a/src/Database/LSMTree/Internal/Unsafe.hs b/src/Database/LSMTree/Internal/Unsafe.hs index d39c7a40e..35692299d 100644 --- a/src/Database/LSMTree/Internal/Unsafe.hs +++ b/src/Database/LSMTree/Internal/Unsafe.hs @@ -317,12 +317,19 @@ data TableTrace = #endif deriving stock (Show, Eq) -contramapTraceMerge :: Monad m => Tracer m TableTrace -> Tracer m (AtLevel MergeTrace) +contramapTraceMerge :: forall m. Monad m => Tracer m TableTrace -> Tracer m (AtLevel MergeTrace) +#if MIN_VERSION_contra_tracer(0,2,0) #ifdef DEBUG_TRACES contramapTraceMerge t = TraceMerge `contramap` t #else contramapTraceMerge t = traceMaybe (const Nothing) t #endif +#else +contramapTraceMerge _t = nullTracer + where + -- See #766 + _unused = pure @m () +#endif -- | Trace messages related to cursors. data CursorTrace =