From b42025b3c861383fd8cc984e20ed6ea36712f1dc Mon Sep 17 00:00:00 2001
From: Martijn Bastiaan <martijn@qbaylogic.com>
Date: Fri, 26 Jul 2024 14:53:47 +0200
Subject: [PATCH] Remove `stringsearch` dependency (#2765)

Fixes #2726

(cherry picked from commit 75dbbeb206b718a39a690a2e198310af9bcd8b6d)
---
 changelog/2024-07-21T16_46_47+02_00_remove_stringsearch | 1 +
 clash-lib/clash-lib.cabal                               | 2 +-
 clash-lib/tools/v16-upgrade-primitives.hs               | 8 +++++---
 3 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 changelog/2024-07-21T16_46_47+02_00_remove_stringsearch

diff --git a/changelog/2024-07-21T16_46_47+02_00_remove_stringsearch b/changelog/2024-07-21T16_46_47+02_00_remove_stringsearch
new file mode 100644
index 0000000000..c079566f32
--- /dev/null
+++ b/changelog/2024-07-21T16_46_47+02_00_remove_stringsearch
@@ -0,0 +1 @@
+FIXED: Removed `stringsearch` dependency from `v16-upgrade-primitives`. See [#2726](https://github.com/clash-lang/clash-compiler/issues/2726)
diff --git a/clash-lib/clash-lib.cabal b/clash-lib/clash-lib.cabal
index 1e68d55563..644277ca95 100644
--- a/clash-lib/clash-lib.cabal
+++ b/clash-lib/clash-lib.cabal
@@ -344,9 +344,9 @@ executable v16-upgrade-primitives
     yaml,
     bytestring,
     clash-lib,
+    text,
     containers,
     directory,
-    stringsearch,
     Glob
   GHC-Options:        -Wall -Wcompat
   default-language:   Haskell2010
diff --git a/clash-lib/tools/v16-upgrade-primitives.hs b/clash-lib/tools/v16-upgrade-primitives.hs
index aae23fad47..e71c976529 100644
--- a/clash-lib/tools/v16-upgrade-primitives.hs
+++ b/clash-lib/tools/v16-upgrade-primitives.hs
@@ -9,8 +9,9 @@ module Main where
 
 #if MIN_VERSION_aeson(2,0,0)
 import qualified Data.Aeson.KeyMap as Aeson
-import Data.ByteString.Lazy.Search (replace)
 import Data.String (IsString)
+import qualified Data.Text.Lazy as LazyText
+import qualified Data.Text.Lazy.Encoding as LazyText
 #endif
 
 import qualified Data.Aeson.Extra as AesonExtra
@@ -89,9 +90,10 @@ customSortOutput x = case x of
       Just val -> Aeson.insert kNew val (Aeson.delete kOld obj)
 
 removeTempKey :: ByteString -> ByteString
-removeTempKey inp = foldl go inp keySortingRenames
+removeTempKey inp =
+  LazyText.encodeUtf8 (foldl go (LazyText.decodeUtf8 inp) keySortingRenames)
  where
-  go bs (orig,temp) = replace (ByteString.toStrict temp) orig bs
+  go txt (orig,temp) = LazyText.replace temp orig txt
 #else
 -- < aeson-2.0 stores keys in HashMaps, whose order we can't possibly predict.
 removeTempKey :: ByteString -> ByteString