From 887d02586c02d784d8906249b0170af38543a9d8 Mon Sep 17 00:00:00 2001
From: xuwei-k <6b656e6a69@gmail.com>
Date: Sat, 3 Jul 2021 17:09:07 +0900
Subject: [PATCH] add explicit type annotations for implicit val and def

---
 core/play/src/main/scala/play/api/controllers/Assets.scala | 2 +-
 core/play/src/main/scala/play/api/mvc/Binders.scala        | 4 +++-
 core/play/src/main/scala/play/api/mvc/Cookie.scala         | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/play/src/main/scala/play/api/controllers/Assets.scala b/core/play/src/main/scala/play/api/controllers/Assets.scala
index 222eff2fa1e..6505560df03 100644
--- a/core/play/src/main/scala/play/api/controllers/Assets.scala
+++ b/core/play/src/main/scala/play/api/controllers/Assets.scala
@@ -703,7 +703,7 @@ object Assets {
     }
 
     // This uses StaticAssetsMetadata to obtain the full path to the asset.
-    implicit def assetPathBindable(implicit rrc: ReverseRouteContext) = new PathBindable[Asset] {
+    implicit def assetPathBindable(implicit rrc: ReverseRouteContext): PathBindable[Asset] = new PathBindable[Asset] {
       def bind(key: String, value: String) = Right(new Asset(value))
 
       def unbind(key: String, value: Asset): String = {
diff --git a/core/play/src/main/scala/play/api/mvc/Binders.scala b/core/play/src/main/scala/play/api/mvc/Binders.scala
index e25c7ccc406..48482ff9e86 100644
--- a/core/play/src/main/scala/play/api/mvc/Binders.scala
+++ b/core/play/src/main/scala/play/api/mvc/Binders.scala
@@ -618,7 +618,9 @@ object QueryStringBindable {
   /**
    * QueryString binder for QueryStringBindable.
    */
-  implicit def javaQueryStringBindable[T <: play.mvc.QueryStringBindable[T]](implicit ct: ClassTag[T]) =
+  implicit def javaQueryStringBindable[T <: play.mvc.QueryStringBindable[T]](
+      implicit ct: ClassTag[T]
+  ): QueryStringBindable[T] =
     new QueryStringBindable[T] {
       def bind(key: String, params: Map[String, Seq[String]]) = {
         try {
diff --git a/core/play/src/main/scala/play/api/mvc/Cookie.scala b/core/play/src/main/scala/play/api/mvc/Cookie.scala
index b5e51dc326f..8eb3f89abd5 100644
--- a/core/play/src/main/scala/play/api/mvc/Cookie.scala
+++ b/core/play/src/main/scala/play/api/mvc/Cookie.scala
@@ -212,7 +212,7 @@ object Cookies extends CookieHeaderEncoding {
 trait CookieHeaderEncoding {
   import play.core.cookie.encoding.DefaultCookie
 
-  private implicit val markerContext = SecurityMarkerContext
+  private implicit val markerContext: SecurityMarkerContext.type = SecurityMarkerContext
 
   protected def config: CookiesConfiguration