Baseline accept

Author: gcnew

tests/baselines/reference/functionConstraintSatisfaction3.errors.txt

@@ -1,16 +1,16 @@
-tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3.ts(48,6): error TS2345: Argument of type '(x: string, y: string) => string' is not assignable to parameter of type '(x: string, y: number) => string'.
+tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3.ts(50,6): error TS2345: Argument of type '(x: string, y: string) => string' is not assignable to parameter of type '(x: string, y: number) => string'.
   Types of parameters 'y' and 'y' are incompatible.
     Type 'number' is not assignable to type 'string'.
-tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3.ts(49,7): error TS2345: Argument of type '(x: string, y: string) => string' is not assignable to parameter of type '(x: string, y: number) => string'.
+tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3.ts(51,7): error TS2345: Argument of type '(x: string, y: string) => string' is not assignable to parameter of type '(x: string, y: number) => string'.
   Types of parameters 'y' and 'y' are incompatible.
     Type 'number' is not assignable to type 'string'.
-tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3.ts(55,12): error TS2345: Argument of type '(x: number) => number' is not assignable to parameter of type '(x: string) => string'.
+tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3.ts(59,12): error TS2345: Argument of type '(x: number) => number' is not assignable to parameter of type '(x: string) => string'.
   Types of parameters 'x' and 'x' are incompatible.
     Type 'string' is not assignable to type 'number'.
-tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3.ts(56,11): error TS2345: Argument of type '(x: number) => number' is not assignable to parameter of type '(x: string) => string'.
+tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3.ts(60,11): error TS2345: Argument of type '(x: number) => number' is not assignable to parameter of type '(x: string) => string'.
   Types of parameters 'x' and 'x' are incompatible.
     Type 'string' is not assignable to type 'number'.
-tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3.ts(64,17): error TS2345: Argument of type '(x: number) => number' is not assignable to parameter of type '(x: string) => string'.
+tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3.ts(70,17): error TS2345: Argument of type '(x: number) => number' is not assignable to parameter of type '(x: string) => string'.
   Types of parameters 'x' and 'x' are incompatible.
     Type 'string' is not assignable to type 'number'.
 
@@ -59,9 +59,11 @@ tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstrain
     var r15 = foo(c2);
 
     declare function id2<T>(x: T, y: T): T;
+    declare function id3<T>(x: T, y: T, z: T): T;
 
     declare function boom<R>(f: (x: string, y: number) => R): R;
     declare function boom2(f: (x: string, y: number) => string): void;
+    declare function boom3<R>(f: (x: string, y: number, z: R) => R): R;
 
     boom(id2);  // Should be an error T = [string, number]
          ~~~
@@ -73,6 +75,8 @@ tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstrain
 !!! error TS2345: Argument of type '(x: string, y: string) => string' is not assignable to parameter of type '(x: string, y: number) => string'.
 !!! error TS2345:   Types of parameters 'y' and 'y' are incompatible.
 !!! error TS2345:     Type 'number' is not assignable to type 'string'.
+    boom<string|number>(id2);   // Should be OK
+    boom3<string|number>(id3);  // Should be OK
 
     declare function withNum<N extends number>(x: N): N;
     declare function withString<S extends string>(f: (x: S) => S): void;
@@ -90,9 +94,11 @@ tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstrain
 !!! error TS2345:     Type 'string' is not assignable to type 'number'.
 
     declare function okay<R>(f: (x: 1, y: number) => R): R;
+    declare function okay2(f: (x: string, y: number) => string|number);
     declare function transitive<T>(x: T, f: (x: T) => T): void;
 
     okay(id2);
+    okay2(id2);
 
     transitive(1, withNum);
     transitive('1', withNum);

tests/baselines/reference/functionConstraintSatisfaction3.js

@@ -42,12 +42,16 @@ var r12 = foo(i2);
 var r15 = foo(c2);
 
 declare function id2<T>(x: T, y: T): T;
+declare function id3<T>(x: T, y: T, z: T): T;
 
 declare function boom<R>(f: (x: string, y: number) => R): R;
 declare function boom2(f: (x: string, y: number) => string): void;
+declare function boom3<R>(f: (x: string, y: number, z: R) => R): R;
 
 boom(id2);  // Should be an error T = [string, number]
 boom2(id2); // Should be an error T = [string, number]
