chore(perf): fix RxJS 3 flatMap calls

jeffbcross · Sep 19, 2015 · 5cbfd77 · 5cbfd77
1 parent 49484a2
commit 5cbfd77
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/perf/micro/current-thread-scheduler/operators/merge-map-observable-scalar.js b/perf/micro/current-thread-scheduler/operators/merge-map-observable-scalar.js
@@ -3,7 +3,7 @@ var RxNew = require("../../../../index");
 
 module.exports = function (suite) {
 
-    var oldMergeMapWithCurrentThreadScheduler = RxOld.Observable.range(0, 25, RxOld.Scheduler.currentThread).mergeMap(RxOld.Observable.return(0, RxOld.Scheduler.currentThread));
+    var oldMergeMapWithCurrentThreadScheduler = RxOld.Observable.range(0, 25, RxOld.Scheduler.currentThread).flatMap(RxOld.Observable.return(0, RxOld.Scheduler.currentThread));
     var newMergeMapWithCurrentThreadScheduler = RxNew.Observable.range(0, 25, RxNew.Scheduler.immediate).mergeMapTo(RxNew.Observable.of(0, RxNew.Scheduler.immediate));
 
     return suite

diff --git a/perf/micro/current-thread-scheduler/operators/merge-map-observable.js b/perf/micro/current-thread-scheduler/operators/merge-map-observable.js
@@ -3,7 +3,7 @@ var RxNew = require("../../../../index");
 
 module.exports = function (suite) {
 
-    var oldMergeMapWithCurrentThreadScheduler = RxOld.Observable.range(0, 25, RxOld.Scheduler.currentThread).mergeMap(RxOld.Observable.range(0, 25, RxOld.Scheduler.currentThread));
+    var oldMergeMapWithCurrentThreadScheduler = RxOld.Observable.range(0, 25, RxOld.Scheduler.currentThread).flatMap(RxOld.Observable.range(0, 25, RxOld.Scheduler.currentThread));
     var newMergeMapWithCurrentThreadScheduler = RxNew.Observable.range(0, 25, RxNew.Scheduler.immediate).mergeMapTo(RxNew.Observable.range(0, 25, RxNew.Scheduler.immediate));
 
     return suite

diff --git a/perf/micro/current-thread-scheduler/operators/merge-map-scalar.js b/perf/micro/current-thread-scheduler/operators/merge-map-scalar.js
@@ -3,7 +3,7 @@ var RxNew = require("../../../../index");
 
 module.exports = function (suite) {
 
-    var oldMergeMapWithCurrentThreadScheduler = RxOld.Observable.range(0, 25, RxOld.Scheduler.currentThread).mergeMap(function (x) { return RxOld.Observable.return(x, RxOld.Scheduler.currentThread); });
+    var oldMergeMapWithCurrentThreadScheduler = RxOld.Observable.range(0, 25, RxOld.Scheduler.currentThread).flatMap(function (x) { return RxOld.Observable.return(x, RxOld.Scheduler.currentThread); });
     var newMergeMapWithCurrentThreadScheduler = RxNew.Observable.range(0, 25, RxNew.Scheduler.immediate).mergeMap(function (x) { return RxNew.Observable.of(x); });
 
     return suite

diff --git a/perf/micro/current-thread-scheduler/operators/merge-map.js b/perf/micro/current-thread-scheduler/operators/merge-map.js
@@ -3,7 +3,7 @@ var RxNew = require("../../../../index");
 
 module.exports = function (suite) {
 
-    var oldMergeMapWithCurrentThreadScheduler = RxOld.Observable.range(0, 25, RxOld.Scheduler.currentThread).mergeMap(function (x) { return RxOld.Observable.range(x, 25, RxOld.Scheduler.currentThread); });
+    var oldMergeMapWithCurrentThreadScheduler = RxOld.Observable.range(0, 25, RxOld.Scheduler.currentThread).flatMap(function (x) { return RxOld.Observable.range(x, 25, RxOld.Scheduler.currentThread); });
     var newMergeMapWithCurrentThreadScheduler = RxNew.Observable.range(0, 25, RxNew.Scheduler.immediate).mergeMap(function (x) { return RxNew.Observable.range(x, 25, RxNew.Scheduler.immediate); });
 
     return suite

diff --git a/perf/micro/immediate-scheduler/operators/merge-map-observable-scalar.js b/perf/micro/immediate-scheduler/operators/merge-map-observable-scalar.js
@@ -3,7 +3,7 @@ var RxNew = require("../../../../index");
 
 module.exports = function (suite) {
 
-    var oldMergeMapWithImmediateScheduler = RxOld.Observable.range(0, 25, RxOld.Scheduler.immediate).mergeMap(RxOld.Observable.return(0, RxOld.Scheduler.immediate));
+    var oldMergeMapWithImmediateScheduler = RxOld.Observable.range(0, 25, RxOld.Scheduler.immediate).flatMap(RxOld.Observable.return(0, RxOld.Scheduler.immediate));
     var newMergeMapWithImmediateScheduler = RxNew.Observable.range(0, 25).mergeMapTo(RxNew.Observable.of(0));
 
     return suite

diff --git a/perf/micro/immediate-scheduler/operators/merge-map-observable.js b/perf/micro/immediate-scheduler/operators/merge-map-observable.js
@@ -3,7 +3,7 @@ var RxNew = require("../../../../index");
 
 module.exports = function (suite) {
 
-    var oldMergeMapWithImmediateScheduler = RxOld.Observable.range(0, 25, RxOld.Scheduler.immediate).mergeMap(RxOld.Observable.range(0, 25, RxOld.Scheduler.immediate));
+    var oldMergeMapWithImmediateScheduler = RxOld.Observable.range(0, 25, RxOld.Scheduler.immediate).flatMap(RxOld.Observable.range(0, 25, RxOld.Scheduler.immediate));
     var newMergeMapWithImmediateScheduler = RxNew.Observable.range(0, 25).mergeMapTo(RxNew.Observable.range(0, 25));
 
     return suite

diff --git a/perf/micro/immediate-scheduler/operators/merge-map-scalar.js b/perf/micro/immediate-scheduler/operators/merge-map-scalar.js
@@ -3,7 +3,7 @@ var RxNew = require("../../../../index");
 
 module.exports = function (suite) {
 
-    var oldMergeMapWithImmediateScheduler = RxOld.Observable.range(0, 25, RxOld.Scheduler.immediate).mergeMap(function (x) { return RxOld.Observable.return(x, RxOld.Scheduler.immediate); });
+    var oldMergeMapWithImmediateScheduler = RxOld.Observable.range(0, 25, RxOld.Scheduler.immediate).flatMap(function (x) { return RxOld.Observable.return(x, RxOld.Scheduler.immediate); });
     var newMergeMapWithImmediateScheduler = RxNew.Observable.range(0, 25).mergeMap(function (x) { return RxNew.Observable.of(x); });
 
     return suite

diff --git a/perf/micro/immediate-scheduler/operators/merge-map.js b/perf/micro/immediate-scheduler/operators/merge-map.js
@@ -3,7 +3,7 @@ var RxNew = require("../../../../index");
 
 module.exports = function (suite) {
 
-    var oldMergeMapWithImmediateScheduler = RxOld.Observable.range(0, 25, RxOld.Scheduler.immediate).mergeMap(function (x) { return RxOld.Observable.range(x, 25, RxOld.Scheduler.immediate); });
+    var oldMergeMapWithImmediateScheduler = RxOld.Observable.range(0, 25, RxOld.Scheduler.immediate).flatMap(function (x) { return RxOld.Observable.range(x, 25, RxOld.Scheduler.immediate); });
     var newMergeMapWithImmediateScheduler = RxNew.Observable.range(0, 25).mergeMap(function (x) { return RxNew.Observable.range(x, 25); });
 
     return suite