Deprecation warning for HD module

IntersectMBO · Dec 2, 2022 · ed799ac · ed799ac
1 parent 5092658
commit ed799ac
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 20 deletions.
diff --git a/anti-diff/format-stylish.sh b/anti-diff/format-stylish.sh
diff --git a/anti-diff/src/Data/Map/Diff/Strict.hs b/anti-diff/src/Data/Map/Diff/Strict.hs
@@ -172,14 +172,12 @@ diff (Values m1) (Values m2) = Diff $
         if v1 == v2 then
           Nothing
         else
-          Just $ singletonDelete v1 `unsafeMappend` singletonInsert v2
+          Just $ singletonDelete v1 `unsafeAppend` singletonInsert v2
       )
       m1
       m2
   where
-    -- Bypass the @'Semigroupoid'@ instance for @'NEDiffHistory'@, because we
-    -- know that @h1@ and @h2@ will not cancel out.
-    unsafeMappend (NEDiffHistory h1) (NEDiffHistory h2) =
+    unsafeAppend (NEDiffHistory h1) (NEDiffHistory h2) =
       NEDiffHistory $ h1 <> h2
 
 fromList :: Ord k => [(k, NEDiffHistory v)] -> Diff k v

diff --git a/ouroboros-consensus/src/Ouroboros/Consensus/Storage/LedgerDB/HD.hs b/ouroboros-consensus/src/Ouroboros/Consensus/Storage/LedgerDB/HD.hs
@@ -9,7 +9,7 @@
 -- Except for the backing store, this interface would also be required for any
 -- other kind of table. Some definitions would change depending on that table's
 -- specifics.
-module Ouroboros.Consensus.Storage.LedgerDB.HD (
+module Ouroboros.Consensus.Storage.LedgerDB.HD {-# DEPRECATED "Use Data.Map.Diff.Strict instead" #-} (
     -- * Values
     UtxoValues (..)
   , emptyUtxoValues

diff --git a/scripts/ci/check-stylish.sh b/scripts/ci/check-stylish.sh
@@ -4,4 +4,13 @@ set -euo pipefail
 
 export LC_ALL=C.UTF-8
 # TODO the export of the <= operator TxLimits crashes stylish-haskell
-fd -p ouroboros-consensus -e hs -E Setup.hs -E ouroboros-consensus/src/Ouroboros/Consensus/Mempool/TxLimits.hs -X stylish-haskell -c .stylish-haskell.yaml -i
+# TODO the deprecation warning in the HD module will be removed by
+# stylish-haskell, unless we update stylish-haskell to v0.14.3.0
+fd -p ouroboros-consensus -e hs \
+  -E Setup.hs \
+  -E ouroboros-consensus/src/Ouroboros/Consensus/Mempool/TxLimits.hs \
+  -E ouroboros-consensus/src/Ouroboros/Consensus/Storage/LedgerDB/HD.hs \
+  -X stylish-haskell -c .stylish-haskell.yaml -i
+
+fd -p anti-diff -e hs -X stylish-haskell -c .stylish-haskell.yaml -i
+fd -p semigroupoid -e hs -X stylish-haskell -c .stylish-haskell.yaml -i
diff --git a/semigroupoid/format-stylish.sh b/semigroupoid/format-stylish.sh