+boom<string|number>(id2);   // Should be OK
+boom3<string|number>(id3);  // Should be OK
 
 declare function withNum<N extends number>(x: N): N;
 declare function withString<S extends string>(f: (x: S) => S): void;
@@ -57,9 +61,11 @@ withString(withNum);  // Error
 useString(withNum);   // Error
 
 declare function okay<R>(f: (x: 1, y: number) => R): R;
+declare function okay2(f: (x: string, y: number) => string|number);
 declare function transitive<T>(x: T, f: (x: T) => T): void;
 
 okay(id2);
+okay2(id2);
 
 transitive(1, withNum);
 transitive('1', withNum);
@@ -98,8 +104,11 @@ var r12 = foo(i2);
 var r15 = foo(c2);
 boom(id2); // Should be an error T = [string, number]
 boom2(id2); // Should be an error T = [string, number]
+boom(id2); // Should be OK
+boom3(id3); // Should be OK
 withString(withNum); // Error
 useString(withNum); // Error
 okay(id2);
+okay2(id2);
 transitive(1, withNum);
 transitive('1', withNum);

tests/baselines/reference/promisePermutations.errors.txt

@@ -31,17 +31,17 @@ tests/cases/compiler/promisePermutations.ts(110,19): error TS2345: Argument of t
 tests/cases/compiler/promisePermutations.ts(111,19): error TS2345: Argument of type '(cb: <T>(a: T) => T) => Promise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
   Types of parameters 'cb' and 'value' are incompatible.
     Type 'string' is not assignable to type '<T>(a: T) => T'.
-tests/cases/compiler/promisePermutations.ts(117,19): error TS2345: Argument of type '(x: number, cb: (a: number) => number) => IPromise<number>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
-tests/cases/compiler/promisePermutations.ts(120,19): error TS2345: Argument of type '(x: number, cb: (a: number) => number) => IPromise<number>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
-tests/cases/compiler/promisePermutations.ts(121,19): error TS2345: Argument of type '(x: number, cb: (a: number) => number) => Promise<number>' is not assignable to parameter of type '(value: number) => Promise<any>'.
-tests/cases/compiler/promisePermutations.ts(122,19): error TS2345: Argument of type '(x: number, cb: (a: number) => number) => Promise<number>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
-tests/cases/compiler/promisePermutations.ts(126,19): error TS2345: Argument of type '(x: number, cb: <U>(a: U) => U) => IPromise<number>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
+tests/cases/compiler/promisePermutations.ts(117,19): error TS2345: Argument of type '(x: any, cb: (a: any) => any) => IPromise<any>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
+tests/cases/compiler/promisePermutations.ts(120,19): error TS2345: Argument of type '(x: any, cb: (a: any) => any) => IPromise<any>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
+tests/cases/compiler/promisePermutations.ts(121,19): error TS2345: Argument of type '(x: any, cb: (a: any) => any) => Promise<any>' is not assignable to parameter of type '(value: number) => Promise<any>'.
+tests/cases/compiler/promisePermutations.ts(122,19): error TS2345: Argument of type '(x: any, cb: (a: any) => any) => Promise<any>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
+tests/cases/compiler/promisePermutations.ts(126,19): error TS2345: Argument of type '(x: any, cb: <U>(a: U) => U) => IPromise<any>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
 tests/cases/compiler/promisePermutations.ts(129,11): error TS2453: The type argument for type parameter 'U' cannot be inferred from the usage. Consider specifying the type arguments explicitly.
   Type argument candidate 'IPromise<number>' is not a valid type argument because it is not a supertype of candidate 'IPromise<string>'.
     Type 'string' is not assignable to type 'number'.
