Merge pull request #578 from bplommer/remove-monadcancelthrow

Remove redundant context bound (Sync already implies MonadCancelThrow)
cb372 · Sep 13, 2021 · d11636d · d11636d
2 parents 401a0b6 + 6a9b5d5
commit d11636d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 20 deletions.
diff --git a/modules/redis/src/main/scala/scalacache/redis/RedisCache.scala b/modules/redis/src/main/scala/scalacache/redis/RedisCache.scala
@@ -5,17 +5,16 @@ import redis.clients.jedis._
 import scala.language.higherKinds
 import scalacache.CacheConfig
 import scalacache.serialization.Codec
-import cats.effect.{MonadCancel, MonadCancelThrow, Resource, Sync}
+import cats.effect.{MonadCancel, Resource, Sync}
 
 /** Thin wrapper around Jedis
   */
-class RedisCache[F[_]: Sync: MonadCancelThrow, V](val jedisPool: JedisPool)(implicit
+class RedisCache[F[_]: Sync, V](val jedisPool: JedisPool)(implicit
     val config: CacheConfig,
     val codec: Codec[V]
 ) extends RedisCacheBase[F, V] {
 
-  protected def F: Sync[F]                             = Sync[F]
-  protected def MonadCancelThrowF: MonadCancelThrow[F] = MonadCancel[F, Throwable]
+  protected def F: Sync[F] = Sync[F]
   type JClient = Jedis
 
   protected val doRemoveAll: F[Unit] = withJedis { jedis =>
@@ -27,7 +26,7 @@ object RedisCache {
 
   /** Create a Redis client connecting to the given host and use it for caching
     */
-  def apply[F[_]: Sync: MonadCancelThrow, V](
+  def apply[F[_]: Sync, V](
       host: String,
       port: Int
   )(implicit config: CacheConfig, codec: Codec[V]): RedisCache[F, V] =
@@ -37,7 +36,7 @@ object RedisCache {
     * @param jedisPool
     *   a Jedis pool
     */
-  def apply[F[_]: Sync: MonadCancelThrow, V](
+  def apply[F[_]: Sync, V](
       jedisPool: JedisPool
   )(implicit config: CacheConfig, codec: Codec[V]): RedisCache[F, V] =
     new RedisCache[F, V](jedisPool)

diff --git a/modules/redis/src/main/scala/scalacache/redis/RedisCacheBase.scala b/modules/redis/src/main/scala/scalacache/redis/RedisCacheBase.scala
@@ -9,7 +9,7 @@ import scalacache.serialization.Codec
 import scalacache.{AbstractCache, CacheConfig}
 
 import scala.concurrent.duration._
-import cats.effect.{MonadCancelThrow, Resource}
+import cats.effect.Resource
 import cats.syntax.all._
 
 /** Contains implementations of all methods that can be implemented independent of the type of Redis client. This is

diff --git a/modules/redis/src/main/scala/scalacache/redis/SentinelRedisCache.scala b/modules/redis/src/main/scala/scalacache/redis/SentinelRedisCache.scala
@@ -7,17 +7,16 @@ import scala.collection.JavaConverters._
 import scalacache.CacheConfig
 import scalacache.serialization.Codec
 import cats.implicits._
-import cats.effect.{MonadCancel, MonadCancelThrow, Sync}
+import cats.effect.{MonadCancel, Sync}
 
 /** Thin wrapper around Jedis that works with Redis Sentinel.
   */
-class SentinelRedisCache[F[_]: Sync: MonadCancelThrow, V](val jedisPool: JedisSentinelPool)(implicit
+class SentinelRedisCache[F[_]: Sync, V](val jedisPool: JedisSentinelPool)(implicit
     val config: CacheConfig,
     val codec: Codec[V]
 ) extends RedisCacheBase[F, V] {
 
-  protected def F: Sync[F]                             = Sync[F]
-  protected def MonadCancelThrowF: MonadCancelThrow[F] = MonadCancel[F, Throwable]
+  protected def F: Sync[F] = Sync[F]
 
   type JClient = Jedis
 
@@ -39,7 +38,7 @@ object SentinelRedisCache {
     * @param password
     *   password of the cluster
     */
-  def apply[F[_]: Sync: MonadCancelThrow, V](clusterName: String, sentinels: Set[String], password: String)(implicit
+  def apply[F[_]: Sync, V](clusterName: String, sentinels: Set[String], password: String)(implicit
       config: CacheConfig,
       codec: Codec[V]
   ): SentinelRedisCache[F, V] =
@@ -56,7 +55,7 @@ object SentinelRedisCache {
     * @param poolConfig
     *   config of the underlying pool
     */
-  def apply[F[_]: Sync: MonadCancelThrow, V](
+  def apply[F[_]: Sync, V](
       clusterName: String,
       sentinels: Set[String],
       poolConfig: GenericObjectPoolConfig,
@@ -72,7 +71,7 @@ object SentinelRedisCache {
     * @param jedisSentinelPool
     *   a JedisSentinelPool
     */
-  def apply[F[_]: Sync: MonadCancelThrow, V](
+  def apply[F[_]: Sync, V](
       jedisSentinelPool: JedisSentinelPool
   )(implicit config: CacheConfig, codec: Codec[V]): SentinelRedisCache[F, V] =
     new SentinelRedisCache[F, V](jedisSentinelPool)

diff --git a/modules/redis/src/main/scala/scalacache/redis/ShardedRedisCache.scala b/modules/redis/src/main/scala/scalacache/redis/ShardedRedisCache.scala
@@ -6,17 +6,16 @@ import scala.collection.JavaConverters._
 import scala.language.higherKinds
 import scalacache.CacheConfig
 import scalacache.serialization.Codec
-import cats.effect.{MonadCancel, MonadCancelThrow, Sync}
+import cats.effect.{MonadCancel, Sync}
 
 /** Thin wrapper around Jedis that works with sharded Redis.
   */
-class ShardedRedisCache[F[_]: Sync: MonadCancelThrow, V](val jedisPool: ShardedJedisPool)(implicit
+class ShardedRedisCache[F[_]: Sync, V](val jedisPool: ShardedJedisPool)(implicit
     val config: CacheConfig,
     val codec: Codec[V]
 ) extends RedisCacheBase[F, V] {
 
-  protected def F: Sync[F]                             = Sync[F]
-  protected def MonadCancelThrowF: MonadCancelThrow[F] = MonadCancel[F, Throwable]
+  protected def F: Sync[F] = Sync[F]
 
   type JClient = ShardedJedis
 
@@ -32,7 +31,7 @@ object ShardedRedisCache {
 
   /** Create a sharded Redis client connecting to the given hosts and use it for caching
     */
-  def apply[F[_]: Sync: MonadCancelThrow, V](
+  def apply[F[_]: Sync, V](
       hosts: (String, Int)*
   )(implicit config: CacheConfig, codec: Codec[V]): ShardedRedisCache[F, V] = {
     val shards = hosts.map { case (host, port) =>
@@ -46,7 +45,7 @@ object ShardedRedisCache {
     * @param jedisPool
     *   a ShardedJedis pool
     */
-  def apply[F[_]: Sync: MonadCancelThrow, V](
+  def apply[F[_]: Sync, V](
       jedisPool: ShardedJedisPool
   )(implicit config: CacheConfig, codec: Codec[V]): ShardedRedisCache[F, V] =
     new ShardedRedisCache[F, V](jedisPool)