Skip to content

Commit 01f5464

Browse files
rename fold to foldLeft
1 parent b90634d commit 01f5464

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

language-adaptors/rxjava-scala/src/examples/scala/rx/lang/scala/examples/RxScalaDemo.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ class RxScalaDemo extends JUnitSuite {
289289
// We can't put a general average method into Observable.scala, because Scala's Numeric
290290
// does not have scalar multiplication (we would need to calculate (1.0/numberOfElements)*sum)
291291
def doubleAverage(o: Observable[Double]): Observable[Double] = {
292-
for ((finalSum, finalCount) <- o.fold((0.0, 0))({case ((sum, count), elem) => (sum+elem, count+1)}))
292+
for ((finalSum, finalCount) <- o.foldLeft((0.0, 0))({case ((sum, count), elem) => (sum+elem, count+1)}))
293293
yield finalSum / finalCount
294294
}
295295

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/Observable.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,7 @@ class Observable[+T] private[scala] (val asJava: rx.Observable[_ <: T])
10381038
* @return an Observable that emits a single item that is the result of accumulating the output
10391039
* from the items emitted by the source Observable
10401040
*/
1041-
def fold[R](initialValue: R)(accumulator: (R, T) => R): Observable[R] = {
1041+
def foldLeft[R](initialValue: R)(accumulator: (R, T) => R): Observable[R] = {
10421042
Observable[R](asJava.reduce(initialValue, accumulator))
10431043
}
10441044

@@ -1117,7 +1117,7 @@ class Observable[+T] private[scala] (val asJava: rx.Observable[_ <: T])
11171117
// type mismatch; found : rx.Observable[java.lang.Boolean] required: rx.Observable[_ <: scala.Boolean]
11181118
// new Observable[Boolean](asJava.all(predicate))
11191119
// it's more fun in Scala:
1120-
this.map(predicate).fold(true)(_ && _)
1120+
this.map(predicate).foldLeft(true)(_ && _)
11211121
}
11221122

11231123
/**
@@ -1566,7 +1566,7 @@ class Observable[+T] private[scala] (val asJava: rx.Observable[_ <: T])
15661566
* @inheritdoc
15671567
*/
15681568
def sum[U >: T](implicit num: Numeric[U]): Observable[U] = {
1569-
fold(num.zero)(num.plus)
1569+
foldLeft(num.zero)(num.plus)
15701570
}
15711571

15721572
/**
@@ -1582,7 +1582,7 @@ class Observable[+T] private[scala] (val asJava: rx.Observable[_ <: T])
15821582
* @inheritdoc
15831583
*/
15841584
def product[U >: T](implicit num: Numeric[U]): Observable[U] = {
1585-
fold(num.one)(num.times)
1585+
foldLeft(num.one)(num.times)
15861586
}
15871587

15881588
/**
@@ -1598,7 +1598,7 @@ class Observable[+T] private[scala] (val asJava: rx.Observable[_ <: T])
15981598
* if the source Observable completes without emitting any item.
15991599
*/
16001600
def firstOrElse[U >: T](default: => U): Observable[U] = {
1601-
this.take(1).fold[Option[U]](None)((v: Option[U], e: U) => Some(e)).map({
1601+
this.take(1).foldLeft[Option[U]](None)((v: Option[U], e: U) => Some(e)).map({
16021602
case Some(element) => element
16031603
case None => default
16041604
})

0 commit comments

Comments
 (0)