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

[2.9.x] Fix unapply examples in ScalaForms docs (backport #12279) by @pschichtel #12402

Merged
merged 1 commit into from
Feb 26, 2024
Merged

[2.9.x] Fix unapply examples in ScalaForms docs (backport #12279) by @pschichtel #12402

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions documentation/manual/working/scalaGuide/main/forms/code/ScalaForms.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,19 +174,19 @@ package scalaguide.forms.scalaforms {
//#userData-define
case class UserData(name: String, age: Int)
object UserData {
def unapply(u: UserData): Option[(String, Int)] = Some(u.name, u.age)
def unapply(u: UserData): Option[(String, Int)] = Some((u.name, u.age))
}
//#userData-define

// #userData-nested
case class HomeAddressData(street: String, city: String)
object HomeAddressData {
def unapply(u: HomeAddressData): Option[(String, String)] = Some(u.street, u.city)
def unapply(u: HomeAddressData): Option[(String, String)] = Some((u.street, u.city))
}

case class WorkAddressData(street: String, city: String)
object WorkAddressData {
def unapply(w: WorkAddressData): Option[(String, String)] = Some(w.street, w.city)
def unapply(w: WorkAddressData): Option[(String, String)] = Some((w.street, w.city))
}

case class UserAddressData(name: String, homeAddress: HomeAddressData, workAddress: WorkAddressData)
Expand All @@ -200,21 +200,21 @@ package scalaguide.forms.scalaforms {
// #userListData
case class UserListData(name: String, emails: List[String])
object UserListData {
def unapply(u: UserListData): Option[(String, List[String])] = Some(u.name, u.emails)
def unapply(u: UserListData): Option[(String, List[String])] = Some((u.name, u.emails))
}
// #userListData

// #userData-optional
case class UserOptionalData(name: String, email: Option[String])
object UserOptionalData {
def unapply(u: UserOptionalData): Option[(String, Option[String])] = Some(u.name, u.email)
def unapply(u: UserOptionalData): Option[(String, Option[String])] = Some((u.name, u.email))
}
// #userData-optional

// #userData-custom-datatype
case class UserCustomData(name: String, website: java.net.URL)
object UserCustomData {
def unapply(u: UserCustomData): Option[(String, java.net.URL)] = Some(u.name, u.website)
def unapply(u: UserCustomData): Option[(String, java.net.URL)] = Some((u.name, u.website))
}
// #userData-custom-datatype
}
Expand Down Expand Up @@ -351,7 +351,7 @@ package scalaguide.forms.scalaforms {
"name" -> text,
"age" -> number,
"accept" -> checked("Please accept the terms and conditions")
)((name, age, _) => UserData(name, age))((user: UserData) => Some(user.name, user.age, false))
)((name, age, _) => UserData(name, age))((user: UserData) => Some((user.name, user.age, false)))
)
// #userForm-verify

Expand Down Expand Up @@ -494,7 +494,7 @@ package scalaguide.forms.scalaforms {

case class UserStaticData(id: Long, name: String, email: Option[String])
object UserStaticData {
def unapply(u: UserStaticData): Option[(Long, String, Option[String])] = Some(u.id, u.name, u.email)
def unapply(u: UserStaticData): Option[(Long, String, Option[String])] = Some((u.id, u.name, u.email))
}

// #userForm-static-value
Expand Down
Loading