Skip to content

Commit fe70c0a

Browse files
committed
Refactor Optional instances
1 parent 82415b5 commit fe70c0a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

core/src/main/scala/japgolly/scalajs/react/vdom/Optional.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ trait Optional[T[_]] {
88
}
99

1010
object Optional {
11-
implicit object OptionalOption extends Optional[Option] {
11+
implicit val optionInstance: Optional[Option] = new Optional[Option] {
1212
@inline final override def foreach[A](t: Option[A])(f: (A) => Unit): Unit = t foreach f
1313
@inline final override def fold[A, B](t: Option[A], f: A => B, b: => B): B = t.fold(b)(f)
1414
}
1515

16-
implicit object OptionalJsUndefOr extends Optional[UndefOr] {
16+
implicit val jsUndefOrInstance: Optional[UndefOr] = new Optional[UndefOr] {
1717
@inline final override def foreach[A](t: UndefOr[A])(f: (A) => Unit): Unit = t foreach f
1818
@inline final override def fold[A, B](t: UndefOr[A], f: A => B, b: => B): B = t.fold(b)(f)
1919
}

scalaz-7.1/src/main/scala/japgolly/scalajs/react/ScalazReact.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import Leibniz.===
1111

1212
object ScalazReact {
1313

14-
implicit object OptionalMaybe extends Optional[Maybe] {
14+
implicit val maybeInstance: Optional[Maybe] = new Optional[Maybe] {
1515
@inline final override def foreach[A](m: Maybe[A])(f: (A) => Unit): Unit = m.cata(f, ())
1616
@inline final override def fold[A, B](t: Maybe[A], f: A => B, b: => B): B = t.cata(f, b)
1717
}

sync-scala70

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ perl -pe '
1111
s/{Optional => _, _}/_/;
1212
' < $s1/$f > $s0/$f
1313
sed -i "
14-
/OptionalMaybe/,/^ *} *$/d;
14+
/Optional\[Maybe/,/^ *} *$/d;
1515
/^object/a\ // Don't edit this directly. Run $(basename "$0")
1616
" $s0/$f
1717

0 commit comments

Comments
 (0)