Skip to content

Commit

Permalink
Merge pull request #10914 from xuwei-k/explicit-types
Browse files Browse the repository at this point in the history
add explicit type annotations for implicit val and def
  • Loading branch information
mergify[bot] committed Jul 9, 2021
2 parents f354f6c + 887d025 commit 2464d6b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion core/play/src/main/scala/play/api/controllers/Assets.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
4 changes: 3 additions & 1 deletion core/play/src/main/scala/play/api/mvc/Binders.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion core/play/src/main/scala/play/api/mvc/Cookie.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 2464d6b

Please sign in to comment.