diff --git a/CHANGELOG.md b/CHANGELOG.md index eb3ac366..41637f0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ The changelog is available [on GitHub][2]. ## Unreleased: 0.6.0.0 +* Use `$>` instead of `*>` and `pure` where possible. * [#167](https://github.com/kowainik/relude/issues/167): Rename functions `prec`/`prev`, `dupe`/`dup`. * [#155](https://github.com/kowainik/relude/issues/155): diff --git a/src/Relude/Extra/Enum.hs b/src/Relude/Extra/Enum.hs index 152a4443..6c8e7e52 100644 --- a/src/Relude/Extra/Enum.hs +++ b/src/Relude/Extra/Enum.hs @@ -106,5 +106,5 @@ Nothing Nothing -} safeToEnum :: forall a . (Bounded a, Enum a) => Int -> Maybe a -safeToEnum i = guard (fromEnum @a minBound <= i && i <= fromEnum @a maxBound) *> Just (toEnum i) +safeToEnum i = guard (fromEnum @a minBound <= i && i <= fromEnum @a maxBound) $> toEnum i {-# INLINE safeToEnum #-} diff --git a/src/Relude/Extra/Map.hs b/src/Relude/Extra/Map.hs index f227ba2f..5fa0ad15 100644 --- a/src/Relude/Extra/Map.hs +++ b/src/Relude/Extra/Map.hs @@ -24,11 +24,11 @@ module Relude.Extra.Map import GHC.Exts (IsList (Item, toList)) -import Relude.Applicative (pure, (*>)) import Relude.Base (Eq, Ord, Type) import Relude.Bool (Bool, guard, not) import Relude.Container.Reexport (HashMap, HashSet, Hashable, IntMap, IntSet, Map, Set, fst, snd) import Relude.Function ((.)) +import Relude.Functor.Reexport (($>)) import Relude.List (map) import Relude.Monad.Reexport (Maybe (..), fromMaybe) import Relude.Numeric (Int) @@ -94,7 +94,7 @@ instance Ord a => StaticMap (Set a) where size = S.size member = S.member - lookup k m = guard (member k m) *> pure k + lookup k m = guard (member k m) $> k {-# INLINE size #-} {-# INLINE lookup #-} {-# INLINE member #-} @@ -105,7 +105,7 @@ instance (Eq a, Hashable a) => StaticMap (HashSet a) where size = HS.size member = HS.member - lookup k m = guard (member k m) *> pure k + lookup k m = guard (member k m) $> k {-# INLINE size #-} {-# INLINE lookup #-} {-# INLINE member #-} @@ -116,7 +116,7 @@ instance StaticMap IntSet where size = IS.size member = IS.member - lookup k m = guard (member k m) *> pure k + lookup k m = guard (member k m) $> k {-# INLINE size #-} {-# INLINE lookup #-} {-# INLINE member #-}