From 603c9eb1e0cb97f0904734e594dce398776306bb Mon Sep 17 00:00:00 2001
From: Asad Saeeduddin <masaeedu@gmail.com>
Date: Sun, 7 Feb 2016 09:02:45 -0500
Subject: [PATCH] fix(typings): remove redundant generics from call<T, R> and
 lift<T, R>

---
 src/Observable.ts             | 2 +-
 src/Operator.ts               | 2 +-
 src/operator/combineLatest.ts | 4 ++--
 src/operator/concat.ts        | 2 +-
 src/operator/merge.ts         | 2 +-
 src/operator/mergeMapTo.ts    | 6 ++++--
 src/operator/zip.ts           | 2 +-
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/Observable.ts b/src/Observable.ts
index 2d01451fea..f8d01d5b54 100644
--- a/src/Observable.ts
+++ b/src/Observable.ts
@@ -101,7 +101,7 @@ export class Observable<T> implements CoreOperators<T>  {
    * @description creates a new Observable, with this Observable as the source, and the passed
    * operator defined as the new observable's operator.
    */
-  lift<T, R>(operator: Operator<T, R>): Observable<R> {
+  lift<R>(operator: Operator<T, R>): Observable<R> {
     const observable = new Observable<R>();
     observable.source = this;
     observable.operator = operator;
diff --git a/src/Operator.ts b/src/Operator.ts
index 03cf00bc05..68c10e7916 100644
--- a/src/Operator.ts
+++ b/src/Operator.ts
@@ -1,7 +1,7 @@
 import {Subscriber} from './Subscriber';
 
 export class Operator<T, R> {
-  call<T, R>(subscriber: Subscriber<R>): Subscriber<T> {
+  call<R>(subscriber: Subscriber<R>): Subscriber<T> {
     return new Subscriber<T>(subscriber);
   }
 }
diff --git a/src/operator/combineLatest.ts b/src/operator/combineLatest.ts
index 3242f9b541..240ba12d9c 100644
--- a/src/operator/combineLatest.ts
+++ b/src/operator/combineLatest.ts
@@ -35,7 +35,7 @@ export function combineLatest<T, R>(...observables: Array<ObservableInput<any> |
 
   observables.unshift(this);
 
-  return new ArrayObservable(observables).lift<T, R>(new CombineLatestOperator<T, R>(project));
+  return new ArrayObservable(observables).lift(new CombineLatestOperator(project));
 }
 
 /* tslint:disable:max-line-length */
@@ -107,7 +107,7 @@ export function combineLatestStatic<T, R>(...observables: Array<any | Observable
     observables = <Array<Observable<any>>>observables[0];
   }
 
-  return new ArrayObservable(observables, scheduler).lift<T, R>(new CombineLatestOperator<T, R>(project));
+  return new ArrayObservable(observables, scheduler).lift(new CombineLatestOperator<T, R>(project));
 }
 
 export class CombineLatestOperator<T, R> implements Operator<T, R> {
diff --git a/src/operator/concat.ts b/src/operator/concat.ts
index a11d0c5f01..e4594c9c56 100644
--- a/src/operator/concat.ts
+++ b/src/operator/concat.ts
@@ -30,5 +30,5 @@ export function concatStatic<T, R>(...observables: Array<Observable<any> | Sched
     scheduler = args.pop();
   }
 
-  return new ArrayObservable(observables, scheduler).lift<Observable<T>, T | R>(new MergeAllOperator<T | R>(1));
+  return new ArrayObservable(observables, scheduler).lift(new MergeAllOperator<T | R>(1));
 }
diff --git a/src/operator/merge.ts b/src/operator/merge.ts
index e2a7f5621b..2c6984fcb7 100644
--- a/src/operator/merge.ts
+++ b/src/operator/merge.ts
@@ -34,5 +34,5 @@ export function mergeStatic<T, R>(...observables: Array<Observable<any> | Schedu
     return <Observable<R>>observables[0];
   }
 
-  return new ArrayObservable<Observable<T>>(<any>observables, scheduler).lift<Observable<T>, R>(new MergeAllOperator<R>(concurrent));
+  return new ArrayObservable(<any>observables, scheduler).lift(new MergeAllOperator<R>(concurrent));
 }
diff --git a/src/operator/mergeMapTo.ts b/src/operator/mergeMapTo.ts
index b6b40ef05d..0d08f352b3 100644
--- a/src/operator/mergeMapTo.ts
+++ b/src/operator/mergeMapTo.ts
@@ -13,13 +13,15 @@ export function mergeMapTo<T, R, R2>(observable: Observable<R>,
   return this.lift(new MergeMapToOperator(observable, <any>resultSelector, concurrent));
 }
 
+// TODO: Figure out correct signature here: an Operator<Observable<T>, R2>
+//       needs to implement call(observer: Subscriber<R2>): Subscriber<Observable<T>>
 export class MergeMapToOperator<T, R, R2> implements Operator<Observable<T>, R2> {
   constructor(private ish: Observable<R> | Promise<R>,
               private resultSelector?: (outerValue: T, innerValue: R, outerIndex: number, innerIndex: number) => R2,
               private concurrent: number = Number.POSITIVE_INFINITY) {
-    }
+  }
 
-  call(observer: Subscriber<R2>): Subscriber<T> {
+  call(observer: Subscriber<R2>): Subscriber<any> {
     return new MergeMapToSubscriber(observer, this.ish, this.resultSelector, this.concurrent);
   }
 }
diff --git a/src/operator/zip.ts b/src/operator/zip.ts
index 723f990e6b..f0e0e592df 100644
--- a/src/operator/zip.ts
+++ b/src/operator/zip.ts
@@ -57,7 +57,7 @@ export function zipStatic<T, R>(...observables: Array<ObservableInput<any> | ((.
   if (typeof project === 'function') {
     observables.pop();
   }
-  return new ArrayObservable(observables).lift<T, R>(new ZipOperator<T, R>(project));
+  return new ArrayObservable(observables).lift(new ZipOperator(project));
 }
 
 export class ZipOperator<T, R> implements Operator<T, R> {