Skip to content

Commit 47c20f8

Browse files
AppliedDualitybenjchristensen
authored andcommitted
Fixed ZipWithIndex using mutable state (not pretty)
1 parent f7e34eb commit 47c20f8

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,9 +310,8 @@ trait Observable[+T]
310310
* their index. Indices start at 0.
311311
*/
312312
def zipWithIndex: Observable[(T, Int)] = {
313-
val fScala: (T, Integer) => (T, Int) = (elem: T, index: Integer) => (elem, index)
314-
val fJava : Func2[_ >: T, Integer, _ <: (T, Int)] = fScala
315-
toScalaObservable[(T, Int)](asJavaObservable.mapWithIndex[(T, Int)](fJava))
313+
var n = 0;
314+
this.map(x => { val result = (x,n); n += 1; result })
316315
}
317316

318317
/**

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ include 'rxjava-core', \
33
'language-adaptors:rxjava-groovy', \
44
'language-adaptors:rxjava-clojure', \
55
'language-adaptors:rxjava-jruby', \
6-
//'language-adaptors:rxjava-scala', \
6+
'language-adaptors:rxjava-scala', \
77
//'language-adaptors:rxjava-kotlin', \
88
'rxjava-contrib:rxjava-swing', \
99
'rxjava-contrib:rxjava-android', \

0 commit comments

Comments
 (0)