Avoid unusual kind-projector syntax (#3186)

* Avoid unusual kind-projector syntax * Avoid *[_] in test
typelevel · Dec 10, 2019 · 2d7298c · 2d7298c
1 parent 4f8768f
commit 2d7298c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/core/src/main/scala/cats/data/Nested.scala b/core/src/main/scala/cats/data/Nested.scala
@@ -117,10 +117,12 @@ sealed abstract private[data] class NestedInstances3 extends NestedInstances4 {
 }
 
 sealed abstract private[data] class NestedInstances4 extends NestedInstances5 {
-  implicit def catsDataApplicativeErrorForNested[F[_]: ApplicativeError[*[_], E], G[_]: Applicative, E]
-    : ApplicativeError[Nested[F, G, *], E] =
+  implicit def catsDataApplicativeErrorForNested[F[_], G[_], E](
+    implicit F: ApplicativeError[F, E],
+    G0: Applicative[G]
+  ): ApplicativeError[Nested[F, G, *], E] =
     new NestedApplicativeError[F, G, E] {
-      val G: Applicative[G] = Applicative[G]
+      val G: Applicative[G] = G0
 
       val AEF: ApplicativeError[F, E] = ApplicativeError[F, E]
     }

diff --git a/tests/src/test/scala/cats/tests/OptionTSuite.scala b/tests/src/test/scala/cats/tests/OptionTSuite.scala
@@ -186,7 +186,7 @@ class OptionTSuite extends CatsSuite {
 
   test("MonadError[OptionT[F, *], E] instance has higher priority than MonadError[OptionT[F, *], Unit]") {
 
-    def shouldCompile[F[_]: MonadError[*[_], E], E](x: OptionT[F, Int], e: E): OptionT[F, Int] =
+    def shouldCompile[F[_], E](x: OptionT[F, Int], e: E)(implicit F: MonadError[F, E]): OptionT[F, Int] =
       x.ensure(e)(_ => true)
   }