Update tree-diff

IntersectMBO · Jun 2, 2023 · ff9982e · ff9982e
1 parent cfae930
commit ff9982e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/cabal.project b/cabal.project
@@ -107,3 +107,8 @@ source-repository-package
   --sha256: 18apsg2lqjv9cc29nbd3hzj2hqhksqjj0s4xp2rdv8cbd27racjh
   subdir:
     cborg
+
+source-repository-package
+  type: git
+  location: https://github.com/jasagredo/tree-diff
+  tag: a97c7ab0792efee192a11d693cef69801c0fb280
diff --git a/libs/cardano-ledger-binary/src/Cardano/Ledger/TreeDiff.hs b/libs/cardano-ledger-binary/src/Cardano/Ledger/TreeDiff.hs
@@ -24,7 +24,7 @@ import Data.Foldable (toList)
 import Data.IP (IPv4, IPv6)
 import Data.Maybe.Strict (StrictMaybe)
 import Data.Sequence.Strict (StrictSeq)
-import Data.TreeDiff (ansiWlEditExpr, prettyEditExpr)
+import Data.TreeDiff (ansiEditExpr, prettyEditExpr)
 import Data.TreeDiff.Class (ToExpr (listToExpr, toExpr), defaultExprViaShow, ediff)
 import Data.TreeDiff.Expr (Expr (App, Lst, Rec))
 import Data.TreeDiff.QuickCheck (ediffEq)
@@ -36,7 +36,7 @@ trimExprViaShow :: Show a => Int -> a -> Expr
 trimExprViaShow _n x = defaultExprViaShow x -- App (take n (drop 1 (show x)) ++ "..") []
 
 diffExpr :: ToExpr a => a -> a -> String
-diffExpr x y = show (ansiWlEditExpr (ediff x y))
+diffExpr x y = show (ansiEditExpr (ediff x y))
 
 diffExprNoColor :: ToExpr a => a -> a -> String
 diffExprNoColor x y = show (prettyEditExpr (ediff x y))

diff --git a/libs/cardano-ledger-binary/testlib/Test/Cardano/Ledger/Binary/TreeDiff.hs b/libs/cardano-ledger-binary/testlib/Test/Cardano/Ledger/Binary/TreeDiff.hs
@@ -36,7 +36,7 @@ import Test.Tasty.HUnit (Assertion, assertFailure)
 --------------------------------------------------------------------------------
 
 showExpr :: ToExpr a => a -> String
-showExpr = show . ansiWlExpr . toExpr
+showExpr = show . ansiExpr . toExpr
 
 -- | Wraps regular ByteString, but shows and diffs it as hex
 newtype HexBytes = HexBytes {unHexBytes :: BS.ByteString}