Skip to content

Commit 86930c9

Browse files
committed
Accept new baselines
1 parent e3b1487 commit 86930c9

7 files changed

+26
-74
lines changed

tests/baselines/reference/arityAndOrderCompatibility01.errors.txt

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,11 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(14,12): erro
33
tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(15,5): error TS2461: Type '{ 0: string; 1: number; }' is not an array type.
44
tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(15,12): error TS2460: Type '{ 0: string; 1: number; }' has no property '2'.
55
tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(16,5): error TS2322: Type '[string, number]' is not assignable to type '[number, number, number]'.
6-
Types of property '0' are incompatible.
7-
Type 'string' is not assignable to type 'number'.
6+
Property '2' is missing in type '[string, number]'.
87
tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(17,5): error TS2322: Type 'StrNum' is not assignable to type '[number, number, number]'.
9-
Types of property '0' are incompatible.
10-
Type 'string' is not assignable to type 'number'.
8+
Property '2' is missing in type 'StrNum'.
119
tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(18,5): error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[number, number, number]'.
12-
Types of property '0' are incompatible.
13-
Type 'string' is not assignable to type 'number'.
10+
Property '2' is missing in type '{ 0: string; 1: number; }'.
1411
tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(19,5): error TS2322: Type '[string, number]' is not assignable to type '[string, number, number]'.
1512
Property '2' is missing in type '[string, number]'.
1613
tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(20,5): error TS2322: Type 'StrNum' is not assignable to type '[string, number, number]'.
@@ -24,8 +21,7 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(23,5): error
2421
Types of property '0' are incompatible.
2522
Type 'string' is not assignable to type 'number'.
2623
tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(24,5): error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[number]'.
27-
Types of property '0' are incompatible.
28-
Type 'string' is not assignable to type 'number'.
24+
Property 'length' is missing in type '{ 0: string; 1: number; }'.
2925
tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(25,5): error TS2322: Type '[string, number]' is not assignable to type '[string]'.
3026
Types of property 'pop' are incompatible.
3127
Type '() => string | number' is not assignable to type '() => string'.
@@ -44,8 +40,7 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(29,5): error
4440
Types of property '0' are incompatible.
4541
Type 'string' is not assignable to type 'number'.
4642
tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(30,5): error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[number, string]'.
47-
Types of property '0' are incompatible.
48-
Type 'string' is not assignable to type 'number'.
43+
Property 'length' is missing in type '{ 0: string; 1: number; }'.
4944

5045

5146
==== tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts (19 errors) ====
@@ -75,18 +70,15 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(30,5): error
7570
var j1: [number, number, number] = x;
7671
~~
7772
!!! error TS2322: Type '[string, number]' is not assignable to type '[number, number, number]'.
78-
!!! error TS2322: Types of property '0' are incompatible.
79-
!!! error TS2322: Type 'string' is not assignable to type 'number'.
73+
!!! error TS2322: Property '2' is missing in type '[string, number]'.
8074
var j2: [number, number, number] = y;
8175
~~
8276
!!! error TS2322: Type 'StrNum' is not assignable to type '[number, number, number]'.
83-
!!! error TS2322: Types of property '0' are incompatible.
84-
!!! error TS2322: Type 'string' is not assignable to type 'number'.
77+
!!! error TS2322: Property '2' is missing in type 'StrNum'.
8578
var j3: [number, number, number] = z;
8679
~~
8780
!!! error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[number, number, number]'.
88-
!!! error TS2322: Types of property '0' are incompatible.
89-
!!! error TS2322: Type 'string' is not assignable to type 'number'.
81+
!!! error TS2322: Property '2' is missing in type '{ 0: string; 1: number; }'.
9082
var k1: [string, number, number] = x;
9183
~~
9284
!!! error TS2322: Type '[string, number]' is not assignable to type '[string, number, number]'.
@@ -112,8 +104,7 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(30,5): error
112104
var l3: [number] = z;
113105
~~
114106
!!! error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[number]'.
115-
!!! error TS2322: Types of property '0' are incompatible.
116-
!!! error TS2322: Type 'string' is not assignable to type 'number'.
107+
!!! error TS2322: Property 'length' is missing in type '{ 0: string; 1: number; }'.
117108
var m1: [string] = x;
118109
~~
119110
!!! error TS2322: Type '[string, number]' is not assignable to type '[string]'.
@@ -144,8 +135,7 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(30,5): error
144135
var n3: [number, string] = z;
145136
~~
146137
!!! error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[number, string]'.
147-
!!! error TS2322: Types of property '0' are incompatible.
148-
!!! error TS2322: Type 'string' is not assignable to type 'number'.
138+
!!! error TS2322: Property 'length' is missing in type '{ 0: string; 1: number; }'.
149139
var o1: [string, number] = x;
150140
var o2: [string, number] = y;
151141
var o3: [string, number] = y;

tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.errors.txt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ tests/cases/conformance/types/union/contextualTypeWithUnionTypeObjectLiteral.ts(
1515
Type 'string' is not assignable to type 'number'.
1616
tests/cases/conformance/types/union/contextualTypeWithUnionTypeObjectLiteral.ts(25,5): error TS2322: Type '{ prop: string | number; anotherP: string; }' is not assignable to type '{ prop: string; anotherP: string; } | { prop: number; anotherP1: number; }'.
1717
Type '{ prop: string | number; anotherP: string; }' is not assignable to type '{ prop: number; anotherP1: number; }'.
18-
Types of property 'prop' are incompatible.
19-
Type 'string | number' is not assignable to type 'number'.
20-
Type 'string' is not assignable to type 'number'.
18+
Property 'anotherP1' is missing in type '{ prop: string | number; anotherP: string; }'.
2119
tests/cases/conformance/types/union/contextualTypeWithUnionTypeObjectLiteral.ts(29,5): error TS2322: Type '{ prop: string | number; anotherP: string; anotherP1: number; }' is not assignable to type '{ prop: string; anotherP: string; } | { prop: number; anotherP1: number; }'.
2220
Type '{ prop: string | number; anotherP: string; anotherP1: number; }' is not assignable to type '{ prop: number; anotherP1: number; }'.
2321
Types of property 'prop' are incompatible.
@@ -78,9 +76,7 @@ tests/cases/conformance/types/union/contextualTypeWithUnionTypeObjectLiteral.ts(
7876
~~~~~~~~~~~~
7977
!!! error TS2322: Type '{ prop: string | number; anotherP: string; }' is not assignable to type '{ prop: string; anotherP: string; } | { prop: number; anotherP1: number; }'.
8078
!!! error TS2322: Type '{ prop: string | number; anotherP: string; }' is not assignable to type '{ prop: number; anotherP1: number; }'.
81-
!!! error TS2322: Types of property 'prop' are incompatible.
82-
!!! error TS2322: Type 'string | number' is not assignable to type 'number'.
83-
!!! error TS2322: Type 'string' is not assignable to type 'number'.
79+
!!! error TS2322: Property 'anotherP1' is missing in type '{ prop: string | number; anotherP: string; }'.
8480
prop: strOrNumber,
8581
anotherP: str
8682
};

tests/baselines/reference/promisePermutations.errors.txt

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,7 @@ tests/cases/compiler/promisePermutations.ts(144,35): error TS2345: Argument of t
4848
Type 'IPromise<string>' is not assignable to type 'IPromise<number>'.
4949
tests/cases/compiler/promisePermutations.ts(152,36): error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => Promise<number>'.
5050
Type 'IPromise<string>' is not assignable to type 'Promise<number>'.
51-
Types of property 'then' are incompatible.
52-
Type '{ <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }' is not assignable to type '{ <TResult1 = number, TResult2 = never>(onfulfilled?: (value: number) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U>(success?: (value: number) => Promise<U>, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; }'.
53-
Types of parameters 'success' and 'onfulfilled' are incompatible.
54-
Types of parameters 'value' and 'value' are incompatible.
55-
Type 'string' is not assignable to type 'number'.
51+
Property 'catch' is missing in type 'IPromise<string>'.
5652
tests/cases/compiler/promisePermutations.ts(156,21): error TS2345: Argument of type '{ (x: number): IPromise<number>; (x: string): IPromise<string>; }' is not assignable to parameter of type '(value: number) => IPromise<string>'.
5753
Type 'IPromise<number>' is not assignable to type 'IPromise<string>'.
5854
Type 'number' is not assignable to type 'string'.
@@ -302,11 +298,7 @@ tests/cases/compiler/promisePermutations.ts(160,21): error TS2345: Argument of t
302298
~~~~~~~~~
303299
!!! error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => Promise<number>'.
304300
!!! error TS2345: Type 'IPromise<string>' is not assignable to type 'Promise<number>'.
305-
!!! error TS2345: Types of property 'then' are incompatible.
306-
!!! error TS2345: Type '{ <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }' is not assignable to type '{ <TResult1 = number, TResult2 = never>(onfulfilled?: (value: number) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U>(success?: (value: number) => Promise<U>, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; }'.
307-
!!! error TS2345: Types of parameters 'success' and 'onfulfilled' are incompatible.
308-
!!! error TS2345: Types of parameters 'value' and 'value' are incompatible.
309-
!!! error TS2345: Type 'string' is not assignable to type 'number'.
301+
!!! error TS2345: Property 'catch' is missing in type 'IPromise<string>'.
310302
var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
311303

312304
var r11: IPromise<number>;

tests/baselines/reference/promisePermutations2.errors.txt

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,7 @@ tests/cases/compiler/promisePermutations2.ts(143,35): error TS2345: Argument of
4848
Type 'IPromise<string>' is not assignable to type 'IPromise<number>'.
4949
tests/cases/compiler/promisePermutations2.ts(151,36): error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => Promise<number>'.
5050
Type 'IPromise<string>' is not assignable to type 'Promise<number>'.
51-
Types of property 'then' are incompatible.
52-
Type '{ <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }' is not assignable to type '{ <TResult1 = number, TResult2 = never>(onfulfilled?: (value: number) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; }'.
53-
Types of parameters 'success' and 'onfulfilled' are incompatible.
54-
Types of parameters 'value' and 'value' are incompatible.
55-
Type 'string' is not assignable to type 'number'.
51+
Property 'catch' is missing in type 'IPromise<string>'.
5652
tests/cases/compiler/promisePermutations2.ts(155,21): error TS2345: Argument of type '{ (x: number): IPromise<number>; (x: string): IPromise<string>; }' is not assignable to parameter of type '(value: number) => IPromise<string>'.
5753
Type 'IPromise<number>' is not assignable to type 'IPromise<string>'.
5854
Type 'number' is not assignable to type 'string'.
@@ -301,11 +297,7 @@ tests/cases/compiler/promisePermutations2.ts(159,21): error TS2345: Argument of
301297
~~~~~~~~~
302298
!!! error TS2345: Argument of type '(x: any) => IPromise<string>' is not assignable to parameter of type '(error: any) => Promise<number>'.
303299
!!! error TS2345: Type 'IPromise<string>' is not assignable to type 'Promise<number>'.
304-
!!! error TS2345: Types of property 'then' are incompatible.
305-
!!! error TS2345: Type '{ <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }' is not assignable to type '{ <TResult1 = number, TResult2 = never>(onfulfilled?: (value: number) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; }'.
306-
!!! error TS2345: Types of parameters 'success' and 'onfulfilled' are incompatible.
307-
!!! error TS2345: Types of parameters 'value' and 'value' are incompatible.
308-
!!! error TS2345: Type 'string' is not assignable to type 'number'.
300+
!!! error TS2345: Property 'catch' is missing in type 'IPromise<string>'.
309301
var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
310302

311303
var r11: IPromise<number>;

0 commit comments

Comments
 (0)