Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

avoid infix with _*. prepare Scala 3 #11325

Merged
merged 1 commit into from
Jun 14, 2022
Merged

avoid infix with _*. prepare Scala 3 #11325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/play/src/main/scala/play/api/mvc/Request.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ trait Request[+A] extends RequestHeader {
override def addAttrs(e1: TypedEntry[_], e2: TypedEntry[_], e3: TypedEntry[_]): Request[A] =
withAttrs(attrs + (e1, e2, e3))
override def addAttrs(entries: TypedEntry[_]*): Request[A] =
withAttrs(attrs + (entries: _*))
withAttrs(attrs.+(entries: _*))
override def removeAttr(key: TypedKey[_]): Request[A] =
withAttrs(attrs - key)
override def withTransientLang(lang: Lang): Request[A] =
Expand Down
2 changes: 1 addition & 1 deletion core/play/src/main/scala/play/api/mvc/RequestHeader.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ trait RequestHeader {
* @return The new version of this object with the new attributes.
*/
def addAttrs(entries: TypedEntry[_]*): RequestHeader =
withAttrs(attrs + (entries: _*))
withAttrs(attrs.+(entries: _*))

/**
* Create a new versions of this object with the given attribute removed.
Expand Down
2 changes: 1 addition & 1 deletion core/play/src/main/scala/play/api/mvc/Results.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ case class Result(
* @return The new version of this object with the new attributes.
*/
def addAttrs(entries: TypedEntry[_]*): Result =
withAttrs(attrs + (entries: _*))
withAttrs(attrs.+(entries: _*))

/**
* Create a new versions of this object with the given attribute removed.
Expand Down