From 798fdad6608016301f7e74be73dbedeb87596d0b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 21 Jul 2020 12:58:51 -0400 Subject: [PATCH] fix build with dlist-1.0 That removed the list function. This new implementation appears to actually be more efficient anyway, since it avoids toList. --- CHANGELOG | 6 ++++++ Utility/TList.hs | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index ff72a9895..edbb3195f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +git-annex (8.20200720.2) UNRELEASED; urgency=medium + + * Support building with dlist-1.0 + + -- Joey Hess Tue, 21 Jul 2020 12:58:30 -0400 + git-annex (8.20200720.1) upstream; urgency=medium * Fix a bug in find --batch in the previous version. diff --git a/Utility/TList.hs b/Utility/TList.hs index 08def4890..2168a1c4a 100644 --- a/Utility/TList.hs +++ b/Utility/TList.hs @@ -86,7 +86,7 @@ modifyTList tlist a = do putTMVar tlist dl' emptyDList :: D.DList a -> Bool -emptyDList = D.list True (\_ _ -> False) +emptyDList = null . D.toList consTList :: TList a -> a -> STM () consTList tlist v = modifyTList tlist $ \dl -> D.cons v dl -- 2.26.2