diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,21 @@ `relude` uses [PVP Versioning][1]. The changelog is available [on GitHub][2]. +## 1.2.0.0 – Mar 1, 2023 + +* [#420](https://github.com/kowainik/relude/issues/420): + Support GHC-9.4. +* Reexport `type (~)` from `Data.Type.Equality` for GHC-9.4. +* Add `-Wredundant-strictness-flags` and `-Wforall-identifier` warnings for + GHC-9.4. +* [#430](https://github.com/kowainik/relude/issues/430): + Upgrade dependencies: + - `ghc-prim-0.9` + - `mtl-2.3` + - `hedgehog-1.2` + - `doctest-0.21` +* Drop support of GHC-8.2. + ## 1.1.0.0 — Jun 9, 2022 * [#388](https://github.com/kowainik/relude/issues/388): diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -723,7 +723,7 @@ _O(n)_ time and you can accidentally use `elem` from `Foldable` but with `relude` you can't). 4. Protolude supports older GHC versions (from GHC 7.6.1) while `relude` only - supports from GHC 8.2.2. So if you aim ancient GHC versions, `protolude` + supports from GHC 8.4. So if you aim ancient GHC versions, `protolude` might be a better choice. But because of that it contains a lot of CPP, code is scary in some places as a consequence and it is more difficult to add, remove or change things there. diff --git a/relude.cabal b/relude.cabal --- a/relude.cabal +++ b/relude.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: relude -version: 1.1.0.0 +version: 1.2.0.0 synopsis: Safe, performant, user-friendly and lightweight Haskell Standard Library description: @__relude__@ is an alternative prelude library. If you find the default @@ -85,19 +85,19 @@ license-file: LICENSE author: Dmitrii Kovanikov, Veronika Romashkina, Stephen Diehl, Serokell maintainer: Kowainik -copyright: 2016 Stephen Diehl, 2016-2018 Serokell, 2018-2021 Kowainik +copyright: 2016 Stephen Diehl, 2016-2018 Serokell, 2018-2023 Kowainik category: Prelude stability: stable build-type: Simple extra-doc-files: CHANGELOG.md README.md -tested-with: GHC == 8.2.2 - GHC == 8.4.4 +tested-with: GHC == 8.4.4 GHC == 8.6.5 GHC == 8.8.4 GHC == 8.10.7 GHC == 9.0.2 - GHC == 9.2.2 + GHC == 9.2.7 + GHC == 9.4.4 source-repository head @@ -105,8 +105,6 @@ location: git@github.com:kowainik/relude.git common common-options - build-depends: base >= 4.10 && < 4.17 - ghc-options: -Wall -Wcompat -Widentities @@ -127,6 +125,9 @@ if impl(ghc >= 9.2) ghc-options: -Wredundant-bang-patterns -Woperator-whitespace + if impl(ghc >= 9.4) + ghc-options: -Wredundant-strictness-flags + -Wforall-identifier default-language: Haskell2010 @@ -227,12 +228,13 @@ , Data.ByteString.Short - build-depends: bytestring >= 0.10 && < 0.12 + build-depends: base >= 4.11 && < 4.18 + , bytestring >= 0.10 && < 0.12 , containers >= 0.5.10 && < 0.7 , deepseq ^>= 1.4 - , ghc-prim >= 0.4.0.0 && < 0.9 + , ghc-prim >= 0.5.0.0 && < 0.10 , hashable >= 1.2 && < 1.5 - , mtl ^>= 2.2 + , mtl >= 2.2 && < 2.4 , stm >= 2.4 && < 2.6 , text >= 1.2 && < 2.1 , transformers >= 0.5 && < 0.7 @@ -248,11 +250,12 @@ other-modules: Test.Relude.Gen Test.Relude.Container.One Test.Relude.Property - build-depends: relude + build-depends: base + , relude , bytestring , containers , text - , hedgehog >= 1.0 && < 1.2 + , hedgehog >= 1.0 && < 1.3 ghc-options: -threaded @@ -263,7 +266,7 @@ main-is: Doctest.hs build-depends: relude - , doctest ^>= 0.20 + , doctest >= 0.20 && < 0.22 , Glob ghc-options: -threaded @@ -274,7 +277,8 @@ hs-source-dirs: benchmark main-is: Main.hs - build-depends: relude + build-depends: base + , relude , tasty-bench , unordered-containers diff --git a/src/Relude.hs b/src/Relude.hs --- a/src/Relude.hs +++ b/src/Relude.hs @@ -4,7 +4,7 @@ Module : Relude Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Applicative.hs b/src/Relude/Applicative.hs --- a/src/Relude/Applicative.hs +++ b/src/Relude/Applicative.hs @@ -4,7 +4,7 @@ Module : Relude.Applicative Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Base.hs b/src/Relude/Base.hs --- a/src/Relude/Base.hs +++ b/src/Relude/Base.hs @@ -1,10 +1,12 @@ -{-# LANGUAGE Trustworthy #-} +{-# LANGUAGE CPP #-} +{-# LANGUAGE ExplicitNamespaces #-} +{-# LANGUAGE Trustworthy #-} {- | Module : Relude.Base Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable @@ -29,6 +31,9 @@ , module Data.Coerce , module Data.Kind , module Data.Proxy +#if __GLASGOW_HASKELL__ >= 904 + , module Data.Type.Equality +#endif , module Data.Typeable , module Data.Void @@ -51,13 +56,16 @@ import System.IO (FilePath, IO, IOMode (..)) -- Base typeclasses -import Data.Eq (Eq, (==), (/=)) +import Data.Eq (Eq, (/=), (==)) import Data.Ord (Down (..), Ord (..), Ordering (..), comparing) -- Types for type-level computation import Data.Coerce (Coercible, coerce) import Data.Kind (Constraint, Type) import Data.Proxy (Proxy (..)) +#if __GLASGOW_HASKELL__ >= 904 +import Data.Type.Equality (type (~)) +#endif import Data.Typeable (Typeable) import Data.Void (Void, absurd, vacuous) diff --git a/src/Relude/Bool.hs b/src/Relude/Bool.hs --- a/src/Relude/Bool.hs +++ b/src/Relude/Bool.hs @@ -4,7 +4,7 @@ Module : Relude.Bool Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Bool/Guard.hs b/src/Relude/Bool/Guard.hs --- a/src/Relude/Bool/Guard.hs +++ b/src/Relude/Bool/Guard.hs @@ -4,7 +4,7 @@ Module : Relude.Bool.Guard Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Bool/Reexport.hs b/src/Relude/Bool/Reexport.hs --- a/src/Relude/Bool/Reexport.hs +++ b/src/Relude/Bool/Reexport.hs @@ -4,7 +4,7 @@ Module : Relude.Bool.Reexport Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Container.hs b/src/Relude/Container.hs --- a/src/Relude/Container.hs +++ b/src/Relude/Container.hs @@ -4,7 +4,7 @@ Module : Relude.Container Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Container/One.hs b/src/Relude/Container/One.hs --- a/src/Relude/Container/One.hs +++ b/src/Relude/Container/One.hs @@ -7,7 +7,7 @@ Module : Relude.Container.One Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Container/Reexport.hs b/src/Relude/Container/Reexport.hs --- a/src/Relude/Container/Reexport.hs +++ b/src/Relude/Container/Reexport.hs @@ -4,7 +4,7 @@ Module : Relude.Container.Reexport Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Debug.hs b/src/Relude/Debug.hs --- a/src/Relude/Debug.hs +++ b/src/Relude/Debug.hs @@ -3,6 +3,7 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-} +{-# LANGUAGE DerivingStrategies #-} {-# LANGUAGE KindSignatures #-} {-# LANGUAGE PolyKinds #-} {-# LANGUAGE RankNTypes #-} @@ -12,15 +13,11 @@ {-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} -#if __GLASGOW_HASKELL__ > 802 -{-# LANGUAGE DerivingStrategies #-} -#endif - {- | Module : Relude.Debug Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable @@ -89,6 +86,9 @@ ) where import Data.Data (Data) +#if __GLASGOW_HASKELL__ >= 904 +import Data.Type.Equality (type (~)) +#endif import GHC.Exts (RuntimeRep, TYPE) import GHC.TypeLits (ErrorMessage (..), TypeError) @@ -255,7 +255,7 @@ >>> error "oops" *** Exception: oops CallStack (from HasCallStack): - error, called at src\\Relude\\Debug.hs:289:11 in ... + error, called at src\Relude\Debug.hs:289:11 in ... ... #else >>> error "oops" @@ -309,11 +309,7 @@ -- | Similar to 'undefined' but data type. data Undefined = Undefined -#if __GLASGOW_HASKELL__ > 802 deriving stock (Eq, Ord, Show, Read, Enum, Bounded, Data, Typeable, Generic) -#else - deriving (Eq, Ord, Show, Read, Enum, Bounded, Data, Typeable, Generic) -#endif {-# WARNING Undefined "'Undefined' type remains in code" #-} -- | 'Prelude.undefined' that leaves warning in code on every usage. diff --git a/src/Relude/DeepSeq.hs b/src/Relude/DeepSeq.hs --- a/src/Relude/DeepSeq.hs +++ b/src/Relude/DeepSeq.hs @@ -4,7 +4,7 @@ Module : Relude.DeepSeq Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Enum.hs b/src/Relude/Enum.hs --- a/src/Relude/Enum.hs +++ b/src/Relude/Enum.hs @@ -2,7 +2,7 @@ {- | Module : Relude.Enum -Copyright : (c) 2021-2022 Kowainik +Copyright : (c) 2021-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Exception.hs b/src/Relude/Exception.hs --- a/src/Relude/Exception.hs +++ b/src/Relude/Exception.hs @@ -1,18 +1,14 @@ -{-# LANGUAGE CPP #-} +{-# LANGUAGE DerivingStrategies #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE PatternSynonyms #-} {-# LANGUAGE Safe #-} {-# LANGUAGE ViewPatterns #-} -#if __GLASGOW_HASKELL__ > 802 -{-# LANGUAGE DerivingStrategies #-} -#endif - {- | Module : Relude.Exception Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable @@ -48,11 +44,7 @@ not meant to be ever executed, but happens to be executed anyway. -} data Bug = Bug SomeException CallStack -#if __GLASGOW_HASKELL__ > 802 deriving stock (Show) -#else - deriving (Show) -#endif instance Exception Bug where displayException (Bug e cStack) = diff --git a/src/Relude/Extra.hs b/src/Relude/Extra.hs --- a/src/Relude/Extra.hs +++ b/src/Relude/Extra.hs @@ -1,6 +1,6 @@ {- | Module : Relude.Extra -Copyright : (c) 2019-2022 Kowainik +Copyright : (c) 2019-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Extra/Bifunctor.hs b/src/Relude/Extra/Bifunctor.hs --- a/src/Relude/Extra/Bifunctor.hs +++ b/src/Relude/Extra/Bifunctor.hs @@ -2,7 +2,7 @@ {- | Module : Relude.Extra.Bifunctor -Copyright : (c) 2018-2022 Kowainik +Copyright : (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Extra/CallStack.hs b/src/Relude/Extra/CallStack.hs --- a/src/Relude/Extra/CallStack.hs +++ b/src/Relude/Extra/CallStack.hs @@ -2,7 +2,7 @@ {- | Module : Relude.Extra.CallStack -Copyright : (c) 2018-2022 Kowainik +Copyright : (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Extra/Enum.hs b/src/Relude/Extra/Enum.hs --- a/src/Relude/Extra/Enum.hs +++ b/src/Relude/Extra/Enum.hs @@ -2,7 +2,7 @@ {- | Module : Relude.Extra.Enum -Copyright : (c) 2018-2022 Kowainik +Copyright : (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Extra/Foldable.hs b/src/Relude/Extra/Foldable.hs --- a/src/Relude/Extra/Foldable.hs +++ b/src/Relude/Extra/Foldable.hs @@ -3,7 +3,7 @@ {- | Module : Relude.Extra.Foldable -Copyright : (c) 2018-2022 Kowainik +Copyright : (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Extra/Foldable1.hs b/src/Relude/Extra/Foldable1.hs --- a/src/Relude/Extra/Foldable1.hs +++ b/src/Relude/Extra/Foldable1.hs @@ -10,7 +10,7 @@ {- | Module : Relude.Extra.Foldable1 Copyright : (c) 2011-2015 Edward Kmett - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Extra/Group.hs b/src/Relude/Extra/Group.hs --- a/src/Relude/Extra/Group.hs +++ b/src/Relude/Extra/Group.hs @@ -1,9 +1,10 @@ -{-# LANGUAGE Safe #-} -{-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE Safe #-} +{-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE TypeOperators #-} {- | Module : Relude.Extra.Group -Copyright : (c) 2018-2022 Kowainik +Copyright : (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Extra/Lens.hs b/src/Relude/Extra/Lens.hs --- a/src/Relude/Extra/Lens.hs +++ b/src/Relude/Extra/Lens.hs @@ -4,7 +4,7 @@ {- | Module : Relude.Extra.Lens Copyright : (c) 2012-2016 Edward Kmett - (c) 2019-2022 Kowainik + (c) 2019-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Extra/Map.hs b/src/Relude/Extra/Map.hs --- a/src/Relude/Extra/Map.hs +++ b/src/Relude/Extra/Map.hs @@ -1,9 +1,11 @@ -{-# LANGUAGE Trustworthy #-} -{-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE CPP #-} +{-# LANGUAGE Trustworthy #-} +{-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE TypeOperators #-} {- | Module : Relude.Extra.Map -Copyright : (c) 2018-2022 Kowainik +Copyright : (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable @@ -26,9 +28,17 @@ , elems ) where +#if __GLASGOW_HASKELL__ >= 904 +import Data.Type.Equality (type (~)) +#endif import GHC.Exts (IsList (Item, toList)) +#if MIN_VERSION_hashable(1,4,0) +import Relude.Base (Ord, Type) +#else import Relude.Base (Eq, Ord, Type) +#endif + import Relude.Bool (Bool, guard, not) import Relude.Container.Reexport (HashMap, HashSet, Hashable, IntMap, IntSet, Map, Set, fst, snd) import Relude.Function ((.)) @@ -80,7 +90,11 @@ @since 0.1.0 -} +#if MIN_VERSION_hashable(1,4,0) +instance (Hashable k) => StaticMap (HashMap k v) where +#else instance (Eq k, Hashable k) => StaticMap (HashMap k v) where +#endif type Key (HashMap k v) = k type Val (HashMap k v) = v @@ -125,7 +139,11 @@ @since 0.1.0 -} +#if MIN_VERSION_hashable(1,4,0) +instance (Hashable a) => StaticMap (HashSet a) where +#else instance (Eq a, Hashable a) => StaticMap (HashSet a) where +#endif type Key (HashSet a) = a type Val (HashSet a) = a @@ -237,7 +255,11 @@ @since 0.1.0 -} +#if MIN_VERSION_hashable(1,4,0) +instance (Hashable k) => DynamicMap (HashMap k v) where +#else instance (Eq k, Hashable k) => DynamicMap (HashMap k v) where +#endif insert = HM.insert {-# INLINE insert #-} insertWith = HM.insertWith diff --git a/src/Relude/Extra/Newtype.hs b/src/Relude/Extra/Newtype.hs --- a/src/Relude/Extra/Newtype.hs +++ b/src/Relude/Extra/Newtype.hs @@ -1,9 +1,8 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE Safe #-} {- | Module : Relude.Extra.Newtype -Copyright : (c) 2018-2022 Kowainik +Copyright : (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable @@ -19,9 +18,7 @@ , wrap , under , under2 -#if ( __GLASGOW_HASKELL__ != 802 ) , underF2 -#endif , (#.) ) where @@ -89,7 +86,6 @@ under2 = coerce {-# INLINE under2 #-} -#if ( __GLASGOW_HASKELL__ != 802 ) {- | Version of 'under2' that works on @newtype@s parametrized by their representation. Provided for convenience. @@ -103,7 +99,6 @@ underF2 :: forall n a . Coercible a (n a) => (n a -> n a -> n a) -> (a -> a -> a) underF2 = coerce {-# INLINE underF2 #-} -#endif {- | Coercible composition. This function allows to write more efficient implementations of function compositions over @newtypes@. diff --git a/src/Relude/Extra/Tuple.hs b/src/Relude/Extra/Tuple.hs --- a/src/Relude/Extra/Tuple.hs +++ b/src/Relude/Extra/Tuple.hs @@ -3,7 +3,7 @@ {- | Module : Relude.Extra.Tuple -Copyright : (c) 2018-2022 Kowainik +Copyright : (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Extra/Type.hs b/src/Relude/Extra/Type.hs --- a/src/Relude/Extra/Type.hs +++ b/src/Relude/Extra/Type.hs @@ -10,7 +10,7 @@ {- | Module : Relude.Extra.Type -Copyright : (c) 2018-2022 Kowainik +Copyright : (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable @@ -36,7 +36,7 @@ -- $setup --- >>> :set -XAllowAmbiguousTypes -XDataKinds -XExplicitNamespaces -XPolyKinds -XTypeFamilies -XTypeOperators -XUndecidableInstances +-- >>> :set -XAllowAmbiguousTypes -XDataKinds -XExplicitNamespaces -XPolyKinds -XTypeFamilies -XTypeOperators -XUndecidableInstances {- | Gets a string representation of a type. diff --git a/src/Relude/File.hs b/src/Relude/File.hs --- a/src/Relude/File.hs +++ b/src/Relude/File.hs @@ -2,7 +2,7 @@ {- | Module : Relude.File -Copyright : (c) 2018-2022 Kowainik +Copyright : (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Foldable.hs b/src/Relude/Foldable.hs --- a/src/Relude/Foldable.hs +++ b/src/Relude/Foldable.hs @@ -2,7 +2,7 @@ {- | Module : Relude.Foldable -Copyright : (c) 2018-2022 Kowainik +Copyright : (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Foldable/Fold.hs b/src/Relude/Foldable/Fold.hs --- a/src/Relude/Foldable/Fold.hs +++ b/src/Relude/Foldable/Fold.hs @@ -11,7 +11,7 @@ Module : Relude.Foldable.Fold Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Foldable/Reexport.hs b/src/Relude/Foldable/Reexport.hs --- a/src/Relude/Foldable/Reexport.hs +++ b/src/Relude/Foldable/Reexport.hs @@ -3,7 +3,7 @@ {- | Module : Relude.Foldable.Reexport -Copyright : (c) 2018-2022 Kowainik +Copyright : (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable @@ -27,8 +27,8 @@ #if MIN_VERSION_base(4,13,0) import Data.Foldable (foldMap') #endif -import Data.Traversable (Traversable (..), forM, mapAccumL, mapAccumR) import Data.Bifoldable (Bifoldable (..), biList, biall, biand, biany, biasum, bielem, bifind, bifoldl', bifoldlM, bifoldr', bifoldrM, bifor_, bilength, binull, bior, bisequence_, bitraverse_) import Data.Bitraversable (Bitraversable (..), bifoldMapDefault, bifor, bimapDefault, bisequence) +import Data.Traversable (Traversable (..), forM, mapAccumL, mapAccumR) diff --git a/src/Relude/Function.hs b/src/Relude/Function.hs --- a/src/Relude/Function.hs +++ b/src/Relude/Function.hs @@ -4,7 +4,7 @@ Module : Relude.Function Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Functor.hs b/src/Relude/Functor.hs --- a/src/Relude/Functor.hs +++ b/src/Relude/Functor.hs @@ -4,7 +4,7 @@ Module : Relude.Functor Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Functor/Fmap.hs b/src/Relude/Functor/Fmap.hs --- a/src/Relude/Functor/Fmap.hs +++ b/src/Relude/Functor/Fmap.hs @@ -5,7 +5,7 @@ Module : Relude.Functor.Fmap Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Functor/Reexport.hs b/src/Relude/Functor/Reexport.hs --- a/src/Relude/Functor/Reexport.hs +++ b/src/Relude/Functor/Reexport.hs @@ -5,7 +5,7 @@ Module : Relude.Functor.Reexport Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Lifted.hs b/src/Relude/Lifted.hs --- a/src/Relude/Lifted.hs +++ b/src/Relude/Lifted.hs @@ -4,7 +4,7 @@ Module : Relude.Lifted Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Lifted/Concurrent.hs b/src/Relude/Lifted/Concurrent.hs --- a/src/Relude/Lifted/Concurrent.hs +++ b/src/Relude/Lifted/Concurrent.hs @@ -4,7 +4,7 @@ Module : Relude.Lifted.Concurrent Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Lifted/Env.hs b/src/Relude/Lifted/Env.hs --- a/src/Relude/Lifted/Env.hs +++ b/src/Relude/Lifted/Env.hs @@ -2,7 +2,7 @@ {- | Module : Relude.Lifted.Env -Copyright : (c) 2020-2022 Kowainik +Copyright : (c) 2020-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Lifted/Exit.hs b/src/Relude/Lifted/Exit.hs --- a/src/Relude/Lifted/Exit.hs +++ b/src/Relude/Lifted/Exit.hs @@ -4,7 +4,7 @@ Module : Relude.Lifted.Exit Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Lifted/File.hs b/src/Relude/Lifted/File.hs --- a/src/Relude/Lifted/File.hs +++ b/src/Relude/Lifted/File.hs @@ -5,7 +5,7 @@ Module : Relude.Lifted.File Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Lifted/Handle.hs b/src/Relude/Lifted/Handle.hs --- a/src/Relude/Lifted/Handle.hs +++ b/src/Relude/Lifted/Handle.hs @@ -2,7 +2,7 @@ {- | Module : Relude.Lifted.Handle -Copyright : (c) 2020-2022 Kowainik +Copyright : (c) 2020-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Lifted/IORef.hs b/src/Relude/Lifted/IORef.hs --- a/src/Relude/Lifted/IORef.hs +++ b/src/Relude/Lifted/IORef.hs @@ -4,7 +4,7 @@ Module : Relude.Lifted.IORef Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Lifted/Terminal.hs b/src/Relude/Lifted/Terminal.hs --- a/src/Relude/Lifted/Terminal.hs +++ b/src/Relude/Lifted/Terminal.hs @@ -2,7 +2,7 @@ {- | Module : Relude.Lifted.Terminal -Copyright : (c) 2018-2022 Kowainik +Copyright : (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/List.hs b/src/Relude/List.hs --- a/src/Relude/List.hs +++ b/src/Relude/List.hs @@ -4,7 +4,7 @@ Module : Relude.List Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/List/NonEmpty.hs b/src/Relude/List/NonEmpty.hs --- a/src/Relude/List/NonEmpty.hs +++ b/src/Relude/List/NonEmpty.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE Safe #-} @@ -9,7 +10,7 @@ Module : Relude.List.NonEmpty Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable @@ -88,6 +89,9 @@ ) where import Data.List.NonEmpty (NonEmpty (..), nonEmpty) +#if __GLASGOW_HASKELL__ >= 904 +import Data.Type.Equality (type (~)) +#endif import GHC.TypeLits (ErrorMessage (..), Symbol, TypeError) import Relude.Applicative (Applicative, pass) diff --git a/src/Relude/List/Reexport.hs b/src/Relude/List/Reexport.hs --- a/src/Relude/List/Reexport.hs +++ b/src/Relude/List/Reexport.hs @@ -4,7 +4,7 @@ Module : Relude.List.Reexport Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Monad.hs b/src/Relude/Monad.hs --- a/src/Relude/Monad.hs +++ b/src/Relude/Monad.hs @@ -4,7 +4,7 @@ Module : Relude.Monad Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable @@ -53,7 +53,7 @@ {- | Repeat a monadic action indefinitely. -This is a more type safe version of 'forever', which has a convinient +This is a more type safe version of 'forever', which has a convenient but unsafe type. Consider the following two examples. In the @getIntForever@ functions, it diff --git a/src/Relude/Monad/Either.hs b/src/Relude/Monad/Either.hs --- a/src/Relude/Monad/Either.hs +++ b/src/Relude/Monad/Either.hs @@ -6,7 +6,7 @@ Module : Relude.Monad.Either Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Monad/Maybe.hs b/src/Relude/Monad/Maybe.hs --- a/src/Relude/Monad/Maybe.hs +++ b/src/Relude/Monad/Maybe.hs @@ -4,7 +4,7 @@ Module : Relude.Monad.Maybe Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable @@ -98,7 +98,7 @@ whenNothing_ _ _ = pass {-# INLINE whenNothing_ #-} -{- | Monadic version of 'whenNothingM'. +{- | Monadic version of 'whenNothing'. >>> whenNothingM (pure $ Just True) $ True <$ putTextLn "Is Just!" True @@ -110,7 +110,7 @@ whenNothingM mm action = mm >>= \m -> whenNothing m action {-# INLINE whenNothingM #-} -{- | Monadic version of 'whenNothingM_'. +{- | Monadic version of 'whenNothing_'. >>> whenNothingM_ (pure $ Just True) $ putTextLn "Is Just!" >>> whenNothingM_ (pure Nothing) $ putTextLn "Is Nothing!" diff --git a/src/Relude/Monad/Reexport.hs b/src/Relude/Monad/Reexport.hs --- a/src/Relude/Monad/Reexport.hs +++ b/src/Relude/Monad/Reexport.hs @@ -4,7 +4,7 @@ Module : Relude.Monad.Reexport Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Monad/Trans.hs b/src/Relude/Monad/Trans.hs --- a/src/Relude/Monad/Trans.hs +++ b/src/Relude/Monad/Trans.hs @@ -4,7 +4,7 @@ Module : Relude.Monad.Trans Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Monoid.hs b/src/Relude/Monoid.hs --- a/src/Relude/Monoid.hs +++ b/src/Relude/Monoid.hs @@ -5,13 +5,12 @@ {-# LANGUAGE Trustworthy #-} #else {-# LANGUAGE Safe #-} -#endif {- | Module : Relude.Monoid Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable @@ -20,6 +19,7 @@ Reexports functions to work with monoids plus adds extra useful functions. -} +#endif module Relude.Monoid ( -- * Reexports module Data.Monoid diff --git a/src/Relude/Nub.hs b/src/Relude/Nub.hs --- a/src/Relude/Nub.hs +++ b/src/Relude/Nub.hs @@ -5,7 +5,7 @@ Module : Relude.Nub Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable @@ -55,8 +55,8 @@ #if !MIN_VERSION_hashable(1,4,0) import Data.Eq (Eq) #endif -import Data.HashSet as HashSet import Data.Hashable (Hashable) +import Data.HashSet as HashSet import Data.Ord (Ord) import Prelude (Int, (.)) diff --git a/src/Relude/Numeric.hs b/src/Relude/Numeric.hs --- a/src/Relude/Numeric.hs +++ b/src/Relude/Numeric.hs @@ -2,7 +2,7 @@ {- | Module : Relude.Numeric -Copyright : (c) 2018-2022 Kowainik +Copyright : (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/Print.hs b/src/Relude/Print.hs --- a/src/Relude/Print.hs +++ b/src/Relude/Print.hs @@ -7,7 +7,7 @@ Module : Relude.Print Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/String.hs b/src/Relude/String.hs --- a/src/Relude/String.hs +++ b/src/Relude/String.hs @@ -4,7 +4,7 @@ Module : Relude.String Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/String/Conversion.hs b/src/Relude/String/Conversion.hs --- a/src/Relude/String/Conversion.hs +++ b/src/Relude/String/Conversion.hs @@ -13,7 +13,7 @@ Module : Relude.String.Conversion Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable diff --git a/src/Relude/String/Reexport.hs b/src/Relude/String/Reexport.hs --- a/src/Relude/String/Reexport.hs +++ b/src/Relude/String/Reexport.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE KindSignatures #-} @@ -10,7 +11,7 @@ Module : Relude.String.Reexport Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable @@ -50,6 +51,9 @@ import Data.Text.Encoding (decodeUtf8', decodeUtf8With) import Data.Text.Encoding.Error (OnDecodeError, OnError, UnicodeException, lenientDecode, strictDecode) +#if __GLASGOW_HASKELL__ >= 904 +import Data.Type.Equality (type (~)) +#endif import GHC.TypeLits (ErrorMessage (..), Symbol, TypeError) import Text.Read (Read, readMaybe, reads) diff --git a/src/Relude/Unsafe.hs b/src/Relude/Unsafe.hs --- a/src/Relude/Unsafe.hs +++ b/src/Relude/Unsafe.hs @@ -4,7 +4,7 @@ Module : Relude.Unsafe Copyright : (c) 2016 Stephen Diehl (c) 2016-2018 Serokell - (c) 2018-2022 Kowainik + (c) 2018-2023 Kowainik SPDX-License-Identifier : MIT Maintainer : Kowainik Stability : Stable