Skip to content

Commit 0fe8b22

Browse files
committed
Allow IOG's contra-tracer
1 parent 55d828a commit 0fe8b22

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

lsm-tree.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ library
613613
, bytestring ^>=0.11.4.0 || ^>=0.12.1.0
614614
, cborg ^>=0.2.10.0
615615
, containers ^>=0.6 || ^>=0.7
616-
, contra-tracer ^>=0.2
616+
, contra-tracer ^>=0.1 || ^>=0.2
617617
, crc32c ^>=0.2.1
618618
, deepseq ^>=1.4 || ^>=1.5
619619
, filepath

src/Database/LSMTree/Internal/Unsafe.hs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,12 +315,19 @@ data TableTrace =
315315
#endif
316316
deriving stock Show
317317

318-
contramapTraceMerge :: Monad m => Tracer m TableTrace -> Tracer m (AtLevel MergeTrace)
318+
contramapTraceMerge :: forall m. Monad m => Tracer m TableTrace -> Tracer m (AtLevel MergeTrace)
319+
#if MIN_VERSION_contra_tracer(0,2,0)
319320
#ifdef DEBUG_TRACES
320321
contramapTraceMerge t = TraceMerge `contramap` t
321322
#else
322323
contramapTraceMerge t = traceMaybe (const Nothing) t
323324
#endif
325+
#else
326+
contramapTraceMerge _t = nullTracer
327+
where
328+
-- See #766
329+
_unused = pure @m ()
330+
#endif
324331

325332
-- | Trace messages related to cursors.
326333
data CursorTrace =

0 commit comments

Comments
 (0)