From 04ab7f046b7bb21453a80249f22cf1d907aa5f7a Mon Sep 17 00:00:00 2001 From: Andrew Martin Date: Wed, 29 Jul 2020 14:42:40 -0400 Subject: [PATCH] Resolve collision of replicate in test suite --- CHANGELOG.md | 4 ++++ test/Main.hs | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d153ea5..f82251d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ Note: Prior to version 0.3.4.0, this library was named `small-bytearray-builder` is now just a compatibility shim to ease the migration process. +## 0.3.6.1 -- 2020-??-?? + +* Fix build error in test suite. + ## 0.3.6.0 -- 2020-06-30 * Add `replicate`. diff --git a/test/Main.hs b/test/Main.hs index 3307f6c..4d4fa70 100644 --- a/test/Main.hs +++ b/test/Main.hs @@ -5,6 +5,8 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} +import Prelude hiding (replicate) + import Control.Applicative (liftA2) import Control.Monad.ST (runST) import Data.Bytes.Builder @@ -35,6 +37,7 @@ import qualified Data.Primitive as PM import qualified Data.Text as T import qualified Data.Text.Encoding as TE import qualified GHC.Exts as Exts +import qualified Prelude import qualified Test.Tasty.HUnit as THU import qualified Test.Tasty.QuickCheck as TQC @@ -321,7 +324,7 @@ instance Arbitrary Word256 where zeroPadL :: Int -> String -> String zeroPadL n s - | length s < n = replicate (n - length s) '0' ++ s + | length s < n = Prelude.replicate (n - length s) '0' ++ s | otherwise = s naiveLeb128 :: Natural -> ByteArray