diff --git a/CHANGELOG b/CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +0.2.7.6 (2025-02-11): + * Technical Debt: + - Relaxed upper-bounds for GHC 9.12 + - Silencing some warnings on GHC 9.10 0.2.7.5 (2024-08-29): * Technical Debt: - Relaxed upper-bounds for the test suite diff --git a/bytestring-trie.cabal b/bytestring-trie.cabal --- a/bytestring-trie.cabal +++ b/bytestring-trie.cabal @@ -6,18 +6,18 @@ -- ---------------------------------------------------------------- --- wren gayle romano ~ 2024-08-29 +-- wren gayle romano ~ 2025-02-11 ---------------------------------------------------------------- Name: bytestring-trie -Version: 0.2.7.5 +Version: 0.2.7.6 Build-Type: Simple Stability: provisional Homepage: https://wrengr.org/software/hackage.html Bug-Reports: https://github.com/wrengr/bytestring-trie/issues Author: wren gayle romano Maintainer: wren@cpan.org -Copyright: 2008–2024 wren gayle romano +Copyright: 2008–2025 wren gayle romano -- Cabal-2.2 requires us to say "BSD-3-Clause" not "BSD3" License: BSD-3-Clause License-File: LICENSE @@ -63,7 +63,8 @@ GHC ==9.4.8, GHC ==9.6.5, GHC ==9.8.2, - GHC ==9.10.1 + GHC ==9.10.1, + GHC ==9.12.1 Source-Repository head Type: git @@ -81,7 +82,7 @@ -- N.B., the "import:" field must be the first thing in a stanza. Common library-build-depends Default-Language: Haskell2010 - Build-Depends: base >= 4.9 && < 4.21 + Build-Depends: base >= 4.9 && < 4.22 , bytestring >= 0.10.8 && < 0.13 , binary >= 0.8.3 && < 0.9 , deepseq >= 1.4.2 && < 1.6 diff --git a/src/Data/Trie.hs b/src/Data/Trie.hs --- a/src/Data/Trie.hs +++ b/src/Data/Trie.hs @@ -7,7 +7,7 @@ -- ~ 2021.12.14 -- | -- Module : Data.Trie --- Copyright : 2008--2023 wren romano +-- Copyright : 2008--2025 wren romano -- License : BSD-3-Clause -- Maintainer : wren@cpan.org -- Stability : provisional diff --git a/src/Data/Trie/Convenience.hs b/src/Data/Trie/Convenience.hs --- a/src/Data/Trie/Convenience.hs +++ b/src/Data/Trie/Convenience.hs @@ -4,10 +4,10 @@ {-# LANGUAGE Safe #-} #endif ---------------------------------------------------------------- --- ~ 2021.12.14 +-- ~ 2025-02-11 -- | -- Module : Data.Trie.Convenience --- Copyright : 2008--2023 wren romano +-- Copyright : 2008--2025 wren romano -- License : BSD-3-Clause -- Maintainer : wren@cpan.org -- Stability : provisional @@ -49,7 +49,11 @@ import Data.Trie import Data.Trie.Internal (lookupBy_, alterBy_) import Data.ByteString (ByteString) -import Data.List (foldl', sortBy) +import Data.List (sortBy) +#if !(MIN_VERSION_base(4,20,0)) +-- [aka GHC 9.10.1]: 'foldl'' re-exported from "Prelude". +import Data.List (foldl') +#endif import Data.Ord (comparing) ---------------------------------------------------------------- diff --git a/src/Data/Trie/Internal.hs b/src/Data/Trie/Internal.hs --- a/src/Data/Trie/Internal.hs +++ b/src/Data/Trie/Internal.hs @@ -17,10 +17,10 @@ {-# LANGUAGE Trustworthy #-} #endif ------------------------------------------------------------ --- ~ 2023.03.19 +-- ~ 2025-02-11 -- | -- Module : Data.Trie.Internal --- Copyright : 2008--2023 wren romano +-- Copyright : 2008--2025 wren romano -- License : BSD-3-Clause -- Maintainer : wren@cpan.org -- Stability : experimental @@ -650,7 +650,8 @@ shows' _ Empty = (".\n"++) shows' ss (Branch p m l r) = let s' = ("--"++) . shows p . (","++) . shows m . ("-+"++) - ss' = ss . (tail (spaces s') ++) + -- NOTE: GHC-9.10 warns about 'tail' being a partial function. + ss' = ss . (drop 1 (spaces s') ++) in s' . shows' (ss' . ("|"++)) l . ss' . ("|\n"++) . ss' . ("`"++) . shows' (ss' . (" "++)) r diff --git a/src/Data/Trie/Internal/ByteString.hs b/src/Data/Trie/Internal/ByteString.hs --- a/src/Data/Trie/Internal/ByteString.hs +++ b/src/Data/Trie/Internal/ByteString.hs @@ -6,10 +6,10 @@ {-# LANGUAGE Trustworthy #-} #endif ------------------------------------------------------------ --- ~ 2022.02.27 +-- ~ 2025-02-11 -- | -- Module : Data.Trie.Internal.ByteString --- Copyright : 2008--2023 wren romano +-- Copyright : 2008--2025 wren romano -- License : BSD-3-Clause -- Maintainer : wren@cpan.org -- Stability : stable @@ -28,6 +28,9 @@ import qualified Data.ByteString as S import qualified Data.ByteString.Internal as S +#if MIN_VERSION_bytestring(0,11,5) +import qualified Foreign.Marshal.Utils as FMU +#endif import Data.ByteString.Internal (ByteString(PS)) import Data.Word import Foreign.ForeignPtr (ForeignPtr) @@ -52,6 +55,14 @@ unsafeWithForeignPtr = withForeignPtr #endif +memcpy :: Ptr Word8 -> Ptr Word8 -> Int -> IO () +#if MIN_VERSION_bytestring(0,11,5) +-- This is the version when 'S.memcpy' got deprecated, though it +-- still exists at least through 0.12.2.0. +memcpy = FMU.copyBytes +#else +memcpy = S.memcpy +#endif ------------------------------------------------------------ ------------------------------------------------------------ @@ -328,7 +339,7 @@ goCopy (cs :+> PS fp off len) !ptr = unsafeWithForeignPtr fp $ \p -> do let ptr' = ptr `ptrElemOff` negate len - S.memcpy ptr' (p `ptrElemOff` off) len + memcpy ptr' (p `ptrElemOff` off) len goCopy cs ptr' ------------------------------------------------------------ diff --git a/src/Data/Trie/Internal/Errors.hs b/src/Data/Trie/Internal/Errors.hs --- a/src/Data/Trie/Internal/Errors.hs +++ b/src/Data/Trie/Internal/Errors.hs @@ -8,7 +8,7 @@ -- ~ 2021.12.14 -- | -- Module : Data.Trie.Internal.Errors --- Copyright : 2008--2023 wren romano +-- Copyright : 2008--2025 wren romano -- License : BSD-3-Clause -- Maintainer : wren@cpan.org -- Stability : internal