-tests/cases/compiler/promisePermutations.ts(132,19): error TS2345: Argument of type '(x: number, cb: <U>(a: U) => U) => IPromise<number>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
-tests/cases/compiler/promisePermutations.ts(133,19): error TS2345: Argument of type '(x: number, cb: <U>(a: U) => U) => Promise<number>' is not assignable to parameter of type '(value: number) => Promise<any>'.
-tests/cases/compiler/promisePermutations.ts(134,19): error TS2345: Argument of type '(x: number, cb: <U>(a: U) => U) => Promise<number>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
+tests/cases/compiler/promisePermutations.ts(132,19): error TS2345: Argument of type '(x: any, cb: <U>(a: U) => U) => IPromise<any>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
+tests/cases/compiler/promisePermutations.ts(133,19): error TS2345: Argument of type '(x: any, cb: <U>(a: U) => U) => Promise<any>' is not assignable to parameter of type '(value: number) => Promise<any>'.
+tests/cases/compiler/promisePermutations.ts(134,19): error TS2345: Argument of type '(x: any, cb: <U>(a: U) => U) => Promise<any>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
 tests/cases/compiler/promisePermutations.ts(137,11): error TS2453: The type argument for type parameter 'U' cannot be inferred from the usage. Consider specifying the type arguments explicitly.
   Type argument candidate 'IPromise<number>' is not a valid type argument because it is not a supertype of candidate 'IPromise<string>'.
 tests/cases/compiler/promisePermutations.ts(144,12): error TS2453: The type argument for type parameter 'U' cannot be inferred from the usage. Consider specifying the type arguments explicitly.
@@ -239,24 +239,24 @@ tests/cases/compiler/promisePermutations.ts(160,21): error TS2345: Argument of t
     var nPromise: (x: any) => Promise<number>;
     var r8a = r8.then(testFunction8, testFunction8, testFunction8); // error
                       ~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '(x: number, cb: (a: number) => number) => IPromise<number>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
+!!! error TS2345: Argument of type '(x: any, cb: (a: any) => any) => IPromise<any>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
     var r8b = r8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nIPromise); // ok
     var s8: Promise<number>;
     var s8a = s8.then(testFunction8, testFunction8, testFunction8); // error
                       ~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '(x: number, cb: (a: number) => number) => IPromise<number>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
+!!! error TS2345: Argument of type '(x: any, cb: (a: any) => any) => IPromise<any>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
     var s8b = s8.then(testFunction8P, testFunction8P, testFunction8P); // error
                       ~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '(x: number, cb: (a: number) => number) => Promise<number>' is not assignable to parameter of type '(value: number) => Promise<any>'.
+!!! error TS2345: Argument of type '(x: any, cb: (a: any) => any) => Promise<any>' is not assignable to parameter of type '(value: number) => Promise<any>'.
     var s8c = s8.then(testFunction8P, testFunction8, testFunction8); // error
                       ~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '(x: number, cb: (a: number) => number) => Promise<number>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
+!!! error TS2345: Argument of type '(x: any, cb: (a: any) => any) => Promise<any>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
     var s8d = s8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nIPromise); // ok
 
     var r9: IPromise<number>;
     var r9a = r9.then(testFunction9, testFunction9, testFunction9); // error
                       ~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '(x: number, cb: <U>(a: U) => U) => IPromise<number>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
+!!! error TS2345: Argument of type '(x: any, cb: <U>(a: U) => U) => IPromise<any>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
     var r9b = r9.then(sIPromise, sIPromise, sIPromise); // ok
     var r9c = r9.then(nIPromise, nIPromise, nIPromise); // ok
     var r9d = r9.then(testFunction, sIPromise, nIPromise); // ok
@@ -268,13 +268,13 @@ tests/cases/compiler/promisePermutations.ts(160,21): error TS2345: Argument of t
     var s9: Promise<number>;
     var s9a = s9.then(testFunction9, testFunction9, testFunction9); // error
                       ~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '(x: number, cb: <U>(a: U) => U) => IPromise<number>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
+!!! error TS2345: Argument of type '(x: any, cb: <U>(a: U) => U) => IPromise<any>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
     var s9b = s9.then(testFunction9P, testFunction9P, testFunction9P); // error
                       ~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '(x: number, cb: <U>(a: U) => U) => Promise<number>' is not assignable to parameter of type '(value: number) => Promise<any>'.
+!!! error TS2345: Argument of type '(x: any, cb: <U>(a: U) => U) => Promise<any>' is not assignable to parameter of type '(value: number) => Promise<any>'.
     var s9c = s9.then(testFunction9P, testFunction9, testFunction9); // error
                       ~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '(x: number, cb: <U>(a: U) => U) => Promise<number>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
+!!! error TS2345: Argument of type '(x: any, cb: <U>(a: U) => U) => Promise<any>' is not assignable to parameter of type '(value: number) => IPromise<any>'.
     var s9d = s9.then(sPromise, sPromise, sPromise); // ok
     var s9e = s9.then(nPromise, nPromise, nPromise); // ok
     var s9f = s9.then(testFunction, sIPromise, nIPromise); // error